Update botsignal.py

botsignal.py

@@ -19,29 +19,24 @@ API_HASH = os.environ.get("API_HASH", "")
 STRING_SESSION = os.environ.get("STRING_SESSION", "")
 
 # --- Definisikan sumber sebagai CORE vs SUPPORT ---
-# (pakai data milikmu)
+# Boleh: "@username", id (int), atau "https://t.me/xxxxx"
 CORE_CHATS = [
     "https://t.me/PEPE_Calls28",
-    "https://t.me/HenryGems",
+    "https://t.me/Tanjirocall",
+]
+SUPPORT_CHATS = [
     "https://t.me/ChinaPumpCommunity",
     "https://t.me/Milagrosdegencalls",
     "https://t.me/GM_Degencalls",
 ]
-SUPPORT_CHATS = [
-    "https://t.me/SephirothGemCalls1",
-    "https://t.me/TheDonALPHAJournal",
-    "https://t.me/savascalls",
-    "https://t.me/Tanjirocall",
-    "https://t.me/ChapoInsider",
-]
 
-# Gabungan untuk handler event (hindari unpack agar sederhana)
+# Gabungan untuk handler event
 SOURCE_CHATS = CORE_CHATS + SUPPORT_CHATS
 
 # Target (boleh @username / id / link)
-TARGET_CHAT = os.environ.get("TARGET_CHAT", "https://t.me/MidasTouchsignalll")
+TARGET_CHAT = os.environ.get("TARGET_CHAT", "https://t.me/MidasTouchsignall")
 
-# Kata kunci topik untuk relevansi
+# Kata kunci topik untuk relevansi (termasuk ticker)
 THEME_KEYWORDS = [
     "call", "signal", "entry", "buy", "sell", "tp", "sl",
     "pump", "spot", "futures", "setup",
@@ -51,7 +46,7 @@ KEYWORD_WEIGHT = 1.0
 FUZZ_WEIGHT = 0.6
 RELEVANCE_THRESHOLD = float(os.environ.get("RELEVANCE_THRESHOLD", "1.0"))
 
-# Filter pengecualian: jika ada frasa ini (case-insensitive) -> skip seluruh pesan
+# Filter pengecualian: jika ada frasa ini (case-insensitive) -> skip bubble
 EXCLUDE_PHRASES = [
     "achievement unlocked",
 ]
@@ -202,7 +197,6 @@ def update_and_classify(keyword: str, group_key: str, now: Optional[datetime] =
 
 
 # ========= Sentence-level invite filter =========
-# Pola ajakan (join/DM/VIP/premium/berbayar/dll) — case-insensitive.
 INVITE_PATTERNS = [
     r"\bjoin\b", r"\bjoin (us|our|channel|group)\b",
     r"\bdm\b", r"\bdm (me|gw|gue|gua|saya|admin)\b",
@@ -223,32 +217,88 @@ def _is_invite_sentence(s: str) -> bool:
 
 def filter_invite_sentences(text: str) -> str:
     """
-    Hapus hanya kalimat/segmen yang mengandung ajakan (join/DM/VIP/dll),
-    tapi pertahankan bubble aslinya (gabungkan kembali jadi satu pesan).
+    Hapus kalimat yang mengandung ajakan (join/DM/VIP/dll),
+    tapi pertahankan 1 bubble (gabung ulang).
     """
     if not text:
         return text
-
-    # Pisah berdasarkan akhir kalimat . ! ? atau newline (umum di Telegram)
     parts = re.split(r'(?<=[\.\!\?])\s+|\n+', text, flags=re.UNICODE)
     kept = [p.strip() for p in parts if p and not _is_invite_sentence(p)]
-
-    # Gabungkan kembali; gunakan newline agar tetap rapi, tapi tetap 1 bubble.
     cleaned = "\n".join(kept).strip()
-    # Rapikan newline ganda
     cleaned = re.sub(r"\n{3,}", "\n\n", cleaned)
     return cleaned
 
 
+# ========= Post-on-threshold with EDIT =========
+TIER_ORDER = {"rendah": 0, "sedang": 1, "kuat": 2}
+last_posted: Dict[str, Dict[str, object]] = {}  # keyword -> {"msg_id": int, "tier": str}
+
+async def _send_initial(msg, text: str) -> int:
+    """Kirim pertama kali (pilih media bila ada & diizinkan). Return message id."""
+    # Jangan gunakan entities lama karena text sudah diubah (prefix/cleaned)
+    if INCLUDE_MEDIA and is_image_message(msg) and not media_too_big(msg):
+        try:
+            if getattr(msg, "photo", None):
+                m = await client.send_file(TARGET_CHAT, msg.photo, caption=text, caption_entities=None, force_document=False)
+                return m.id
+            doc = getattr(msg, "document", None)
+            if doc:
+                data = await client.download_media(msg, file=bytes)
+                if data:
+                    bio = io.BytesIO(data)
+                    ext = ".jpg"
+                    mt = (getattr(doc, "mime_type", "") or "").lower()
+                    if mt:
+                        ext_guess = guess_extension(mt) or ".jpg"
+                        if ext_guess == ".jpe":
+                            ext_guess = ".jpg"
+                        ext = ext_guess
+                    bio.name = f"media{ext}"
+                    m = await client.send_file(TARGET_CHAT, bio, caption=text, caption_entities=None, force_document=False)
+                    return m.id
+        except Exception as e:
+            debug_log("Gagal kirim media awal, fallback text", str(e))
+
+    m = await client.send_message(TARGET_CHAT, text, link_preview=True)
+    return m.id
+
+async def post_or_update(keyword: str, body: str, new_tier: str, src_msg) -> None:
+    """
+    Kirim sekali per keyword; jika tier naik, EDIT pesan lama.
+    Tidak melakukan apa-apa jika tier tidak naik (hindari spam).
+    """
+    prefix = f"[{new_tier.upper()}] "
+    text = prefix + body
+
+    prev = last_posted.get(keyword)
+    if not prev:
+        msg_id = await _send_initial(src_msg, text)
+        last_posted[keyword] = {"msg_id": msg_id, "tier": new_tier}
+        return
+
+    # Sudah pernah post → cek apakah naik tier
+    if TIER_ORDER.get(new_tier, 0) > TIER_ORDER.get(prev["tier"], 0):
+        try:
+            await client.edit_message(TARGET_CHAT, prev["msg_id"], text)
+            prev["tier"] = new_tier
+        except Exception as e:
+            debug_log("Edit gagal, fallback kirim baru", str(e))
+            msg_id = await _send_initial(src_msg, text)
+            last_posted[keyword] = {"msg_id": msg_id, "tier": new_tier}
+    else:
+        # Tier sama / turun → no-op (hindari spam)
+        pass
+
+
 # ========= Core actions =========
 async def send_as_is(msg, text_override: Optional[str] = None) -> None:
     """
-    Forward konten ke TARGET_CHAT, dengan media bila sesuai.
-    Jika text_override diberikan, entity asli TIDAK dipertahankan (offset berubah).
+    (Tersisa untuk kasus lain yang butuh forward apa adanya.)
+    Di mode post-on-threshold kita pakai post_or_update(), bukan fungsi ini.
     """
     if text_override is not None:
         orig_text = text_override
-        entities = None  # jangan pakai entities lama: offset sudah tidak cocok
+        entities = None
     else:
         orig_text = msg.message or (getattr(msg, "raw_text", None) or "")
         entities = getattr(msg, "entities", None)
@@ -256,13 +306,8 @@ async def send_as_is(msg, text_override: Optional[str] = None) -> None:
     if INCLUDE_MEDIA and is_image_message(msg) and not media_too_big(msg):
         try:
             if getattr(msg, "photo", None):
-                await client.send_file(
-                    TARGET_CHAT, msg.photo,
-                    caption=orig_text, caption_entities=entities,
-                    force_document=False,
-                )
+                await client.send_file(TARGET_CHAT, msg.photo, caption=orig_text, caption_entities=entities, force_document=False)
                 return
-
             doc = getattr(msg, "document", None)
             if doc:
                 data = await client.download_media(msg, file=bytes)
@@ -276,27 +321,15 @@ async def send_as_is(msg, text_override: Optional[str] = None) -> None:
                             ext_guess = ".jpg"
                         ext = ext_guess
                     bio.name = f"media{ext}"
-                    await client.send_file(
-                        TARGET_CHAT, bio,
-                        caption=orig_text, caption_entities=entities,
-                        force_document=False,
-                    )
+                    await client.send_file(TARGET_CHAT, bio, caption=orig_text, caption_entities=entities, force_document=False)
                     return
         except Exception as e:
             debug_log("Gagal kirim sebagai media, fallback ke text", str(e))
 
-    await client.send_message(
-        TARGET_CHAT,
-        orig_text,
-        formatting_entities=entities,
-        link_preview=True,
-    )
+    await client.send_message(TARGET_CHAT, orig_text, formatting_entities=entities, link_preview=True)
 
 def _extract_main_keyword(text_norm: str) -> Optional[str]:
-    """
-    Ambil keyword utama pertama yang muncul.
-    Toleran untuk ticker $BTC -> btc.
-    """
+    """Ambil keyword utama pertama yang muncul. Toleran untuk $BTC -> btc."""
     t = re.sub(r"\$([a-z0-9]+)", r"\1", text_norm, flags=re.I)
     for kw in THEME_KEYWORDS:
         if re.search(rf"(^|\W){re.escape(kw)}(\W|$)", t, flags=re.I):
@@ -310,7 +343,8 @@ def _role_of(chat_id: int) -> str:
 
 async def process_message(msg, source_chat_id: int) -> None:
     """
-    Filter, dedup, relevansi, klasifikasi, gating support vs core, potong kalimat ajakan, lalu kirim.
+    Filter, dedup, relevansi, klasifikasi, gating support vs core,
+    potong kalimat ajakan, lalu POST/EDIT sesuai threshold.
     """
     orig_text = msg.message or (getattr(msg, "raw_text", None) or "")
     text_norm = normalize_for_filter(orig_text).lower()
@@ -321,7 +355,7 @@ async def process_message(msg, source_chat_id: int) -> None:
             debug_log("Dilewati karena EXCLUDE_PHRASES", orig_text)
             return
 
-    # Dedup
+    # Dedup (berbasis teks norm + id media)
     h = hash_for_dedup(text_norm, msg)
     if h in recent_hashes:
         debug_log("Duplikat, dilewati", orig_text)
@@ -338,14 +372,15 @@ async def process_message(msg, source_chat_id: int) -> None:
 
     # Tentukan keyword & kelas
     main_kw = _extract_main_keyword(text_norm)
-    class_label = None
-    unique_groups = 0
-    if main_kw:
-        group_key = str(source_chat_id)
-        now = datetime.now(timezone.utc)
-        class_label, unique_groups = update_and_classify(main_kw, group_key, now)
+    if not main_kw:
+        debug_log("Tak ada keyword utama yang cocok, dilewati", orig_text)
+        return
+
+    group_key = str(source_chat_id)
+    now = datetime.now(timezone.utc)
+    class_label, unique_groups = update_and_classify(main_kw, group_key, now)
 
-    # Gating: support hanya kirim jika unique_groups >= SUPPORT_MIN_UNIQUE
+    # Gating: support hanya tampil jika unique_groups >= SUPPORT_MIN_UNIQUE
     if role == "support" and unique_groups < SUPPORT_MIN_UNIQUE:
         debug_log(f"Support ditahan (unique_groups={unique_groups} < {SUPPORT_MIN_UNIQUE})", orig_text)
         return
@@ -356,14 +391,9 @@ async def process_message(msg, source_chat_id: int) -> None:
         debug_log("Semua kalimat terfilter (kosong), dilewati", orig_text)
         return
 
-    # Prefix kelas di awal teks (jika ada)
-    if class_label:
-        text_to_send = f"[{class_label.upper()}] {cleaned_body}"
-    else:
-        text_to_send = cleaned_body
-
-    await send_as_is(msg, text_override=text_to_send)
-    debug_log(f"Dikirim ke target (role={role}, unique_groups={unique_groups})", orig_text)
+    # Mode post-on-threshold + edit
+    await post_or_update(main_kw, cleaned_body, class_label, msg)
+    debug_log(f"Posted/Edited (role={role}, unique_groups={unique_groups}, kw={main_kw}, tier={class_label})", orig_text)
 
 
 async def backfill_history(entity, limit: int) -> None: