Merge pull request #3 from N4GR/main

/orange add-item and asynchronous /profile

Author: kmrin

rinbot/config/database/schema.sql

@@ -28,7 +28,8 @@ CREATE TABLE IF NOT EXISTS "store" (
 	"id"	INTEGER,
 	"name"	TEXT,
 	"price"	INTEGER,
-	"type"	INTEGER
+	"type"	INTEGER,
+	"data" BLOB
 );
 CREATE TABLE IF NOT EXISTS "history_guilds" (
     "guild_id" INTEGER,

rinbot/config/localization/en.json

@@ -393,6 +393,14 @@
     "ECONOMY_TRANSFER_EMBED": "Transfered `{value}` to `{receiver}`, current_balance: {wallet}",
     "ECONOMY_TRANSFER_SAME_USER": " ❌  You can't transfer to yourself :p",
     "ECONOMY_ALREADY_HAS_ITEM": " ❌  You already have this item!",
+    "ECONOMY_ADD_ITEM_NAME": "add-item",
+    "ECONOMY_ADD_ITEM_DESC": "An admin only command that's used to add items to the guild store.",
+    "ECONOMY_ADD_ITEM_CHOICE": "badge",
+    "ECONOMY_ADD_ITEM_ERROR_SQUARE": ["The image must be a square, your image is", "px wide and", "px tall."],
+    "ECONOMY_ADD_ITEM_SUCCESS": "✅ Badge Added Successfully",
+    "ECONOMY_ADD_ITEM_EMBED_BADGE_NAME": "Badge Name",
+    "ECONOMY_ADD_ITEM_EMBED_PRICE_NAME": "Price",
+    "ECONOMY_ADD_ITEM_EMBED_LINK_USED_NAME": "Link Used",
 
     "FUN_PET_NAME": "pet",
     "FUN_PET_DESC": ":3",

rinbot/extensions/economy.py

@@ -16,6 +16,7 @@
 
 from rinbot.base import log_exception, is_hex, hex_to_int
 from rinbot.base import DBTable
+from rinbot.base import DBColumns
 from rinbot.base import respond
 from rinbot.base import RinBot
 from rinbot.base import Colour
@@ -25,6 +26,11 @@
 from rinbot.base import is_admin
 from rinbot.base import not_blacklisted
 
+# Store packages
+from PIL import Image
+from io import BytesIO
+import aiohttp
+
 class Economy(Cog, name='economy'):
     def __init__(self, bot: RinBot) -> None:
         self.bot = bot
@@ -284,6 +290,103 @@ async def __remove_currency(self, interaction: Interaction, member: discord.Memb
         except Exception as e:
             log_exception(e)
 
+    @orange.command(
+        name = text["ECONOMY_ADD_ITEM_NAME"],
+        description = text["ECONOMY_ADD_ITEM_DESC"])
+    @app_commands.choices(type = [
+        app_commands.Choice(name = text["ECONOMY_ADD_ITEM_CHOICE"], value = 0),
+    ])
+    @not_blacklisted()
+    @is_admin()
+    # @is_owner()
+    async def _add_item(self, interaction: Interaction, type: app_commands.Choice[int], name: str, price: int, link: str) -> None:
+        await interaction.response.defer(thinking = True)
+
+        async def fail_embed(desc):
+            embed = discord.Embed(
+                description = f"❌ {desc}", 
+                color = Colour.RED
+                )
+
+            await interaction.followup.send(embed = embed, ephemeral = True)
+
+        async def fetch_content(url):
+            async with aiohttp.ClientSession() as session:
+                async with session.get(url) as response:
+                    if response.status == 200:
+                        return await response.read()
+                    else:
+                        return False
+
+        async def is_image_bytes(content):
+            try:
+                with Image.open(BytesIO(content)) as img:
+                    img.verify()  # Verify that it is an image
+                return True
+            except (IOError, SyntaxError) as e:
+                return False
+            
+        content = await fetch_content(link)
+
+        # Checks if there's a response
+        if content is False:
+            await fail_embed(f"The link you sent isn't valid!\n\nYou sent:\n{link}")
+            return
+        # Checks if the response contains an image
+        elif await is_image_bytes(content) is False:
+            await fail_embed(f"You didn't send a direct image!\n\nYou sent:\n{link}")
+            return
+        
+        # Opens the badge image in Pillow
+        badge = Image.open(BytesIO(content)).convert("RGBA")
+
+        # Checks if the image is a square
+        if badge.width != badge.height:
+            await fail_embed(f"{text['ECONOMY_ADD_ITEM_ERROR_SQUARE'][0]} {badge.width}{text['ECONOMY_ADD_ITEM_ERROR_SQUARE'][1]} {badge.height}{text['ECONOMY_ADD_ITEM_ERROR_SQUARE'][2]}")
+            return
+        
+        # Resizes the image to a 64x64
+        badge = badge.resize((64, 64), resample = Image.Resampling.LANCZOS)
+
+        # Getting image blob object
+        with BytesIO() as buffer:
+            badge.save(buffer, format = "PNG")
+            imagebytes = buffer.getvalue()
+
+        guild_badge_vault = self.bot.db.get(DBTable.STORE, f"{DBColumns.store.GUILD_ID.value} = {interaction.guild.id}")
+
+        # Counts how many items are in the store to set as ID and checks if the blob is already there or not.
+        counter = 0
+        for id in await guild_badge_vault:
+            counter =+ 1
+            if imagebytes == id[5]:
+                await fail_embed(f"The image you requested to add is already in the guild store!")
+                return
+
+        # Adds the badge to the guild store with the id set to max id number + 1
+        await self.bot.db.put(DBTable.STORE, {
+            "guild_id": interaction.guild.id,
+            "id": counter + 1,
+            "name": name,
+            "price": price,
+            "type": type.value,
+            "data": imagebytes
+        })
+
+        # Success message
+        embed = discord.Embed(
+            title = text["ECONOMY_ADD_ITEM_SUCCESS"], 
+            color = Colour.GREEN
+            )
+        
+        embed.add_field(name = text["ECONOMY_ADD_ITEM_EMBED_BADGE_NAME"], value = name, inline = True)
+        embed.add_field(name = text["ECONOMY_ADD_ITEM_EMBED_PRICE_NAME"], value = str(price), inline = True)
+        embed.add_field(name = text["ECONOMY_ADD_ITEM_EMBED_LINK_USED_NAME"], value = link, inline = False)
+        embed.set_image(url = link)
+        embed.set_footer(text = f"{interaction.guild.name.upper()} | {interaction.guild.id}")
+
+        await interaction.followup.send(embed = embed, ephemeral = True)
+
 # SETUP
 async def setup(bot: RinBot):
     await bot.add_cog(Economy(bot))

rinbot/extensions/general.py

@@ -35,9 +35,9 @@
 
 # profile packages
 from PIL import Image, ImageDraw, ImageFont
-import requests
 from io import BytesIO
 import unicodedata
+import aiohttp
 
 class General(Cog, name='general'):
     def __init__(self, bot: RinBot) -> None:
@@ -197,8 +197,10 @@ async def _profile(self, interaction: discord.Interaction, visibility: app_comma
 
         avatar_url = interaction.user.avatar.url or interaction.user.default_avatar.url
 
-        response = requests.get(avatar_url)
-        response.raise_for_status()
+        async with aiohttp.ClientSession() as session:
+            async with session.get(avatar_url) as response:
+                if response.status == 200:
+                    response = await response.read()
 
         # Initial images to layer on top of
         image = Image.open("rinbot/assets/images/profile/background.jpg").convert("RGBA")
@@ -207,7 +209,7 @@ async def _profile(self, interaction: discord.Interaction, visibility: app_comma
         image.paste(overlay, (0, 0), overlay)
 
         # Avatar image handling
-        avatar = Image.open(BytesIO(response.content)).convert("RGBA").resize((125, 125), Image.Resampling.LANCZOS)
+        avatar = Image.open(BytesIO(response)).convert("RGBA").resize((125, 125), Image.Resampling.LANCZOS)
 
         width, height = avatar.size
         x = (width - height) // 2
@@ -230,10 +232,12 @@ async def _profile(self, interaction: discord.Interaction, visibility: app_comma
 
         emoji_name = unicodedata.name(currency_emoji).lower().replace(" ", "_")
 
-        response = requests.get(f"https://emojiapi.dev/api/v1/{emoji_name}/32.png")
-        response.raise_for_status()
+        async with aiohttp.ClientSession() as session:
+            async with session.get(f"https://emojiapi.dev/api/v1/{emoji_name}/32.png") as response:
+                if response.status == 200:
+                    response = await response.read()
 
-        emoji = Image.open(BytesIO(response.content)).convert("RGBA")
+        emoji = Image.open(BytesIO(response)).convert("RGBA")
 
         image.paste(emoji, (260, 40), emoji)