Update main.py

main.py

@@ -43,10 +43,10 @@ def has_code_entity(message):
             return True
     return False
 
-@bot.on_callback_query(filters.regex(r"^unwarn_(\d+)$"))
+@bot.on_callback_query(filters.regex(r"^unwarn_(\d+)_(\d+)$"))
 async def unwarn_button(client, callback_query):
     user_id = int(callback_query.matches[0].group(1))
-    chat_id = callback_query.message.chat.id
+    chat_id = int(callback_query.matches[0].group(2))
     from_user = callback_query.from_user
     try:
         member = await client.get_chat_member(chat_id, from_user.id)
@@ -58,12 +58,12 @@ async def unwarn_button(client, callback_query):
         return
 
     await db.warns.delete_one({"chat_id": chat_id, "user_id": user_id})
-    await callback_query.answer(f"✅ Peringatan untuk <code>{user_id}</code> telah dihapus.", show_alert=True)
+    await callback_query.message.edit_text(f"✅ Peringatan untuk <code>{user_id}</code> telah dihapus.")
 
-@bot.on_callback_query(filters.regex(r"^warn_(\d+)$"))
+@bot.on_callback_query(filters.regex(r"^warn_(\d+)_(\d+)$"))
 async def warn_button(client, callback_query):
     user_id = int(callback_query.matches[0].group(1))
-    chat_id = callback_query.message.chat.id
+    chat_id = int(callback_query.matches[0].group(2))
     from_user = callback_query.from_user
     try:
         member = await client.get_chat_member(chat_id, from_user.id)
@@ -89,32 +89,29 @@ async def warn_button(client, callback_query):
 
     if warn_count >= 3:
         try:
-            await client.ban_chat_member(
-                chat_id,
-                user_id,
+            await client.ban_chat_member(chat_id, user_id)
+            await callback_query.message.reply_text(
+                f"🚫 User <code>{user_id}</code> telah dihapus setelah 3 kali peringatan.",
                 reply_markup=InlineKeyboardMarkup(
                     [
                         [
                             InlineKeyboardButton(
-                                "Unban", callback_data=f"unban_{user_id}"
+                                "Unban", callback_data=f"unban_{user_id}_{chat_id}"
                             )
                         ]
                     ]
                 )
             )
-            await callback_query.message.reply_text(
-                f"🚫 User <code>{user_id}</code> telah dihapus setelah 3 kali peringatan."
-            )
             await db.warns.delete_one({"chat_id": chat_id, "user_id": user_id})
         except Exception as e:
             await callback_query.message.reply_text(f"Gagal menghapus user: {e}")
     else:
         await callback_query.answer(f"⚠️ Peringatan ke {warn_count} diberikan.", show_alert=True)
 
-@bot.on_callback_query(filters.regex(r"^unban_(\d+)$"))
+@bot.on_callback_query(filters.regex(r"^unban_(\d+)_(\d+)$"))
 async def unban_button(client, callback_query):
     user_id = int(callback_query.matches[0].group(1))
-    chat_id = callback_query.message.chat.id
+    chat_id = int(callback_query.matches[0].group(2))
     from_user = callback_query.from_user
     try:
         member = await client.get_chat_member(chat_id, from_user.id)
@@ -395,10 +392,18 @@ async def block_inline_via_bot(client, message):
             logging.info(f"check_anti_word_by_ryzenth: Blocked message from {message.from_user.first_name} in {message.chat.title}")
             return await message.delete()
 
+DISABLED_COMMANDS = [  
+    "delmodbot",
+    "addmodbot",
+    "delmoduser",
+    "addmoduser",
+    "start",
+    "delwarn",
+]
 
 @bot.on_message(
         filters.group
-        & ~filters.command(["delmodbot", "addmodbot", "delmoduser", "addmoduser", "start"])
+        & ~filters.command(DISABLED_COMMANDS)
         & ~filters.via_bot, 
         group=-1
     )
@@ -444,7 +449,7 @@ async def markdown_code(client, message):
                         [
                             [
                                 InlineKeyboardButton(
-                                    "Unban", callback_data=f"unban_{message.from_user.id}"
+                                    "Unban", callback_data=f"unban_{message.from_user.id}_{message.chat.id}"
                                 )
                             ]
                         ]
@@ -459,7 +464,7 @@ async def markdown_code(client, message):
                     [
                         [
                             InlineKeyboardButton(
-                                "Unwarn", callback_data=f"unwarn_{message.from_user.id}"
+                                "Unwarn", callback_data=f"unwarn_{message.from_user.id}_{message.chat.id}"
                             )
                         ]
                     ]
@@ -486,7 +491,7 @@ async def markdown_code(client, message):
                             [
                                 [
                                     InlineKeyboardButton(
-                                        "Unban", callback_data=f"unban_{message.from_user.id}"
+                                        "Unban", callback_data=f"unban_{message.from_user.id}_{message.chat.id}"
                                     )
                                 ]
                             ]
@@ -501,7 +506,7 @@ async def markdown_code(client, message):
                         [
                             [
                                 InlineKeyboardButton(
-                                    "Unwarn", callback_data=f"unwarn_{message.from_user.id}"
+                                    "Unwarn", callback_data=f"unwarn_{message.from_user.id}_{message.chat.id}"
                                 )
                             ]
                         ]