Update botsignal.py

botsignal.py

@@ -10,12 +10,13 @@ from datetime import datetime, timedelta, timezone
 from mimetypes import guess_extension
 from typing import List, Tuple, Optional, Dict
 
+import aiohttp
 from rapidfuzz import fuzz
 from telethon import TelegramClient, events
 from telethon.sessions import StringSession, MemorySession
 from telethon.errors.rpcerrorlist import FloodWaitError
 
-
+# Attach autotrack (silent start, reply >=1.5x) — pastikan autotrack.py kamu versi terbaru
 from autotrack import setup_autotrack
 
 
@@ -180,7 +181,6 @@ RELEVANCE_THRESHOLD = float(os.environ.get("RELEVANCE_THRESHOLD", "0.6"))
 EXCLUDE_PHRASES = [p.strip().lower() for p in os.environ.get(
     "EXCLUDE_PHRASES",
     "achievement unlocked,call profit:,achieving +"
-
 ).split(",") if p.strip()]
 
 # ========= Client bootstrap =========
@@ -192,8 +192,10 @@ def build_client() -> TelegramClient:
     return TelegramClient(MemorySession(), API_ID, API_HASH)
 
 client = build_client()
-# Attach autotrack to the same Telethon client
+
+# Attach autotrack to the same Telethon client (silent start, reply >= 1.5x default)
 setup_autotrack(client)
+
 recent_hashes: deque[str] = deque(maxlen=DEDUP_BUFFER_SIZE)
 recent_content_hashes: deque[str] = deque(maxlen=DEDUP_BUFFER_SIZE)  # content-only dedup
 recent_entity_keys: deque[str] = deque(maxlen=DEDUP_BUFFER_SIZE)  # entity-based dedup
@@ -472,30 +474,101 @@ def _ca_from_key(keyword: str) -> str:
         return keyword.split("ca:sol:", 1)[1]
     return ""
 
-def build_midas_message_for_ca(ca: str, tier_label: str, body_snippet: Optional[str] = None) -> str:
+# ===== Number format for MCAP line =====
+def _fmt_big_usd(x):
+    if x is None:
+        return "—"
+    try:
+        x = float(x)
+    except:
+        return "—"
+    if x >= 1_000_000_000:
+        return f"${x/1_000_000_000:.2f}B"
+    if x >= 1_000_000:
+        return f"${x/1_000_000:.2f}M"
+    if x >= 1_000:
+        return f"${x/1_000:.2f}K"
+    return f"${x:.0f}"
+
+# ===== Dexscreener fetch (MCAP/FDV) =====
+DEXSCREENER_TOKEN_URL = "https://api.dexscreener.com/latest/dex/tokens/"
+
+async def _fetch_initial_mcap(ca: str):
     """
-    Brand style (English) for Contract Address posts.
-    body_snippet: optional original cleaned text to append as context (quoted).
+    Ambil perkiraan MCAP (marketCap atau FDV) sekali dari Dexscreener.
+    Return float atau None kalau gak ada.
     """
-    parts = [
-        "💎 [MidasTouch Signal] 💎",
-        "New contract detected:",
+    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
+        # pilih pair dengan USD liquidity terbesar
+        best = max(pairs, key=lambda p: (p.get("liquidity", {}) or {}).get("usd", 0))
+        mc = best.get("marketCap")
+        fdv = best.get("fdv")
+        if isinstance(mc, (int, float)) and mc > 0:
+            return float(mc)
+        if isinstance(fdv, (int, float)) and fdv > 0:
+            return float(fdv)
+        return None
+    except:
+        return None
+
+# ===== Milestones label (sinkron dengan env; default 1.5× • 2×) =====
+_M_RAW = os.environ.get("MILESTONES", "1.5,2")
+try:
+    _M_LIST = [x.strip() for x in _M_RAW.split(",") if x.strip()]
+    if not _M_LIST:
+        _M_LIST = ["1.5", "2"]
+    MILESTONES_LABEL = " • ".join(f"{m}×" for m in _M_LIST)
+except Exception:
+    _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:
+    """
+    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}"
+    axiom_link = "https://axiom.trade/@1144321"
+    mcap_line = f"MCAP (est.): {_fmt_big_usd(mcap_value)}"
+
+    first_alert = _M_LIST[0] if _M_LIST else "1.5"
+
+    lines = [
+        "✨ **MidasTouch — Fresh Alpha Drop**",
+        f"**Tier Now:** {tier_label}",
         "",
-        f"CA: `{ca}`",
+        "Here’s a fresh contract worth a look:",
+        f"**CA**: `{ca}`",
+        mcap_line,
         "",
-        f"Current Tier: {tier_label}",
-        "Auto-track milestone → Target 2× active 🎯",
+        "Quick actions:",
+        f"• 🔎 [Open on Dexscreener]({dexs_link})",
+        f"• 🛒 [Trade with Axiom]({axiom_link})",
         "",
-        "Remember: This is a signal, not financial advice.",
-        "Stay safe, stay golden ✨",
+        f"Auto-track armed → first alert at **{first_alert}×**; we hunt momentum to price discovery — no ceilings. 🎯",
+        "Plan the trade, trade the plan. Cut losers quick, compound the wins.",
+        "— **MidasTouch**",
     ]
-    msg = "\n".join(parts)
+    msg = "\n".join(lines)
+
+    # (opsional) sisipkan snippet sumber
     if body_snippet:
-        # append a minimal quoted context block (optional)
-        snippet = body_snippet.strip()
+        snippet = re.sub(r"\n{3,}", "\n\n", body_snippet.strip())
         if snippet:
-            snippet = re.sub(r"\n{3,}", "\n\n", snippet)
-            msg += "\n\n—\n" + snippet
+            msg += "\n\n> " + snippet.replace("\n", "\n> ")
+
     return msg
 
 def format_body_with_spacing(body: str, tier_label: str) -> str:
@@ -559,8 +632,8 @@ async def post_or_update(keyword: str, body: str, new_tier: str, src_msg, *, upd
     """
     Modified:
     - If `keyword` represents a Contract Address (ca:evm:/ca:sol:),
-      we format with brand style (English) via build_midas_message_for_ca,
-      bypassing the default spacing formatter.
+      we format with brand style via build_midas_message_for_ca
+      and menambahkan MCAP (fetch sekali sebelum kirim).
     """
     prev = last_posted.get(keyword)
     now_ts = datetime.now().timestamp()
@@ -568,7 +641,8 @@ async def post_or_update(keyword: str, body: str, new_tier: str, src_msg, *, upd
     # Choose text based on whether this is a CA entity or not
     if _is_ca_key(keyword):
         ca_val = _ca_from_key(keyword)
-        text_to_send = build_midas_message_for_ca(ca_val, new_tier, body_snippet=None)
+        mcap_val = await _fetch_initial_mcap(ca_val)  # ambil MCAP sekali
+        text_to_send = build_midas_message_for_ca(ca_val, new_tier, mcap_value=mcap_val, body_snippet=None)
     else:
         text_to_send = format_body_with_spacing(body, new_tier)
 
@@ -858,7 +932,7 @@ async def process_message(msg, source_chat_id: int) -> None:
         core_u, sup_u = _unique_counts_by_role(topic_key)
         if core_u < 1 and sup_u < SUPPORT_MIN_UNIQUE:
             debug_log(
-                f"Support ditahan (core_u={core_u}, sup_u={sup_u} < {SUPPORT_MIN_UNIQUE})",
+                f"Support ditahan (core_u={core_u}, sup_u={SUPPORT_MIN_UNIQUE})",
                 orig_text,
             )
             return