diff --git a/cogs/fun/rockpaperscissors.py b/cogs/fun/rockpaperscissors.py index 1dac786..ba7b51c 100644 --- a/cogs/fun/rockpaperscissors.py +++ b/cogs/fun/rockpaperscissors.py @@ -1,17 +1,8 @@ -""" -Copyright © Krypton 2019-Present - https://github.com/kkrypt0nn (https://krypton.ninja) -Description: -🐍 A simple template to start to code your own and personalized Discord bot in Python - -Version: 6.4.0 -""" - import random import discord from discord.ext import commands from discord.ext.commands import Context - class RockPaperScissors(discord.ui.Select): def __init__(self) -> None: options = [ @@ -40,37 +31,36 @@ class RockPaperScissors(discord.ui.Select): } user_choice = self.values[0].lower() user_choice_index = choices[user_choice] - bot_choice = random.choice(list(choices.keys())) bot_choice_index = choices[bot_choice] - result_embed = discord.Embed(color=0xBEBEFE) - result_embed.set_author( - name=interaction.user.name, icon_url=interaction.user.display_avatar.url - ) + result_embed = discord.Embed(title="Rock Paper Scissors", color=0xBEBEFE) + result_embed.set_author(name="Fun", icon_url="https://yes.nighty.works/raw/eW5lLm.webp") winner = (3 + user_choice_index - bot_choice_index) % 3 + + # Get the user mention + user_mention = interaction.user.mention + if winner == 0: - result_embed.description = f"**That's a draw!**\nYou've chosen {user_choice} and I've chosen {bot_choice}." + result_embed.description = f"**That's a draw!** You've chosen {user_choice} and I've chosen {bot_choice}.\n-# gg {user_mention}" result_embed.colour = 0xF59E42 elif winner == 1: - result_embed.description = f"**You won!**\nYou've chosen {user_choice} and I've chosen {bot_choice}." + result_embed.description = f"**You won!** You've chosen {user_choice} and I've chosen {bot_choice}.\n-# gg {user_mention}" result_embed.colour = 0x57F287 else: - result_embed.description = f"**You lost!**\nYou've chosen {user_choice} and I've chosen {bot_choice}." + result_embed.description = f"**You lost!** You've chosen {user_choice} and I've chosen {bot_choice}.\n-# gg {user_mention}" result_embed.colour = 0xE02B2B await interaction.response.edit_message( embed=result_embed, content=None, view=None ) - class RockPaperScissorsView(discord.ui.View): def __init__(self) -> None: super().__init__() self.add_item(RockPaperScissors()) - class RPS(commands.Cog, name="rps"): def __init__(self, bot) -> None: self.bot = bot @@ -79,14 +69,14 @@ class RPS(commands.Cog, name="rps"): name="rps", description="Play the rock paper scissors game against the bot." ) async def rock_paper_scissors(self, context: Context) -> None: - """ - Play the rock paper scissors game against the bot. - - :param context: The hybrid command context. - """ view = RockPaperScissorsView() - await context.send("Please make your choice", view=view) - + embed = discord.Embed( + title="Rock Paper Scissors", + description="Please make your choice", + color=0x7289DA + ) + embed.set_author(name="Fun", icon_url="https://yes.nighty.works/raw/eW5lLm.webp") + await context.send(embed=embed, view=view) async def setup(bot) -> None: - await bot.add_cog(RPS(bot)) + await bot.add_cog(RPS(bot)) \ No newline at end of file diff --git a/cogs/general/bitcoin.py b/cogs/general/bitcoin.py deleted file mode 100644 index 0b8e75d..0000000 --- a/cogs/general/bitcoin.py +++ /dev/null @@ -1,50 +0,0 @@ -""" -Copyright © Krypton 2019-Present - https://github.com/kkrypt0nn (https://krypton.ninja) -Description: -🐍 A simple template to start to code your own and personalized Discord bot in Python - -Version: 6.4.0 -""" - -import aiohttp -import discord -from discord.ext import commands -from discord.ext.commands import Context - - -class Bitcoin(commands.Cog, name="bitcoin"): - def __init__(self, bot) -> None: - self.bot = bot - - @commands.hybrid_command( - name="bitcoin", - description="Get the current price of bitcoin.", - ) - async def bitcoin(self, context: Context) -> None: - """ - Get the current price of bitcoin. - - :param context: The hybrid command context. - """ - async with aiohttp.ClientSession() as session: - async with session.get( - "https://api.coindesk.com/v1/bpi/currentprice/BTC.json" - ) as request: - if request.status == 200: - data = await request.json() - embed = discord.Embed( - title="Bitcoin price", - description=f"The current price is {data['bpi']['USD']['rate']} :dollar:", - color=0xBEBEFE, - ) - else: - embed = discord.Embed( - title="Error!", - description="There is something wrong with the API, please try again later", - color=0xE02B2B, - ) - await context.send(embed=embed) - - -async def setup(bot) -> None: - await bot.add_cog(Bitcoin(bot)) diff --git a/cogs/general/help.py b/cogs/general/help.py index 62d9b86..74270d3 100644 --- a/cogs/general/help.py +++ b/cogs/general/help.py @@ -45,7 +45,6 @@ class Help(commands.Cog, name="help"): "invite": "general", "server": "general", "8ball": "general", - "bitcoin": "general", "feedback": "general", "context_menus": "general",