Update botsignal.py

botsignal.py

@@ -319,7 +319,7 @@ INVITE_PATTERNS = [
     # tautan undangan/shortener
     r"(t\.me\/joinchat|t\.me\/\+|telegram\.me\/|discord\.gg\/|wa\.me\/|whatsapp\.com\/)",
     r"(bit\.ly|tinyurl\.com|linktr\.ee)",
-    # --- UPGRADE --- Dihapus aturan agresif yang memblokir semua link t.me
+    # UPGRADE: Aturan agresif yang memblokir semua link t.me biasa tetap dihapus
     # r"t\.me\/[A-Za-z0-9_]+",
 ]
 INVITE_REGEXES = [re.compile(p, re.IGNORECASE) for p in INVITE_PATTERNS]
@@ -409,7 +409,7 @@ async def _send_initial(msg, text: str) -> int:
         try:
             if getattr(msg, "photo", None):
                 m = await client.send_file(
-                    TARGET_CHAT, msg.photo, caption=text, caption_entities=None, force_document=False, parse_mode='md'
+                    TARGET_CHAT, msg.photo, caption=text, caption_entities=None, force_document=False
                 )
                 return m.id
             doc = getattr(msg, "document", None)
@@ -426,7 +426,7 @@ async def _send_initial(msg, text: str) -> int:
                         ext = ext_guess
                     bio.name = f"media{ext}"
                     m = await client.send_file(
-                        TARGET_CHAT, bio, caption=text, caption_entities=None, force_document=False, parse_mode='md'
+                        TARGET_CHAT, bio, caption=text, caption_entities=None, force_document=False
                     )
                     return m.id
         except FloodWaitError as e:
@@ -435,8 +435,7 @@ async def _send_initial(msg, text: str) -> int:
         except Exception as e:
             debug_log("Gagal kirim media awal, fallback text", str(e))
     try:
-        # --- UPGRADE --- Menggunakan parse_mode='md' agar format **bold** berfungsi
-        m = await client.send_message(TARGET_CHAT, text, link_preview=True, parse_mode='md')
+        m = await client.send_message(TARGET_CHAT, text, link_preview=True)
         return m.id
     except FloodWaitError as e:
         await asyncio.sleep(e.seconds + 1)
@@ -461,8 +460,7 @@ async def post_or_update(keyword: str, body: str, new_tier: str, src_msg, *, upd
     # Jika tier naik, selalu edit
     if TIER_ORDER.get(new_tier, 0) > TIER_ORDER.get(prev["tier"], 0):
         try:
-            # --- UPGRADE --- Menggunakan parse_mode='md' agar format **bold** berfungsi
-            await client.edit_message(TARGET_CHAT, prev["msg_id"], text, parse_mode='md')
+            await client.edit_message(TARGET_CHAT, prev["msg_id"], text)
             prev["tier"] = new_tier
             last_body[keyword] = body
             last_update_ts[keyword] = now_ts
@@ -490,25 +488,24 @@ async def post_or_update(keyword: str, body: str, new_tier: str, src_msg, *, upd
         return
 
     try:
-        # --- UPGRADE --- Menggunakan parse_mode='md' agar format **bold** berfungsi
         if UPDATE_STRATEGY == "edit":
-            await client.edit_message(TARGET_CHAT, prev["msg_id"], text, parse_mode='md')
+            await client.edit_message(TARGET_CHAT, prev["msg_id"], text)
             last_body[keyword] = body
             last_update_ts[keyword] = now_ts
             if prev["msg_id"] != -1:
                 db_save_last_posted(keyword, prev["msg_id"], new_tier)
         elif UPDATE_STRATEGY == "reply":
             # kirim balasan ke pesan awal entitas
-            await client.send_message(TARGET_CHAT, text, reply_to=prev["msg_id"], link_preview=True, parse_mode='md')
+            await client.send_message(TARGET_CHAT, text, reply_to=prev["msg_id"], link_preview=True)
             last_body[keyword] = body
             last_update_ts[keyword] = now_ts
         elif UPDATE_STRATEGY == "new":
-            await client.send_message(TARGET_CHAT, text, link_preview=True, parse_mode='md')
+            await client.send_message(TARGET_CHAT, text, link_preview=True)
             last_body[keyword] = body
             last_update_ts[keyword] = now_ts
         else:
             # fallback ke edit jika value salah
-            await client.edit_message(TARGET_CHAT, prev["msg_id"], text, parse_mode='md')
+            await client.edit_message(TARGET_CHAT, prev["msg_id"], text)
             last_body[keyword] = body
             last_update_ts[keyword] = now_ts
             if prev["msg_id"] != -1:
@@ -771,17 +768,6 @@ async def process_message(msg, source_chat_id: int) -> None:
     if not cleaned_body.strip():
         debug_log("Semua kalimat terfilter (kosong), dilewati", orig_text)
         return
-        
-    # --- UPGRADE --- Dapatkan nama channel sumber untuk transparansi
-    try:
-        source_entity = await client.get_entity(source_chat_id)
-        source_name = getattr(source_entity, 'title', 'Sumber Tidak Dikenal')
-    except Exception:
-        source_name = 'Sumber Tidak Dikenal'
-
-    # --- UPGRADE --- Tambahkan footer yang berisi info sumber dan peran
-    footer = f"\n\n**Sumber:** {source_name} | **Peran:** {role.upper()}"
-    body_with_footer = cleaned_body + footer
 
     # Backfill safety: saat startup, hindari pesan yang terlalu lama
     cutoff = startup_time_utc - timedelta(
@@ -797,8 +783,7 @@ async def process_message(msg, source_chat_id: int) -> None:
     if entity_key:
         recent_entity_keys.append(entity_key)
 
-    # --- UPGRADE --- Gunakan body_with_footer untuk dikirim
-    await post_or_update(topic_key, body_with_footer, class_label, msg, update_like=update_like)
+    await post_or_update(topic_key, cleaned_body, class_label, msg, update_like=update_like)
     debug_log(
         f"Posted/Edited (role={role}, unique_groups={unique_groups}, key={topic_key}, tier={class_label}, update_like={update_like})",
         orig_text,
@@ -808,17 +793,14 @@ async def process_message(msg, source_chat_id: int) -> None:
 async def backfill_history(entity, limit: int) -> None:
     if limit <= 0:
         return
-    print(f"[Backfill] Tarik {limit} pesan terakhir dari {entity.title} ...")
+    print(f"[Backfill] Tarik {limit} pesan terakhir dari {getattr(entity, 'title', 'Unknown')} ...")
     async for m in client.iter_messages(entity, limit=limit):
         try:
-            # --- UPGRADE --- Memastikan ID diteruskan dengan benar
             chat_id = getattr(m.peer_id, 'channel_id', None) or \
                       getattr(m.peer_id, 'chat_id', None) or \
                       getattr(m.peer_id, 'user_id', None)
             if chat_id:
-                # Telethon terkadang memberikan ID negatif untuk grup, kita butuh absolutnya
                 await process_message(m, source_chat_id=abs(chat_id))
-
         except Exception as e:
             debug_log(f"Error saat memproses backfill untuk pesan ID {m.id}", str(e))
 
@@ -827,7 +809,7 @@ async def backfill_history(entity, limit: int) -> None:
 @client.on(events.NewMessage(chats=SOURCE_CHATS))
 async def on_new_message(event):
     try:
-        await process_message(event.message, source_chat_id=event.chat_id)
+        await process_message(event.message, source_chat_id=abs(event.chat_id))
     except Exception as e:
         print(f"Process error di chat {event.chat_id}: {e}")
 
@@ -839,7 +821,6 @@ async def _resolve_and_tag_chats(raw_list, role_label: str) -> list:
         try:
             ent = await client.get_entity(src)
             resolved.append(ent)
-            # --- UPGRADE --- Memastikan ID yang disimpan selalu positif untuk konsistensi
             chat_roles[abs(int(ent.id))] = role_label
         except Exception as e:
             print(f"Gagal resolve sumber {src}: {e}")