From e7d798b00da16f2925ed50402b232d76935780f7 Mon Sep 17 00:00:00 2001
From: gavrielc <gabicohen22@yahoo.com>
Date: Wed, 22 Apr 2026 00:17:42 +0300
Subject: [PATCH] feat(setup): validate Telegram token via getMe and deep-link
 to bot
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

After the token is in .env, call
https://api.telegram.org/bot<TOKEN>/getMe — if ok, extract the bot's
username and \`open tg://resolve?domain=<username>\` so the Telegram
desktop app lands on the bot chat. When pair-telegram prints the
4-digit code a moment later, the user just types it into the already-
open chat instead of hunting for their bot.

Falls back to https://t.me/<username> if the tg:// scheme isn't
registered, and just warns-and-continues if getMe fails (network
hiccup shouldn't block setup).

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
---
 setup/add-telegram.sh | 36 ++++++++++++++++++++++++++++++++++++
 1 file changed, 36 insertions(+)

diff --git a/setup/add-telegram.sh b/setup/add-telegram.sh
index c822994..8183c33 100755
--- a/setup/add-telegram.sh
+++ b/setup/add-telegram.sh
@@ -111,10 +111,46 @@ EOF
   fi
 fi
 
+# Validate the token via getMe so a typo surfaces before we restart the
+# service, and capture the bot's username for the deep link.
+TELEGRAM_BOT_TOKEN_VALUE="$(grep '^TELEGRAM_BOT_TOKEN=' .env | head -1 | cut -d= -f2-)"
+BOT_USERNAME=""
+if [[ -n "$TELEGRAM_BOT_TOKEN_VALUE" ]]; then
+  INFO=$(curl -fsS --max-time 8 \
+    "https://api.telegram.org/bot${TELEGRAM_BOT_TOKEN_VALUE}/getMe" 2>/dev/null || true)
+  if echo "$INFO" | grep -q '"ok":true'; then
+    # Crude JSON parse — the response is always a flat object here.
+    BOT_USERNAME=$(echo "$INFO" | sed -nE 's/.*"username":"([^"]+)".*/\1/p')
+    if [[ -n "$BOT_USERNAME" ]]; then
+      echo "[add-telegram] Token validated — bot is @${BOT_USERNAME}."
+    fi
+  else
+    echo "[add-telegram] Warning: getMe did not return ok. Continuing, but the token may be wrong."
+  fi
+fi
+
 # Container reads from data/env/env (the host mounts it).
 mkdir -p data/env
 cp .env data/env/env
 
+# Deep-link into the bot's chat in the installed Telegram app so the user
+# is already on the right screen when pair-telegram prints the code.
+if [[ -n "$BOT_USERNAME" ]]; then
+  case "$(uname -s)" in
+    Darwin)
+      open "tg://resolve?domain=${BOT_USERNAME}" >/dev/null 2>&1 \
+        || open "https://t.me/${BOT_USERNAME}" >/dev/null 2>&1 \
+        || true
+      ;;
+    Linux)
+      xdg-open "tg://resolve?domain=${BOT_USERNAME}" >/dev/null 2>&1 \
+        || xdg-open "https://t.me/${BOT_USERNAME}" >/dev/null 2>&1 \
+        || true
+      ;;
+  esac
+  echo "[add-telegram] Opened Telegram → @${BOT_USERNAME}. Keep it open for the pairing code."
+fi
+
 echo "[add-telegram] Restarting service so the new adapter picks up the token…"
 case "$(uname -s)" in
   Darwin)