Update botsignal.py

botsignal.py

@@ -4,7 +4,7 @@ import re
 import io
 import sqlite3
 import hashlib
-from collections import deque, defaultdict, Counter
+from collections import deque, defaultdict
 from datetime import datetime, timedelta, timezone
 from mimetypes import guess_extension
 from typing import List, Tuple, Optional, Dict
@@ -81,9 +81,6 @@ DRY_RUN = os.environ.get("DRY_RUN", "0") == "1"
 # Backfill buffer: abaikan pesan lebih tua dari (startup_time - buffer)
 BACKFILL_BUFFER_MINUTES = int(os.environ.get("BACKFILL_BUFFER_MINUTES", "3"))
 
-# Opsional: bypass gating support bila keyword dominan adalah $ticker (default ON)
-SUPPORT_TICKER_BYPASS = os.environ.get("SUPPORT_TICKER_BYPASS", "1") == "1"
-
 
 # ========= Client bootstrap =========
 def build_client() -> TelegramClient:
@@ -236,6 +233,9 @@ def score_relevance(text: str, keywords: List[str]) -> float:
 
     return exact_score + fuzzy_score
 
+def _strip_urls_mentions_only(s: str) -> str:
+    return _strip_urls_and_mentions(s)
+
 def hash_for_dedup(text: str, msg) -> str:
     """Hash campuran (lama) – menahan duplikat per pesan+media."""
     parts = [text or ""]
@@ -254,7 +254,7 @@ def hash_for_dedup(text: str, msg) -> str:
 
 def content_only_hash(text: str) -> str:
     """Hash berbasis isi saja (untuk lintas-grup crosspost)."""
-    norm = _strip_urls_and_mentions(normalize_for_filter(text))
+    norm = _strip_urls_mentions_only(normalize_for_filter(text))
     return hashlib.sha1(norm.encode("utf-8", errors="ignore")).hexdigest()
 
 def is_image_message(msg) -> bool:
@@ -360,7 +360,7 @@ def filter_invite_sentences(text: str) -> str:
 
 # ========= Post-on-threshold with EDIT (persisted) =========
 TIER_ORDER = {"rendah": 0, "sedang": 1, "kuat": 2}
-last_posted: Dict[str, Dict[str, object]] = {}  # keyword -> {"msg_id": int, "tier": str}
+last_posted: Dict[str, Dict[str, object]] = {}
 
 async def _send_initial(msg, text: str) -> int:
     if DRY_RUN:
@@ -393,9 +393,6 @@ async def _send_initial(msg, text: str) -> int:
         except Exception as e:
             debug_log("Gagal kirim media awal, fallback text", str(e))
     try:
-        if DRY_RUN:
-            print("[DRY_RUN] send_message:", text[:140])
-            return -1
         m = await client.send_message(TARGET_CHAT, text, link_preview=True)
         return m.id
     except FloodWaitError as e:
@@ -403,7 +400,7 @@ async def _send_initial(msg, text: str) -> int:
         return await _send_initial(msg, text)
 
 async def post_or_update(keyword: str, body: str, new_tier: str, src_msg) -> None:
-    prefix = f"[{new_tier.UPPER()}] " if hasattr(new_tier, "UPPER") else f"[{new_tier.upper()}] "
+    prefix = f"[{new_tier.upper()}] "
     text = prefix + body
     prev = last_posted.get(keyword)
     if not prev:
@@ -415,10 +412,7 @@ async def post_or_update(keyword: str, body: str, new_tier: str, src_msg) -> Non
 
     if TIER_ORDER.get(new_tier, 0) > TIER_ORDER.get(prev["tier"], 0):
         try:
-            if DRY_RUN:
-                print(f"[DRY_RUN] edit_message (kw={keyword}) -> {text[:140]}")
-            else:
-                await client.edit_message(TARGET_CHAT, prev["msg_id"], text)
+            await client.edit_message(TARGET_CHAT, prev["msg_id"], text)
             prev["tier"] = new_tier
             if prev["msg_id"] != -1:
                 db_save_last_posted(keyword, prev["msg_id"], new_tier)
@@ -556,11 +550,23 @@ def _choose_dominant_keyword(text_norm: str, kws: List[str]) -> Optional[str]:
 def _role_of(chat_id: int) -> str:
     return chat_roles.get(chat_id, "core")
 
+def _unique_counts_by_role(keyword: str) -> Tuple[int, int]:
+    """
+    Hitung jumlah grup unik yang menyebut 'keyword' dalam window aktif,
+    dipisah CORE vs SUPPORT.
+    """
+    bucket = keyword_group_last_seen.get(keyword, {})
+    core_ids, sup_ids = set(), set()
+    for gk in bucket.keys():
+        role = chat_roles.get(int(gk), "core")
+        (core_ids if role == "core" else sup_ids).add(gk)
+    return len(core_ids), len(sup_ids)
+
 
 async def process_message(msg, source_chat_id: int) -> None:
     """
     Filter, content-dedup, relevansi, multi-kw -> pilih dominan,
-    agregasi tier, gating support, filter ajakan, dan POST/EDIT.
+    agregasi tier, gating support (CORE-anchored), filter ajakan, dan POST/EDIT.
     """
     orig_text = msg.message or (getattr(msg, "raw_text", None) or "")
     text_norm = normalize_for_filter(orig_text).lower()
@@ -605,12 +611,16 @@ async def process_message(msg, source_chat_id: int) -> None:
     now = datetime.now(timezone.utc)
     class_label, unique_groups = update_and_classify(main_kw, group_key, now)
 
-    # Gating SUPPORT: izinkan $ticker bila SUPPORT_TICKER_BYPASS aktif
+    # Gating SUPPORT (CORE-anchored)
     if role == "support":
-        if main_kw.startswith("$") and SUPPORT_TICKER_BYPASS:
+        core_u, sup_u = _unique_counts_by_role(main_kw)
+        # Aturan:
+        # - Jika sudah ada minimal 1 sebutan dari CORE untuk keyword ini -> izinkan.
+        # - Jika belum ada anchor CORE, SUPPORT harus >= SUPPORT_MIN_UNIQUE.
+        if core_u >= 1:
             pass
-        elif unique_groups < SUPPORT_MIN_UNIQUE:
-            debug_log(f"Support ditahan (unique_groups={unique_groups} < {SUPPORT_MIN_UNIQUE})", orig_text)
+        elif sup_u < SUPPORT_MIN_UNIQUE:
+            debug_log(f"Support ditahan (core_u={core_u}, sup_u={sup_u} < {SUPPORT_MIN_UNIQUE})", orig_text)
             return
 
     # Filter kalimat ajakan (whitelist-aware)