Update botsignal.py

botsignal.py

@@ -542,18 +542,81 @@ try:
         _M_LIST = ["1.5", "2"]
     MILESTONES_LABEL = " • ".join(f"{m}×" for m in _M_LIST)
 except Exception:
+# ===== Universal Dexscreener link (guess chain from context or API) =====
+CHAIN_HINTS = {
+    "bsc": "bsc", "bnb": "bsc", "binance": "bsc",
+    "eth": "ethereum", "ethereum": "ethereum",
+    "base": "base", "coinbase": "base",
+    "sol": "solana", "solana": "solana", "pump.fun": "solana"
+}
+
+def _guess_chain_from_text(t: str) -> Optional[str]:
+    t = (t or "").lower()
+    for k, v in CHAIN_HINTS.items():
+        if re.search(rf"(^|\W){re.escape(k)}(\W|$)", t):
+            return v
+    return None
+
+async def _fetch_best_chain_for_ca(ca: str) -> Optional[str]:
+    """
+    Query Dexscreener token endpoint to pick the chainId with highest USD liquidity.
+    """
+    try:
+        timeout = aiohttp.ClientTimeout(total=8)
+        async with aiohttp.ClientSession(timeout=timeout) as sess:
+            async with sess.get(DEXSCREENER_TOKEN_URL + ca) as r:
+                if r.status != 200:
+                    return None
+                data = await r.json()
+        pairs = (data or {}).get("pairs") or []
+        if not pairs:
+            return None
+        best = max(pairs, key=lambda p: (p.get("liquidity", {}) or {}).get("usd", 0))
+        chain_id = (best.get("chainId") or "").lower().strip()
+        # Dexscreener uses "ethereum", "bsc", "base", "solana", etc.
+        return chain_id or None
+    except:
+        return None
+
+async def _dexs_link_universal(ca: str, context_text: Optional[str] = None) -> str:
+    """
+    Build the proper Dexscreener URL for a CA:
+    - Solana: /solana/<ca>
+    - EVM:    /{ethereum|bsc|base}/<ca> (heuristic from text, fallback API, then default ethereum)
+    - Fallback: /token/<ca>
+    """
+    # Solana
+    if CA_SOL_RE.fullmatch(ca):
+        return f"https://dexscreener.com/solana/{ca}"
+
+    # EVM
+    if CA_EVM_RE.fullmatch(ca):
+        # (1) Heuristic from context text
+        hint = _guess_chain_from_text(context_text or "")
+        if hint:
+            return f"https://dexscreener.com/{hint}/{ca.lower()}"
+        # (2) Fallback query API to pick best chain by liquidity
+        chain = await _fetch_best_chain_for_ca(ca)
+        if chain:
+            return f"https://dexscreener.com/{chain}/{ca.lower()}"
+        # (3) Default
+        return f"https://dexscreener.com/ethereum/{ca.lower()}"
+
+    # Non-CA
+    return f"https://dexscreener.com/token/{ca}"
+
     _M_LIST = ["1.5", "2"]
     MILESTONES_LABEL = "1.5× • 2×"
 
 # ===== Creative CA message with MCAP + links =====
-def build_midas_message_for_ca(ca: str, tier_label: str, *, mcap_value=None, body_snippet: Optional[str] = None) -> str:
+def build_midas_message_for_ca(ca: str, tier_label: str, *, mcap_value=None, body_snippet: Optional[str] = None, dexs_link: Optional[str] = None) -> str:
     """
     Creative brand style untuk CA:
       - Tampilkan MCAP kalau tersedia
       - Sisipkan Dexscreener & Axiom
       - Copy 'first alert 1.5×' menuju discovery (no ceilings)
     """
-    dexs_link = f"https://dexscreener.com/token/{ca}"
+    dexs_link = dexs_link or f\"https://dexscreener.com/token/{ca}\"
     axiom_link = "https://axiom.trade/@1144321"
     mcap_line = f"MCAP (est.): {_fmt_big_usd(mcap_value)}"
 
@@ -893,6 +956,10 @@ async def process_message(msg, source_chat_id: int) -> None:
             return
 
     entity_key = extract_entity_key(orig_text)
+    # STRICT: Only process messages that contain a Contract Address (CA)
+    if not (entity_key and entity_key.startswith("ca:")):
+        debug_log("Bukan pesan CA, dilewati", orig_text)
+        return
     duplicate_entity = bool(entity_key and entity_key in recent_entity_keys)
 
     UPDATE_HINTS = [
@@ -930,7 +997,7 @@ async def process_message(msg, source_chat_id: int) -> None:
     all_kws = _extract_all_keywords(text_norm)
     main_kw = _choose_dominant_keyword(text_norm, all_kws)
 
-    topic_key = entity_key or main_kw
+    topic_key = entity_key
     if not topic_key:
         debug_log("Tak ada keyword/entitas cocok, dilewati", orig_text)
         return