Update autotrack.py

autotrack.py

@@ -34,10 +34,6 @@ STOP_WHEN_HIT = False
 
 # Abaikan pesan lebih tua dari (startup - buffer)
 BACKFILL_BUFFER_MINUTES = int(os.environ.get("BACKFILL_BUFFER_MINUTES", "3"))
-CUTOFF_BUFFER = timedelta(minutes=BACKFILL_BUFFER_MINUTES)
-
-# NEW: matikan cutoff default (biar pesan yang dipost sedikit sebelum attach tetap diproses).
-DISABLE_OLD_MESSAGE_CUTOFF = os.environ.get("DISABLE_OLD_MESSAGE_CUTOFF", "1") == "1"
 
 # Marker antirecursive: ditambahkan ke semua pengumuman bot (milestone)
 BOT_MARKER = "【MT-AUTOTRACK】"
@@ -85,16 +81,26 @@ def _fmt_big(x: Optional[float]) -> str:
         return f"${x/1_000:.2f}K"
     return f"${x:.0f}"
 
-def _parse_target_username(url_or_username: str) -> Optional[str]:
-    """Terima 'https://t.me/xxx' atau '@xxx' atau 'xxx' → kembalikan 'xxx' (lower)."""
-    if not url_or_username:
-        return None
-    s = url_or_username.strip()
-    if s.startswith("https://t.me/"):
-        s = s.split("https://t.me/", 1)[1]
-    if s.startswith("@"):
-        s = s[1:]
-    return s.lower()
+def _milestone_badge(m: float, basis: str) -> str:
+    """
+    Balikin judul milestone yang menonjol untuk semua level.
+    basis: "mcap" atau "price"
+    """
+    unit = "Market Cap" if basis == "mcap" else "Price"
+
+    # kategorisasi level agar konsisten & gampang dibaca
+    if m < 2.0 - 1e-9:              # 1.5× (reply awal)
+        return f"🟨 **ARMED — {m:.1f}× {unit}**"
+    elif abs(m - 2.0) < 1e-9:       # 2×
+        return f"🟩 **DOUBLE UP — 2× {unit}!**"
+    elif abs(m - 3.0) < 1e-9:       # 3×
+        return f"🔷 **TRIPLE — 3× {unit}!**"
+    elif 3.0 < m < 6.0:             # 4–5×
+        return f"🔶 **RALLY — {m:.0f}× {unit}!**"
+    elif 6.0 <= m < 10.0:           # 6–9×
+        return f"🟥 **OVERDRIVE — {m:.0f}× {unit}!**"
+    else:                           # 10×+
+        return f"🟣 **GOD CANDLE — {m:.0f}× {unit}!!**"
 
 # =========================
 # CA extraction
@@ -241,46 +247,30 @@ class PriceTracker:
             print(f"[TRACK] reply failed: {e}")
 
     def _milestone_text(self, item: TrackItem, m: float, ratio: float,
-                    cur_price: Optional[float], cur_mcap: Optional[float]) -> str:
-    # Links & label basis
+                        cur_price: Optional[float], cur_mcap: Optional[float]) -> str:
         dexs_link = f"https://dexscreener.com/solana/{item.ca}"
         axiom_link = "https://axiom.trade/@1144321"
-        basis_label = "Market Cap" if item.basis == "mcap" else "Price"
-
-        # Perubahan angka (jaga format sesuai basis)
         if item.basis == "mcap":
-            change = f"{_fmt_big(item.entry_mcap)} → {_fmt_big(cur_mcap)} (~{ratio:.2f}×)"
+            change = f"{_fmt_big(item.entry_mcap)} → {_fmt_big(cur_mcap)}  (~{ratio:.2f}×)"
         else:
-            change = f"{_fmt_money(item.entry_price)} → {_fmt_money(cur_price)} (~{ratio:.2f}×)"
-
-        # Nama token (punya fallback yg sudah ada)
-        name = self._name(item)
-
-        # Elapsed time (hh:mm:ss)
+            change = f"{_fmt_money(item.entry_price)} → {_fmt_money(cur_price)}  (~{ratio:.2f}×)"
+        milestone_line = _milestone_badge(m, item.basis)
         elapsed = int(time.time() - item.started_at)
-        hh, rem = divmod(elapsed, 3600)
-        mm, ss = divmod(rem, 60)
-        elapsed_str = (f"{hh}h {mm}m {ss}s" if hh else f"{mm}m {ss}s")
-
-        # Header + body yang rapi & branded
-        lines = [
-            "💎 **MidasTouch Signal**",
-            f"**Milestone {m}× {basis_label}** • **Now:** ~{ratio:.2f}×",
-            "",
-            f"**{name}**",
-            f"{change}",
-            f"⏱️ Since call: {elapsed_str}",
-            "",
-            "Quick Actions:",
-            f"• 🔎 [View on Dexscreener]({dexs_link})",
-            f"• 🛒 [Trade with Axiom]({axiom_link})",
-            "",
-            f"CA: `{item.ca}`",
-            "",
-            "_Signals ≠ certainty. DYOR. Manage risk like a pro._"
-        ]
-        return "\n".join(lines)
-
+        mm, ss = divmod(elapsed, 60)
+        header = "💎 [MidasTouch Signal] 💎\n━━━━━━━━━━━━━━━━"
+        footer = "━━━━━━━━━━━━━━━━"
+        body = (
+            f"{header}\n"
+            f"{milestone_line}\n"
+            f"{self._name(item)}\n"
+            f"{change}\n"
+            f"⏱️ {mm}m {ss}s since call\n"
+            f"🔎 [Dexscreener]({dexs_link})\n"
+            f"🛒 [Trade on Axiom]({axiom_link})\n"
+            f"CA: `{item.ca}`\n"
+            f"{footer}"
+        )
+        return body
 
     def _next_target_after(self, current_target: float) -> float:
         # Setelah 1.5×, lanjut integer berikutnya: 2×, 3×, 4×, ...
@@ -325,11 +315,8 @@ class PriceTracker:
             item.symbol_hint = snap.get("symbol_hint")
 
         if item.basis == "mcap" and not item.entry_mcap:
-            print(f"[TRACK] {item.ca} no mcap available at entry. Fallback to price basis.")
             item.basis = "price"
 
-        print(f"[TRACK] start {item.ca} basis={item.basis} entry_mcap={item.entry_mcap} entry_price={item.entry_price} poll={item.poll_secs}s")
-
         while True:
             snap = await self._get_snapshot(item.ca)
             if not snap:
@@ -354,35 +341,35 @@ class PriceTracker:
                 ratio = (cur_price / item.entry_price) if item.entry_price > 0 else 0.0
 
             # === NEW: auto delete kalau drop >= threshold ===
+            # ratio <= 0.5 berarti -50% dari entry (default)
             if DROP_DELETE_RATIO > 0 and ratio <= DROP_DELETE_RATIO:
-                print(f"[TRACK] {item.ca} dropped to {ratio:.2f}× (≤ {DROP_DELETE_RATIO}×). Deleting origin & stopping.")
                 await self._delete_origin_and_replies(item.ca)
                 return  # stop tracking setelah dihapus
 
             # --- milestone handling ---
             while ratio >= item.next_milestone:
-                print(f"[TRACK] {item.ca} hit {item.next_milestone}x (ratio={ratio:.2f})")
                 text = self._milestone_text(item, item.next_milestone, ratio, cur_price, cur_mcap)
-                await self._send_reply_to_origin(item.ca, text)
-
-                # >>> VIDEO milestone ≥ 3× (atau sesuai VIDEO_MIN_MULTIPLE)
-                if item.next_milestone >= VIDEO_MIN_MULTIPLE:
-                    if os.path.isfile(VIDEO_PATH):
-                        try:
-                            key = ca_key_for_db(item.ca)
-                            reply_to_id = lookup_origin_msg_id(key) if key else None
-                            await self.client.send_file(
-                                self.announce_chat,
-                                VIDEO_PATH,
-                                caption="🚀 To the Moon! 🌕",
-                                reply_to=reply_to_id if reply_to_id else None,
-                                force_document=False
-                            )
-                        except Exception as e:
-                            print(f"[TRACK] gagal kirim video: {e}")
-                    else:
-                        print(f"[TRACK] VIDEO_PATH tidak ditemukan: {VIDEO_PATH}")
-
+                key = ca_key_for_db(item.ca)
+                reply_to_id = lookup_origin_msg_id(key) if key else None
+                # Gabungkan jadi 1 pesan: kalau ≥ VIDEO_MIN_MULTIPLE dan ada file → kirim video dengan caption = text
+                if item.next_milestone >= VIDEO_MIN_MULTIPLE and os.path.isfile(VIDEO_PATH):
+                    try:
+                        await self.client.send_file(
+                            self.announce_chat,
+                            VIDEO_PATH,
+                            caption=f"{text}\n\n{BOT_MARKER}",
+                            reply_to=reply_to_id if reply_to_id else None,
+                            force_document=False
+                        )
+                    except Exception as e:
+                        print(f"[TRACK] gagal kirim video: {e}")
+                else:
+                    await self.client.send_message(
+                        self.announce_chat,
+                        f"{text}\n\n{BOT_MARKER}",
+                        reply_to=reply_to_id if reply_to_id else None,
+                        link_preview=False
+                    )
                 # Naikkan target ke milestone berikut
                 item.next_milestone = self._next_target_after(item.next_milestone)
 
@@ -412,7 +399,6 @@ class PriceTracker:
             symbol_hint=symbol_hint,
             next_milestone=REPLY_FROM_MULTIPLE,
         )
-        print(f"[TRACK] arming {ca} (basis={item.basis}, poll={item.poll_secs}s) from handler")
         self._tasks[ca] = asyncio.create_task(self._loop(item))
 
 
@@ -426,8 +412,6 @@ def setup_autotrack(shared_client: TelegramClient, announce_chat: str | None = N
     tracker = PriceTracker(client, announce_chat=ac)
     startup_time_utc = datetime.now(timezone.utc)
     client.add_event_handler(on_new_message, events.NewMessage(chats=(TARGET_CHAT,)))
-    # NEW: dengarkan juga edit (tanpa backfill)
-    client.add_event_handler(on_new_message, events.MessageEdited(chats=(TARGET_CHAT,)))
     print("[AUTOTRACK] attached to shared client; listening on", TARGET_CHAT)
 
 # =========================
@@ -448,9 +432,9 @@ tracker: PriceTracker | None = None
 # =========================
 # Event handler: ONLY your group
 # =========================
+CUTOFF_BUFFER = timedelta(minutes=BACKFILL_BUFFER_MINUTES)
+
 def _is_old_message(msg_dt: Optional[datetime]) -> bool:
-    if DISABLE_OLD_MESSAGE_CUTOFF:
-        return False
     if not isinstance(msg_dt, datetime):
         return False
     return msg_dt.replace(tzinfo=timezone.utc) < (startup_time_utc - CUTOFF_BUFFER)
@@ -461,16 +445,6 @@ def _is_bot_own_message(event) -> bool:
 
 async def on_new_message(event):
     try:
-        # Handler-side filter: only process messages from TARGET_CHAT
-        try:
-            target_user = _parse_target_username(TARGET_CHAT)
-            chat = await event.get_chat()
-            uname = (getattr(chat, 'username', None) or '')
-            if target_user and (uname.lower() != target_user):
-                return
-        except Exception:
-            # If we cannot resolve chat username, continue (best-effort)
-            pass
         if _is_bot_own_message(event):
             return
         msg = event.message
@@ -480,10 +454,6 @@ async def on_new_message(event):
         ca = extract_ca(text)
         if not ca:
             return
-
-        # Log arming point for traceability
-        print(f"[TRACK] arming {ca} from message id={getattr(msg, 'id', None)} (edited={isinstance(event, events.MessageEdited.Event)})")
-
         # Optional: link back to source (tidak dipakai di teks sekarang, tapi disimpan kalau perlu)
         source_link = None
         try:
@@ -519,10 +489,8 @@ async def main():
         print(f">> Logged in as: {getattr(me, 'username', None) or me_user_id}")
     except Exception as e:
         print(f"Warning: cannot resolve self id: {e}")
-    print(f"AutoTrack running (unlimited milestones; first reply ≥ {REPLY_FROM_MULTIPLE}×). Listening ONLY your group for NEW/EDITED messages...")
+    print(f"AutoTrack running (unlimited milestones; first reply ≥ {REPLY_FROM_MULTIPLE}×). Listening ONLY your group for NEW messages...")
     client.add_event_handler(on_new_message, events.NewMessage(chats=(TARGET_CHAT,)))
-    # NEW: dengarkan juga edit (tanpa backfill)
-    client.add_event_handler(on_new_message, events.MessageEdited(chats=(TARGET_CHAT,)))
     await client.run_until_disconnected()
 
 if __name__ == "__main__":