2024-09-25

new commands!!! yaaay~

Author: AkkoS2

README.md

@@ -15,10 +15,9 @@ You are 100% allowed to have a self-hosted version of Yume under the following c
 Soon™ (I'm still planning it)
 
 ## Changelog
-- Cleaner code on embeds.py.
-- Bad codding.
-- Text file containing all the used links.
-
+- Cats, Dogs 3 & Knuckles.
+- A currency converter comamand.
+- removed some of the useless imports.
 ## Have a suggestion?
 If you have any suggestions or ideas for new commands, you can tell them to me and I will analyze then carefully. Thanks for the attention!
 

cogs/actions.py

@@ -1,7 +1,6 @@
 # Bibliotecas utilizadas neste arquivo
 from discord.ext import commands
 from discord import app_commands
-from utils import helpers
 from utils import buttons
 import discord
 

cogs/dreams.py

@@ -30,26 +30,19 @@ async def info(self, interaction: discord.Interaction):
         await interaction.response.send_message(embed=InfoEmbed.iembed, ephemeral=True)
 
     # Typo Report
-    @app_commands.command(name='typo', description="a way to report any typos you've found so far!")
+    @app_commands.command(name='typo', description="A way to report any typos you've found so far!")
     async def typo(self, interaction: discord.Interaction):
 
         typo = modals.TypoModal()
         await interaction.response.send_modal(typo)
 
     # Suggestions
-    @app_commands.command(name='suggestion', description="you can give suggestions on how to improve me!")
+    @app_commands.command(name='suggestion', description="With this command you can give Yume your suggestions!")
     async def suggestion(self, interaction: discord.Interaction):
 
         suggestion = modals.SuggestionModal()
         await interaction.response.send_modal(suggestion)
 
-    # Command Ideas
-    @app_commands.command(name='ideas', description="have any command ideas? share them with me~")
-    async def ideas(self, interaction: discord.Interaction):
-
-        ideas = modals.IdeaModal()
-        await interaction.response.send_modal(ideas)
-
 
 # Realiza o registro da classe nos cogs
 async def setup(yume: commands.AutoShardedBot) -> None:

cogs/image.py

@@ -49,6 +49,66 @@ async def reddit(self, interaction: discord.Interaction, *, subreddit: str):
         elif result[1] is False and interaction.channel.is_nsfw():
             await interaction.response.send_message(embed=embed)
 
+    # Cachorrinhos
+    @app_commands.command(name='dogs', description="Yume will give you a random image of a doggy!")
+    async def dog(self, interaction: discord.Interaction):
+
+        helpers.dogcat = "thedogapi"
+        GenericEmbed.embed.set_image(url=await helpers.catdog())
+        GenericEmbed.embed.set_author(name="Here's the doggy I've got for you!! Hope you like it~")
+
+        await interaction.response.send_message(embed=GenericEmbed.embed)
+
+    # Gatinhos
+    @app_commands.command(name='cats', description="Yume will give you a random image of a kitty!")
+    async def cat(self, interaction: discord.Interaction):
+
+        helpers.dogcat = "thecatapi"
+        GenericEmbed.embed.set_image(url=await helpers.catdog())
+        GenericEmbed.embed.set_author(name="Here's the kitty I've got for you!! Hope you like it~")
+
+        await interaction.response.send_message(embed=GenericEmbed.embed)
+
+    # Waifus
+    @app_commands.command(name="waifu", description="I'll give you a random image of a waifu")
+    async def waifu(self, interaction: discord.Interaction):
+
+        helpers.nekos_gif = 'waifu'
+        GenericEmbed.embed.set_image(url = await helpers.nekos_best())
+        GenericEmbed.embed.set_author(name="Here's the waifu yume got for you!!")
+
+        await interaction.response.send_message(embed=GenericEmbed.embed)
+
+    # Husbandos
+    @app_commands.command(name="husbando", description="I'll give you a random image of a husbando")
+    async def husbando(self, interaction: discord.Interaction):
+
+        helpers.nekos_gif = 'husbando'
+        GenericEmbed.embed.set_image(url=await helpers.nekos_best())
+        GenericEmbed.embed.set_author(name="Here's the husbando yume got for you!!")
+
+        await interaction.response.send_message(embed=GenericEmbed.embed)
+
+    # Nekos
+    @app_commands.command(name="neko", description="I'll give you a cute random image of a catgirl!")
+    async def neko(self, interaction: discord.Interaction):
+
+        helpers.nekos_gif = 'neko'
+        GenericEmbed.embed.set_image(url=await helpers.nekos_best())
+        GenericEmbed.embed.set_author(name="Here's the neko yume got for you!!")
+
+        await interaction.response.send_message(embed=GenericEmbed.embed)
+
+    # Kitsunes
+    @app_commands.command(name="kitsune", description="I'll give you a cute random image of a kitsune!")
+    async def kitsune(self, interaction: discord.Interaction):
+
+        helpers.nekos_gif = 'kitsune'
+        GenericEmbed.embed.set_image(url=await helpers.nekos_best())
+        GenericEmbed.embed.set_author(name="Here's the kitsune yume got for you!!")
+
+        await interaction.response.send_message(embed=GenericEmbed.embed)
+
 
 # Realiza o registro da classe nos cogs
 async def setup(yume: commands.AutoShardedBot) -> None:

cogs/roleplay.py

@@ -1,6 +1,4 @@
 # bibliotecas
-from discord.ext.commands import bot
-
 from utils.embeds import GenericEmbed
 from discord.ext import commands
 from discord import app_commands
@@ -100,7 +98,7 @@ async def stare(self, interaction: discord.Interaction, *, user: discord.Member)
 
         helpers.nekos_gif = 'stare'
         GenericEmbed.embed.set_image(url=str(await helpers.nekos_best()))
-        GenericEmbed.embed.set_footer(text='Careful to not stare too much, they may notice it...')
+        GenericEmbed.embed.set_footer(text='Be careful not to stare for too long - they might notice!')
 
         if user == interaction.user:
             GenericEmbed.embed.set_author("I'm gonna stare at you then... please don't look away!")
@@ -115,10 +113,10 @@ async def shoot(self, interaction: discord.Interaction, *, user: discord.Member)
 
         helpers.nekos_gif = 'shoot'
         GenericEmbed.embed.set_image(url=str(await helpers.nekos_best()))
-        GenericEmbed.embed.set_footer(text="Oh my God, are you okay? I'm calling a ambulance, stay strong, please!")
+        GenericEmbed.embed.set_footer(text="Oh my God, are you okay? I'm calling an ambulance, stay strong, please!")
 
         if user == interaction.user:
-            GenericEmbed.embed.set_author("I wasn't wanting to shoot you but, that might be.... hehe~")
+            GenericEmbed.embed.set_author("Suuuree.... hehe~")
             await interaction.response.send_message(embed=GenericEmbed.embed)
 
         GenericEmbed.embed.set_author(name=f"{user.display_name} just got shot by {interaction.user.display_name}!!! Should we call the police?")

cogs/utility.py

@@ -1,6 +1,7 @@
 # Bibliotecas utilizadas neste arquivo
 from discord.ext import commands
 from discord import app_commands
+from utils import helpers
 import discord
 
 
@@ -35,6 +36,15 @@ async def avatar(self, interaction: discord.Interaction, user: discord.Member =
 
         await interaction.response.send_message(embed=avatar)
 
+    # Currency
+    @app_commands.command(name='currency', description="Let's you see the currency values")
+    async def currency(self, interaction: discord.Interaction, *, currency1: str, amount: int, currency2: str):
+
+        helpers.values = currency1, currency2, amount
+        result = await helpers.currency_finder()
+
+        await interaction.response.send_message(f"Yume thinks that **{amount} {currency1.upper()}** is equal to **{result} {currency2.upper()}**!!", ephemeral=True)
+
 
 # Realiza o registro da classe nos cogs
 async def setup(yume: commands.AutoShardedBot) -> None:

requirements.txt

@@ -1,5 +1,6 @@
+beautifulsoup4==4.12.3
 python-dotenv==1.0.1
 discord.py==2.3.2
-discord==2.3.2
 aiohttp==3.10.2
+discord==2.3.2
 uwuipy==0.1.9

texts/external_emojis.txt

@@ -0,0 +1,3 @@
+<:github:1243404130651865098>
+<:kofi:1286360498853380159>
+<:externallink:1286308168762134569>

texts/status.txt

@@ -1,4 +1,2 @@
-I'm watching you~
-What are you doing?
-Get out of my head....
-With dreams
+Updating
+Getting updated

utils/buttons.py

@@ -21,15 +21,3 @@
 bribe_button = Button(label="Try giving them a bribe", style=discord.ButtonStyle.blurple)
 sad_button = Button(label="So sad...", style=discord.ButtonStyle.blurple)
 wave_button = Button(label="Wave to them", style=discord.ButtonStyle.blurple)
-
-
-view_smug = View()
-view_smug.add_item(smug_button)
-view_smug.add_item(stare_button)
-view_smug.add_item(laugh_button)
-
-
-view_party = View()
-view_party.add_item(party_button)
-view_party.add_item(leave_button)
-view_party.add_item(stare_button)

utils/envkeys.py

@@ -21,5 +21,9 @@ def sugghook():
     return os.environ.get("SUGGHOOK")
 
 
-def ideahook():
-    return os.environ.get("IDEAHOOK")
+def cats_key():
+    return os.environ.get("CAT_API")
+
+
+def dogs_key():
+    return os.environ.get("DOG_API")

utils/helpers.py

@@ -1,4 +1,6 @@
 # Bibliotecas utilizadas neste arquivo
+from utils.envkeys import dogs_key, cats_key
+from bs4 import BeautifulSoup
 import aiohttp
 import random
 import json
@@ -7,6 +9,8 @@
 # Variáveis Globais
 sub_reddit = None
 nekos_gif = None
+values = None
+dogcat = None
 
 
 # Reddit Search
@@ -57,3 +61,31 @@ async def nekos_best():
             data = await r.json()
 
         return data['results'][0]['url']
+
+
+# Currency Finder
+async def currency_finder():
+
+    async with aiohttp.ClientSession() as session:
+        async with session.get(f"https://x-rates.com/calculator/?from={values[0]}&to={values[1]}&amount={values[2]}") as r:
+            data = await r.text()
+
+            little_soup = BeautifulSoup(data, 'html.parser')
+            value = little_soup.find("span", class_="ccOutputRslt").get_text()
+
+            return value[:-7]
+
+
+# Cats and Dogs
+async def catdog():
+
+    if dogs_key == "thedogapi":
+        key = dogs_key()
+    else:
+        key = cats_key()
+
+    async with aiohttp.ClientSession() as session:
+        async with session.get(f"https://api.{dogcat}.com/v1/images/search?limit=10&api_key={key}") as r:
+            data = await r.json()
+
+            return data[random.randint(0, 9)]['url']

utils/modals.py

@@ -1,5 +1,5 @@
 # Bibliotecas utilizadas neste arquivo
-from utils.envkeys import typohook, sugghook, ideahook
+from utils.envkeys import typohook, sugghook
 from discord import Webhook, SyncWebhook
 from discord.ext import commands
 from datetime import datetime
@@ -81,41 +81,3 @@ async def on_submit(self, interaction: discord.Interaction):
 
     async def on_error(self, interaction: discord.Interaction, error):
         await interaction.response.send_message("I think something went wrong with me, it's not your fault, don't worry!", ephemeral=True)
-
-
-class IdeaModal(discord.ui.Modal, title="If you have some cool ideas for commands!"):
-
-    idea_title = discord.ui.TextInput(
-        style=discord.TextStyle.short,
-        label="Give it a Name!",
-        required=True,
-        max_length=100,
-        placeholder="What's the name of your idea?")
-
-    idea_message = discord.ui.TextInput(
-        style=discord.TextStyle.long,
-        label="If added, how you think it should work?",
-        required=True,
-        max_length=500,
-        placeholder="Explain it to me bit more!"
-    )
-
-    async def on_submit(self, interaction: discord.Interaction):
-
-        async with aiohttp.ClientSession() as session:
-
-            webhook = Webhook.from_url(f"https://discord.com/api/webhooks/{ideahook()}", session=session)
-
-            now = datetime.now()
-            idea_e = discord.Embed(color=discord.Color.random())
-            idea_e.set_author(name=self.idea_title.value, icon_url=interaction.user.avatar.url)
-            idea_e.add_field(name="Command Idea:", value=f"{self.idea_message.value}", inline=False)
-            idea_e.add_field(name="Submitted By:", value=f"{interaction.user.name}", inline=False)
-            idea_e.add_field(name="UserID", value=f"{interaction.user.id}", inline=False)
-            idea_e.set_footer(text=f"Submitted at: {now.strftime('%Y/%m/%d - %H:%M:%S')}")
-
-            await webhook.send(embed=idea_e)
-            await interaction.response.send_message("Thanks for giving Yume a new command idea!", ephemeral=True)
-
-    async def on_error(self, interaction: discord.Interaction, error):
-        await interaction.response.send_message("I think something went wrong with me, it's not your fault, don't worry!", ephemeral=True)

utils/test.py

@@ -0,0 +1 @@
+