fix: help formatting text and tagall cancel logic

QueenNoxi/__main__.py

@@ -189,12 +189,22 @@ async def help_button(client, query: CallbackQuery):
                 )
                 + HELPABLE[module].__help__
             )
-            await query.message.edit_caption(text,
-                reply_markup=InlineKeyboardMarkup(
-                    [[InlineKeyboardButton(text="ʙᴀᴄᴋ", callback_data="help_back"),
-                      InlineKeyboardButton(text="sᴜᴘᴘᴏʀᴛ", callback_data="queennoxi_support")]]
-                ),
-            )
+            try:
+                await query.message.edit_caption(text,
+                    reply_markup=InlineKeyboardMarkup(
+                        [[InlineKeyboardButton(text="ʙᴀᴄᴋ", callback_data="help_back"),
+                          InlineKeyboardButton(text="sᴜᴘᴘᴏʀᴛ", callback_data="queennoxi_support")]]
+                    ),
+                )
+            except RPCError as e:
+                # Fallback if caption is still too long or other RPC error
+                LOGGER.error(f"Error editing help caption: {e}")
+                await query.message.reply_text(text,
+                    reply_markup=InlineKeyboardMarkup(
+                        [[InlineKeyboardButton(text="ʙᴀᴄᴋ", callback_data="help_back"),
+                          InlineKeyboardButton(text="sᴜᴘᴘᴏʀᴛ", callback_data="queennoxi_support")]]
+                    ),
+                )
         elif prev_match:
             curr_page = int(prev_match.group(1))
             await query.message.edit_caption(HELP_STRINGS,
@@ -216,8 +226,9 @@ async def help_button(client, query: CallbackQuery):
                 ),
             )
         await query.answer()
-    except Exception:
-        pass
+    except Exception as e:
+        LOGGER.error(f"Error in help_button: {e}")
+        await query.answer("An error occurred while opening help.", show_alert=True)
 
 @pbot.on_callback_query(filters.regex(r"^queennoxi_"))
 async def QueenNoxi_about_callback(client, query: CallbackQuery):

QueenNoxi/modules/formatting.py

@@ -4,34 +4,33 @@ from QueenNoxi import pbot
 __mod_name__ = "Formatting"
 
 __help__ = """
-You can use the following placeholders to personalize your welcome, filters, or notes:
+Personalize your welcome, filters, or notes with these placeholders:
 
 **User Info:**
-• `{first}`: The user's first name.
-• `{last}`: The user's last name (or first name if empty).
-• `{fullname}`: The user's full name.
-• `{username}`: The user's @username (or mention if empty).
-• `{id}`: The user's ID.
-• `{mention}`: A clickable mention of the user.
+• `{first}`: First name.
+• `{last}`: Last name.
+• `{fullname}`: Full name.
+• `{username}`: @username.
+• `{id}`: User ID.
+• `{mention}`: Mention user.
 
 **Chat Info:**
-• `{chatname}`: The name of the current group.
-• `{rules}`: A clickable link to the group rules.
+• `{chatname}`: Group name.
+• `{rules}`: Link to rules.
 
-**Advanced Control Tags:**
-• `{preview}`: Enables link previews (enabled by default unless this is absent).
-• `{nonotif}`: Sends the message without a notification sound.
-• `{protect}`: Prevents the message from being forwarded or screenshotted.
-• `{mediaspoiler}`: Hides the photo/video behind a spoiler blur (if applicable).
+**Control Tags:**
+• `{preview}`: Enable link previews.
+• `{nonotif}`: Muted message.
+• `{protect}`: Prevent forward/screenshot.
+• `{mediaspoiler}`: Blur media.
 
 **Buttons:**
-• `[Button Text](buttonurl://link)`: Creates a URL button.
-• `[Button Text](buttonurl#danger://link)`: Creates a Red (danger) button.
-• `[Button Text](buttonurl#success://link)`: Creates a Green (success) button.
-• `[Button Text](buttonurl#primary://link)`: Creates a Blue (primary) button.
-• `[Button Text](buttonurl://btn_next)`: Creates a "Next" navigation button.
-• `[Button Text](buttonurl://btn_back)`: Creates a "Back" navigation button.
+• `[Text](buttonurl://link)`: URL button.
+• `[Text](buttonurl#danger://link)`: Red button.
+• `[Text](buttonurl#success://link)`: Green button.
+• `[Text](buttonurl#primary://link)`: Blue button.
+• `[Text](buttonurl://btn_next)`: Next page.
+• `[Text](buttonurl://btn_back)`: Previous page.
 
-**Note on Previews:**
-Link previews are **DISABLED** by default. To enable them, include `{preview}` anywhere in your message.
+**Note:** Previews are **DISABLED** by default. Use `{preview}` to enable.
 """

QueenNoxi/modules/tagall.py

@@ -7,7 +7,7 @@ from telethon.tl.types import ChannelParticipantAdmin, ChannelParticipantCreator
 
 from QueenNoxi import telethn as client
 
-spam_chats = []
+spam_chats = set()
 
 @client.on(events.NewMessage(pattern="^@tagall ?(.*)"))
 @client.on(events.NewMessage(pattern="^@all ?(.*)"))
@@ -50,15 +50,17 @@ async def mentionall(event):
             "__Reply to a message or give me some text to mention others!__"
         )
 
-    spam_chats.append(chat_id)
+    spam_chats.add(chat_id)
     usrnum = 0
     usrtxt = ""
     async for usr in client.iter_participants(chat_id):
-        if not chat_id in spam_chats:
+        if chat_id not in spam_chats:
             break
         usrnum += 1
         usrtxt += f"[{usr.first_name}](tg://user?id={usr.id}), "
         if usrnum == 15:
+            if chat_id not in spam_chats:
+                break
             if mode == "text_on_cmd":
                 txt = f"{msg}\n{usrtxt}"
                 await client.send_message(chat_id, txt)
@@ -68,14 +70,14 @@ async def mentionall(event):
             usrnum = 0
             usrtxt = ""
     try:
-        spam_chats.remove(chat_id)
+        spam_chats.discard(chat_id)
     except:
         pass
 
 
 @client.on(events.NewMessage(pattern="^/cancel$"))
 async def cancel_spam(event):
-    if not event.chat_id in spam_chats:
+    if event.chat_id not in spam_chats:
         return await event.respond("ᴛʜᴇʀᴇ ɪs ɴᴏ ᴘʀᴏᴄᴄᴇss ᴏɴ ɢᴏɪɴɢ..")
     is_admin = False
     try:
@@ -91,10 +93,7 @@ async def cancel_spam(event):
         return await event.respond("__ᴏɴʟʏ ᴀᴅᴍɪɴs ᴄᴀɴ ᴇxᴇᴄᴜᴛᴇ ᴛʜɪs ᴄᴏᴍᴍᴀɴᴅ!__")
 
     else:
-        try:
-            spam_chats.remove(event.chat_id)
-        except:
-            pass
+        spam_chats.discard(event.chat_id)
         return await event.respond("sᴛᴏᴘᴘᴇᴅ ᴍᴇɴᴛɪᴏɴ.__")