Merge pull request #56 from LewisProjects/development

1.9 minor fixes and yt uploads

Author: LevaniVashadze

cogs/AI.py

@@ -13,14 +13,13 @@ def __init__(self, bot: OGIROID):
     @commands.slash_command(description="Generates ai art")
     async def ai_art(self, inter: disnake.ApplicationCommandInteraction, text):
         ETA = int(time.time() + 60)
-        await inter.send(f"Go grab a coffee this may take a while... ETA: <t:{ETA}:R>")
+        await inter.send(f"Go grab a coffee this may take a while... ETA: <t:{ETA}:R>", ephemeral=True)
         response = await self.bot.session.post("https://backend.craiyon.com/generate", json={"prompt": text})
         r = await response.json()
-        images = r["images"]
-        for i in images:
-            image = BytesIO(base64.decodebytes(i.encode("utf-8")))
-            await inter.delete_original_response()
-            return await inter.send("Have fun...", file=disnake.File(image, "image.png"), ephemeral=True)
+        raw_images = r["images"]
+        images = [disnake.File(BytesIO(base64.decodebytes(i.encode("utf-8"))), "image.png") for i in raw_images]
+
+        await inter.edit_original_response(files=images, content="Here you go!")
 
 
 def setup(bot):

cogs/Fun.py

@@ -86,7 +86,8 @@ async def spotifyinfo(self, inter: ApplicationCommandInteraction, user: Member):
         await inter.send(embed=e)
 
     @commands.slash_command(name="poll", description="Make a Poll enter a question atleast 2 options and upto 6 options.")
-    @commands.has_permissions(manage_messages=True)
+    @commands.cooldown(1, 90, commands.BucketType.user)
+    @commands.cooldown(1, 30, commands.BucketType.channel)
     async def poll(
         self,
         inter: ApplicationCommandInteraction,

cogs/Lewis.py

@@ -0,0 +1,52 @@
+import disnake
+import datetime as dt
+from disnake.ext import commands, tasks
+
+from utils.bot import OGIROID
+
+
+class Lewis(commands.Cog, name="Lewis"):
+    def __init__(self, bot: OGIROID):
+        self.bot = bot
+        self.upload_check.start()
+        self.youtube_channel_id = "UCWI-ohtRu8eEeDj93hmUsUQ"
+        self.youtube_channel_url = f"https://www.youtube.com/channel/{self.youtube_channel_id}"
+        self.youtube_api_key = self.bot.config.tokens.yt_api_key
+        self.youtube_api_url = f"https://www.googleapis.com/youtube/v3/search?part=snippet&channelId={self.youtube_channel_id}&maxResults=1&order=date&type=video&key={self.youtube_api_key}"
+
+    def cog_unload(self):
+        self.upload_check.cancel()
+
+    @tasks.loop(minutes=30)
+    async def upload_check(self):
+        if self.youtube_api_key is None:
+            print("No YouTube API key found, skipping upload check")
+            return
+        check_time = dt.datetime.utcnow()
+        channel = self.bot.get_channel(self.bot.config.channels.uploads)
+        if channel is None:
+            return
+
+        response = await self.bot.session.get(self.youtube_api_url)
+        response = await response.json()
+
+        video_id = response["items"][0]["id"]["videoId"]
+        video_url = f"https://www.youtube.com/watch?v={video_id}"
+        # Credits to Simon for the idea and part of the code
+
+        video_release_time = response["items"][0]["snippet"]["publishedAt"]
+        year = video_release_time.split("-")[0]
+        month = video_release_time.split("-")[1]
+        day = video_release_time.split("-")[2].split("T")[0]
+        hour = video_release_time.split("T")[1].split(":")[0]
+        minute = video_release_time.split("T")[1].split(":")[1]
+        second = video_release_time.split("T")[1].split(":")[2].split("Z")[0]
+        time = dt.datetime(int(year), int(month), int(day), int(hour), int(minute), int(second))
+        if check_time - time < dt.timedelta(minutes=30):
+            return await channel.send(f"Hey, Lewis posted a new video! <@&{self.bot.config.roles.yt_announcements}>\n{video_url}")
+        else:
+            return
+
+
+def setup(bot):
+    bot.add_cog(Lewis(bot))

cogs/Staff.py

@@ -76,14 +76,14 @@ async def on_ready(self):
     async def ban(
         self,
         inter: ApplicationCommandInteraction,
-        member: disnake.Member,
+        user: disnake.User,
         reason: str = None,
         delete_messages: int = ParamInfo(
             description="How many days of messages to delete.", default=0, choices=[0, 1, 2, 3, 4, 5, 6, 7]
         ),
     ):
         """Bans a user from the server."""
-        await inter.guild.ban(user=member, reason=reason, clean_history_duration=dt.timedelta(days=delete_messages))
+        await inter.guild.ban(user=user, reason=reason, clean_history_duration=dt.timedelta(days=delete_messages))
         await sucEmb(inter, "User has been banned successfully!")
 
     @commands.slash_command(name="softban", description="Softbans a user from the server.")
@@ -92,14 +92,14 @@ async def ban(
     async def softban(
         self,
         inter: ApplicationCommandInteraction,
-        member: disnake.Member,
+        user: disnake.User,
         reason: str = None,
     ):
         """Bans a user from the server."""
-        await inter.guild.ban(user=member, reason=reason or "softban", clean_history_duration=dt.timedelta(days=7))
+        await inter.guild.ban(user=user, reason=reason or "softban", clean_history_duration=dt.timedelta(days=7))
         await sucEmb(inter, "User has been softbanned successfully!")
         await asyncio.sleep(5)
-        await inter.guild.unban(user=member, reason="softban unban")
+        await inter.guild.unban(user=user, reason="softban unban")
 
     @commands.slash_command(name="kick", description="Kicks a user from the server.")
     @commands.has_permissions(kick_members=True)

requirements.txt

@@ -1,7 +1,7 @@
 aiohttp==3.8.1
 aiosqlite==0.17.0
 akinator==1.0.2
-disnake==2.6.0
+disnake==2.7.0
 parsedatetime==2.6
 python-dotenv==0.21.0
 requests==2.28.1

secrets.env.template

@@ -1,6 +1,7 @@
 TOKEN=
 SRA_API_TOKEN=
 OPEN_WEATHER_MAP_API_KEY=
+YT_API_KEY=
 POSTGRES_USER=
 POSTGRES_PASSWORD=
 POSTGRES_HOST=

utils/CONSTANTS.py

@@ -2,7 +2,7 @@
 
 from dataclasses import dataclass
 
-__VERSION__ = "1.8.6"
+__VERSION__ = "1.9"
 
 from typing import Final
 
@@ -26,6 +26,7 @@ class Channels:
     general: int = 897666935708352587
     roles: int = 933102052173828136
     rules: int = 905182869410955355
+    uploads: int = 1033712950252408884
 
     @classmethod
     def dev(cls):
@@ -44,6 +45,7 @@ def dev(cls):
         cls.general: int = 985729550732394536
         cls.roles: int = 1013853473172893837
         cls.rules: int = 1013853473172893837
+        cls.uploads: int = 1013853473172893837
         return cls
 
 
@@ -62,10 +64,12 @@ def dev(cls):
 @dataclass
 class Roles:
     staff: int = 980700205328502794
+    yt_announcements: int = 1010237178036633670
 
     @classmethod
     def dev(cls):
         cls.staff: int = 985943266115584010
+        cls.yt_announcements: int = 1007202835957563412
         return cls
 
 

utils/bot.py

@@ -8,7 +8,6 @@
 import disnake
 from disnake import ApplicationCommandInteraction, OptionType
 from disnake.ext import commands
-from disnake.ext.commands import when_mentioned_or
 
 from utils.CONSTANTS import __VERSION__
 from utils.DBhandlers import BlacklistHandler
@@ -27,7 +26,7 @@ def __init__(self, *args, **kwargs):
 
         super().__init__(
             intents=disnake.Intents.all(),
-            sync_commands_debug=True,
+            command_sync_flags=commands.CommandSyncFlags(sync_commands_debug=True),
             *args,
             **kwargs,
         )

utils/config.py

@@ -10,6 +10,7 @@ class Tokens:
     SRA: str = os.getenv("SRA_API_KEY")
     bot: str = os.getenv("TOKEN")
     weathermap: str = os.getenv("OPEN_WEATHER_MAP_API_KEY")
+    yt_api_key: str = os.getenv("YT_API_KEY")
 
 
 @dataclass