Update code2.py

code2.py

@@ -7,7 +7,12 @@ from datetime import datetime, timedelta
 from telethon import TelegramClient, events
 from telethon.tl.custom import Button
 from telethon.tl.types import ChatAdminRights, ChatBannedRights, ChannelParticipantsAdmins
-
+import re
+from telethon import events
+from telethon.errors.rpcerrorlist import YouCannotBanYourselfError
+from telethon.tl.functions.channels import EditBannedRequest
+from telethon.tl.types import ChatBannedRights
+from telethon.tl.types import MessageEntityMentionName
 
 
 API_ID = os.getenv("API_ID")
@@ -23,19 +28,10 @@ logger.info("Logging has been set up.")
 client = TelegramClient("TruesBlacklister", API_ID, API_HASH).start(bot_token=BOT_TOKEN)
 logger.info("Initialized Telethon client")
 
-# Define the list of blacklisted words
 blacklist = ["counterfeit", "meth", "shard", "heroin", "ghb"]
 
-@client.on(events.NewMessage(pattern='/start'))
-async def start(event):
-    await event.respond('I am alive!')
-
-@client.on(events.NewMessage(pattern='/help'))
-async def help(event):
-    await event.respond('I can blacklist certain words. Just type them in a chat I am in!')
-
-@client.on(events.NewMessage(incoming=True))
 async def check_blacklist(event):
+
     if any(
         re.search(rf"\b{re.escape(word)}\b", event.raw_text, re.IGNORECASE)
         for word in blacklist
@@ -44,17 +40,11 @@ async def check_blacklist(event):
 
         user = await event.get_sender()
         if user:
-            logger.info(
-                f"User id: {user.id}, username: {user.username}"
-            )
+            logger.info(f"User id: {user.id}, username: {user.username}")
 
         # Check if the user is an admin
-        try:
-            chat_admins = await client.get_participants(event.chat_id, filter=ChannelParticipantsAdmins)
-            is_admin = any(admin.id == user.id for admin in chat_admins)
-        except Exception as e:
-            logger.error(f"Failed to check user admin status: {e}")
-            is_admin = False
+        chat_admins = await event.get_chat_administrators()
+        is_admin = any(admin.user.id == user.id for admin in chat_admins)
 
         if not is_admin:
             try:
@@ -62,21 +52,19 @@ async def check_blacklist(event):
                 logger.info("User is not an admin. Deleted the message.")
 
                 # Mute the user by revoking their ability to send messages
-                await client.edit_permissions(
-                    entity=event.chat_id,
-                    user_id=user.id,
+                await event.chat.edit_permissions(
+                    user.id,
                     send_messages=False
                 )
             except Exception as e:
-                logger.error("Failed to mute the user. Skipping action.")
+                logger.error(f"Failed to mute the user: {e}")
 
             buttons = [
                 [Button.inline("Unmute", b"unmute")],
                 [Button.inline("Ban", b"ban")],
             ]
-            await client.send_message(
-                entity=event.chat_id,
-                message=f"{user.username}, Your message has been deleted due to a blacklisted word. Please select an action:",
+            await event.respond(
+                f"{user.mention}, Your message has been deleted due to a blacklisted word. Please select an action:",
                 buttons=buttons
             )
         else:
@@ -84,34 +72,34 @@ async def check_blacklist(event):
     else:
         logger.info("Message does not contain a blacklisted word.")
 
-
-
-@client.on(events.CallbackQuery())
-async def handle_button(event):
-    user = await event.get_sender()
+@client.on(events.CallbackQuery(data="unmute"))
+async def unmute_user(event):
+    user_id = event.data_match.group(1)
     try:
-        if event.data.decode("utf-8") == "unmute":
-            await client.edit_permissions(
-                entity=event.chat_id,
-                user_id=user.id,
-                view_messages=True
-            )
-            await event.respond(f"{user.username} has been unmuted.")
-            await asyncio.sleep(10)  # Pause for 10 seconds
-            await event.delete()
-
-        elif event.data.decode("utf-8") == "ban":
-            await client.edit_permissions(
-                entity=event.chat_id,
-                user_id=user.id,
-                view_messages=False
-            )
-            await event.respond(f"{user.username} has been banned.")
-            await asyncio.sleep(10)  # Pause for 10 seconds
-            await event.delete()
+        await event.chat.edit_permissions(
+            entity=int(user_id),
+            send_messages=True
+        )
+        await event.respond("User has been unmuted.")
+    except Exception as e:
+        await event.respond(f"Failed to unmute user: {e}")
 
+@client.on(events.CallbackQuery(data="ban"))
+async def ban_user(event):
+    user_id = event.data_match.group(1)
+    try:
+        await event.chat.edit_permissions(
+            entity=int(user_id),
+            send_messages=False,
+            until_date=None  # Ban the user permanently
+        )
+        await event.respond("User has been banned.")
+    except YouCannotBanYourselfError:
+        await event.respond("You cannot ban yourself!")
     except Exception as e:
-        logger.error(f"An error occurred: {e}")
+        await event.respond(f"Failed to ban user: {e}")
 
-client.run_until_disconnected()
+# Register the check_blacklist function to listen for new messages
+client.add_event_handler(check_blacklist, events.NewMessage(incoming=True))
 
+client.run_until_disconnected()