Update main.py

main.py

@@ -6,9 +6,7 @@ from telethon import TelegramClient, events
 # ---------------- CONFIG ----------------
 API_ID = 22138159
 API_HASH = "3fe4592e4cad72f366b6c564505f2d57"
-
 MASTER_BOT_SESSION = "master.session"
-SUPER_ADMIN_ID = 7205748624
 LOG_CHANNEL_ID = -1002524453831
 # ---------------------------------------
 
@@ -17,105 +15,81 @@ logger = logging.getLogger(__name__)
 
 master = TelegramClient(MASTER_BOT_SESSION, API_ID, API_HASH)
 
-# ---------- REGEX ----------
 LINK_WITH_ID = r"https?://t\.me/([a-zA-Z0-9_]+)/(\d+)"
-LINK_ONLY = r"https?://t\.me/([a-zA-Z0-9_]+)"
 USER_WITH_ID = r"@?([a-zA-Z0-9_]+)\s+(\d+)"
+LINK_ONLY = r"https?://t\.me/([a-zA-Z0-9_]+)"
 USER_ONLY = r"^@?([a-zA-Z0-9_]{5,})$"
-# ---------------------------
+
+
+def get_private_id(chat_id: int) -> int:
+    chat_id = abs(chat_id)
+    if chat_id > 10**12:
+        return chat_id - 1000000000000
+    return chat_id
 
 
 @master.on(events.NewMessage)
 async def convert_links(event):
     text = event.raw_text.strip()
-    matches = []
-
-    matches += re.findall(LINK_WITH_ID, text)
-    matches += re.findall(USER_WITH_ID, text)
 
-    no_id_users = set()
-    for u in re.findall(LINK_ONLY, text):
-        no_id_users.add(u)
-    for u in re.findall(USER_ONLY, text):
-        no_id_users.add(u)
+    with_id = re.findall(LINK_WITH_ID, text) + re.findall(USER_WITH_ID, text)
+    only_user = set(re.findall(LINK_ONLY, text) + re.findall(USER_ONLY, text))
 
-    if not matches and not no_id_users:
+    if not with_id and not only_user:
         return
 
     processing = None
-    if len(matches) + len(no_id_users) > 1:
-        processing = await event.reply("⏳ Processing links...")
+    if len(with_id) + len(only_user) > 1:
+        processing = await event.reply("⏳ Processing...")
 
-    results = []
+    out = []
 
-    # ---- CASE 1: USER PROVIDED MESSAGE ID ----
-    for username, msg_id in matches:
+    # --- Provided message ID ---
+    for username, msg_id in with_id:
         try:
             entity = await master.get_entity(username)
-            chat_name = getattr(entity, "title", None) or f"@{entity.username}"
-
-            private_id = abs(entity.id) - 1000000000000
-            private_link = f"https://t.me/c/{private_id}/{msg_id}"
+            private_id = get_private_id(entity.id)
+            name = getattr(entity, "title", None) or f"@{entity.username}"
 
-            results.append(
-                f"📌 **{chat_name}**\n"
-                f"🔗 `{private_link}`\n"
+            out.append(
+                f"📌 **{name}**\n"
+                f"🔗 `https://t.me/c/{private_id}/{msg_id}`\n"
             )
         except Exception:
-            results.append(f"❌ Failed: `{username} {msg_id}`")
+            out.append(f"❌ Failed: `{username} {msg_id}`")
 
-    # ---- CASE 2: AUTO LAST POST ID ----
-    for username in no_id_users:
+    # --- Auto last post ---
+    for username in only_user:
         try:
             entity = await master.get_entity(username)
-            chat_name = getattr(entity, "title", None) or f"@{entity.username}"
+            last = await master.get_messages(entity, limit=1)
+            if not last:
+                raise Exception
 
-            last_msg = await master.get_messages(entity, limit=1)
-            if not last_msg:
-                raise Exception("No messages")
+            msg_id = last[0].id
+            private_id = get_private_id(entity.id)
+            name = getattr(entity, "title", None) or f"@{entity.username}"
 
-            msg_id = last_msg[0].id
-            private_id = abs(entity.id) - 1000000000000
-            private_link = f"https://t.me/c/{private_id}/{msg_id}"
-
-            results.append(
-                f"📌 **{chat_name}** (last post)\n"
-                f"🔗 `{private_link}`\n"
+            out.append(
+                f"📌 **{name}** (last post)\n"
+                f"🔗 `https://t.me/c/{private_id}/{msg_id}`\n"
             )
         except Exception:
-            results.append(f"❌ Failed to get last post: `{username}`")
+            out.append(f"❌ Failed last post: `{username}`")
 
-    reply = "🔐 **Private Links**\n\n" + "\n".join(results)
+    result = "🔐 **Private Links**\n\n" + "\n".join(out)
 
     if processing:
-        await processing.edit(reply)
+        await processing.edit(result)
     else:
-        await event.reply(reply)
-
-    await master.send_message(
-        LOG_CHANNEL_ID,
-        "📜 **Link Conversion Log**\n\n" + "\n".join(results)
-    )
-
+        await event.reply(result)
 
-# ------------- BACKGROUND TASKS -------------
-async def load_registered_bots():
-    while True:
-        await asyncio.sleep(60)
-
-async def cleanup_idle_clients():
-    while True:
-        await asyncio.sleep(120)
-# --------------------------------------------
+    await master.send_message(LOG_CHANNEL_ID, result)
 
 
 async def main():
     await master.start()
     logger.info("✅ Master started")
-
-    asyncio.create_task(load_registered_bots())
-    asyncio.create_task(cleanup_idle_clients())
-
     await master.run_until_disconnected()