Fix quotly.py: remove await on bytes object for /q command

DragMusic/plugins/management/kang.py

@@ -13,16 +13,15 @@ from pyrogram.errors import (
     UserIsBlocked,
 )
 from pyrogram.types import InlineKeyboardButton, InlineKeyboardMarkup, Message
+
 from DragMusic import app
 from config import BOT_USERNAME
 from DragMusic.utils.errors import capture_err
-
 from DragMusic.utils.files import (
     get_document_from_file_id,
     resize_file_to_sticker_size,
     upload_document,
 )
-
 from DragMusic.utils.stickerset import (
     add_sticker_to_set,
     create_sticker,
@@ -30,11 +29,9 @@ from DragMusic.utils.stickerset import (
     get_sticker_set_by_name,
 )
 
-# -----------
-
 MAX_STICKERS = 120
 SUPPORTED_TYPES = ["jpeg", "png", "webp"]
-# ------------------------------------------
+
 @app.on_message(filters.command("get_sticker"))
 @capture_err
 async def sticker_image(_, message: Message):
@@ -58,31 +55,26 @@ async def sticker_image(_, message: Message):
 
     await m.delete()
     os.remove(f)
-#----------------
+
 @app.on_message(filters.command("kang"))
 @capture_err
 async def kang(client, message: Message):
     if not message.reply_to_message:
         return await message.reply_text("Reply to a sticker/image to kang it.")
     if not message.from_user:
-        return await message.reply_text(
-            "You are anon admin, kang stickers in my pm."
-        )
+        return await message.reply_text("You are anon admin, kang stickers in my PM.")
+
     msg = await message.reply_text("Kanging Sticker..")
 
-    # Find the proper emoji
+    # Determine sticker emoji
     args = message.text.split()
     if len(args) > 1:
         sticker_emoji = str(args[1])
-    elif (
-        message.reply_to_message.sticker
-        and message.reply_to_message.sticker.emoji
-    ):
+    elif message.reply_to_message.sticker and message.reply_to_message.sticker.emoji:
         sticker_emoji = message.reply_to_message.sticker.emoji
     else:
         sticker_emoji = "🤔"
 
-    # Get the corresponding fileid, resize the file if necessary
     doc = message.reply_to_message.photo or message.reply_to_message.document
     try:
         if message.reply_to_message.sticker:
@@ -93,24 +85,20 @@ async def kang(client, message: Message):
                 sticker_emoji,
             )
         elif doc:
-            if doc.file_size > 10000000:
+            if doc.file_size > 10_000_000:
                 return await msg.edit("File size too large.")
 
             temp_file_path = await app.download_media(doc)
             image_type = imghdr.what(temp_file_path)
             if image_type not in SUPPORTED_TYPES:
-                return await msg.edit(
-                    "Format not supported! ({})".format(image_type)
-                )
+                return await msg.edit(f"Format not supported! ({image_type})")
+
             try:
-                temp_file_path = await resize_file_to_sticker_size(
-                    temp_file_path
-                )
+                temp_file_path = await resize_file_to_sticker_size(temp_file_path)
             except OSError as e:
-                await msg.edit_text("Something wrong happened.")
-                raise Exception(
-                    f"Something went wrong while resizing the sticker (at {temp_file_path}); {e}"
-                )
+                await msg.edit_text("Something wrong happened while resizing.")
+                raise Exception(f"Resize error at {temp_file_path}: {e}")
+
             sticker = await create_sticker(
                 await upload_document(client, temp_file_path, message.chat.id),
                 sticker_emoji,
@@ -120,25 +108,35 @@ async def kang(client, message: Message):
         else:
             return await msg.edit("Nope, can't kang that.")
     except ShortnameOccupyFailed:
-        await message.reply_text("Change Your Name Or Username")
+        await message.reply_text("Change your Telegram name or username.")
         return
-
     except Exception as e:
         await message.reply_text(str(e))
-        e = format_exc()
-        return print(e)
-#-------
+        print(format_exc())
+        return
+
+    # Packname sanitization
     bot_username = BOT_USERNAME.lstrip("@").strip("_")
     packnum = 0
-    packname = f"f{message.from_user.id}_by_{bot_username}"
+
+    def sanitize_packname(base: str) -> str:
+        base = base.replace("__", "_").strip("_")
+        if not base[0].isalpha():
+            base = f"a{base}"
+        return base
+
+    base_packname = sanitize_packname(f"f{message.from_user.id}_by_{bot_username}")
+    packname = base_packname
     limit = 0
+
     try:
         while True:
             if limit >= 50:
                 return await msg.delete()
-            # Debug print for packname and bot_username
+
             print(f"[DEBUG] packname: {packname}")
             print(f"[DEBUG] bot_username: {bot_username}")
+
             stickerset = await get_sticker_set_by_name(client, packname)
             if not stickerset:
                 stickerset = await create_sticker_set(
@@ -150,7 +148,9 @@ async def kang(client, message: Message):
                 )
             elif stickerset.set.count >= MAX_STICKERS:
                 packnum += 1
-                packname = f"f{packnum}_{message.from_user.id}_by_{bot_username}"
+                packname = sanitize_packname(
+                    f"f{packnum}_{message.from_user.id}_by_{bot_username}"
+                )
                 limit += 1
                 continue
             else:
@@ -158,22 +158,23 @@ async def kang(client, message: Message):
                     await add_sticker_to_set(client, stickerset, sticker)
                 except StickerEmojiInvalid:
                     return await msg.edit("[ERROR]: INVALID_EMOJI_IN_ARGUMENT")
+
             limit += 1
             break
+
         await msg.edit(
-            f"Sticker Kanged To [Pack](t.me/addstickers/{packname})\nEmoji: {sticker_emoji}"
+            f"Sticker Kanged To [Pack](https://t.me/addstickers/{packname})\nEmoji: {sticker_emoji}"
         )
+
     except (PeerIdInvalid, UserIsBlocked):
         keyboard = InlineKeyboardMarkup(
-            [[InlineKeyboardButton(text="Start", url=f"t.me/{bot_username}")]]
+            [[InlineKeyboardButton(text="Start", url=f"https://t.me/{bot_username}")]]
         )
         await msg.edit(
             "You Need To Start A Private Chat With Me.",
             reply_markup=keyboard,
         )
     except StickerPngNopng:
-        await message.reply_text(
-            "Stickers must be png files but the provided image was not a png"
-        )
+        await message.reply_text("Stickers must be PNG files but the provided image was not a PNG.")
     except StickerPngDimensions:
-        await message.reply_text("The sticker png dimensions are invalid.")
+        await message.reply_text("The sticker PNG dimensions are invalid.")