From bcf5a5d1d5b3ffdd59f8d86583a747ff44eee6ed Mon Sep 17 00:00:00 2001
From: StreetLevelTech1 <adetonamayowa25@gmail.com>
Date: Tue, 19 May 2026 13:22:55 +0100
Subject: [PATCH] Add tier-aware /commands handler and register command

---
 bot/bot.py               |  2 ++
 bot/handlers/__init__.py |  1 +
 bot/handlers/core.py     | 67 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 70 insertions(+)

diff --git a/bot/bot.py b/bot/bot.py
index b2c30715..61a7869e 100644
--- a/bot/bot.py
+++ b/bot/bot.py
@@ -237,6 +237,7 @@ async def validate_channel(application):
 FREE_COMMANDS = [
     BotCommand("start",         "Start StrideBot"),
     BotCommand("help",          "View all commands"),
+    BotCommand("commands",      "View all commands by tier"),
     BotCommand("price",         "Live crypto price"),
     BotCommand("top10",         "Top 10 cryptos by market cap"),
     BotCommand("marketupdate",  "Full market overview"),
@@ -364,6 +365,7 @@ def main():
 
     application.add_handler(CommandHandler("start", protected(handlers.start)))
     application.add_handler(CommandHandler("help", protected(handlers.help_command)))
+    application.add_handler(CommandHandler("commands", protected(handlers.commands)))
     application.add_handler(CommandHandler("clear", protected(handlers.clear)))
 
     application.add_handler(CommandHandler("price", protected(handlers.price)))
diff --git a/bot/handlers/__init__.py b/bot/handlers/__init__.py
index 25fedc0f..f8e2fd76 100644
--- a/bot/handlers/__init__.py
+++ b/bot/handlers/__init__.py
@@ -1,6 +1,7 @@
 from handlers.core import (
     start,
     help_command,
+    commands,
     clear,
     about,
     handle_message,
diff --git a/bot/handlers/core.py b/bot/handlers/core.py
index 1d9f18bb..34088818 100644
--- a/bot/handlers/core.py
+++ b/bot/handlers/core.py
@@ -705,9 +705,76 @@ async def help_command(update: Update, context: ContextTypes.DEFAULT_TYPE):
             "/createcoupon <code> <plan> <uses> — Create coupon\n"
             "/listcoupons — View all coupons\n"
         )
+    base += "\n\n💡 Use /commands to see the full command list by tier"
     await safe_reply(update, base)
 
 
+async def commands(update: Update, context: ContextTypes.DEFAULT_TYPE):
+    """List all available commands based on user tier."""
+    user_id = update.effective_user.id
+    tier = ai.get_user_tier(user_id)
+
+    free_cmds = (
+        "<b>🆓 FREE TIER COMMANDS</b>\n\n"
+        "<b>Prices & Market</b>\n"
+        "/price <coin> — Live price (e.g. /price BTC)\n"
+        "/top10 — Top 10 coins by market cap\n"
+        "/marketupdate — Full market overview\n"
+        "/rates — NGN exchange rates\n\n"
+        "<b>News</b>\n"
+        "/news — Latest crypto news (4 categories)\n\n"
+        "<b>Account</b>\n"
+        "/premium — Upgrade to premium\n"
+        "/myplan — Check your subscription\n"
+        "/redeem <code> — Redeem coupon code\n"
+        "/clear — Clear chat history\n"
+        "/about — About StrideBot\n"
+        "/timezone — Set your timezone"
+    )
+
+    premium_cmds = (
+        "\n\n<b>💎 PREMIUM COMMANDS</b>\n\n"
+        "<b>Analysis & Research</b>\n"
+        "/analysis <coin> — Deep AI analysis\n"
+        "/stock <symbol> — Stock price & data\n"
+        "/summary — AI news digest\n"
+        "/polymarket <topic> — Prediction market intelligence\n\n"
+        "<b>Alerts & Tracking</b>\n"
+        "/alert — Set price alert\n"
+        "/myalerts — View active alerts\n"
+        "/cancelalert — Remove alert\n"
+        "/watch <symbol> — Add to watchlist (20 max)\n"
+        "/unwatch <symbol> — Remove from watchlist\n"
+        "/watchlist — View watchlist with AI commentary\n\n"
+        "<b>Forex & Markets</b>\n"
+        "/forex <pair> — Live forex rate\n"
+        "/forexanalysis <pair> — AI forex analysis"
+    )
+
+    admin_cmds = (
+        "\n\n<b>👑 ADMIN COMMANDS</b>\n\n"
+        "/broadcast — Send message to all users\n"
+        "/testpost <name> — Trigger scheduled post\n"
+        "/stats — Bot statistics\n"
+        "/listusers — List all users\n"
+        "/addpremium <user_id> <days> — Grant premium\n"
+        "/removepremium <user_id> — Revoke premium\n"
+        "/createcoupon <code> <plan> <max_uses> — Create coupon\n"
+        "/listcoupons — View all coupons\n"
+        "/trending — Run trend intelligence pipeline\n"
+        "/approvetrend — Approve trend post for channel"
+    )
+
+    if tier == "admin":
+        text = free_cmds + premium_cmds + admin_cmds
+    elif tier in ["premium", "scheduler"]:
+        text = free_cmds + premium_cmds
+    else:
+        text = free_cmds + "\n\n💡 <i>Upgrade to premium for full access: /premium</i>"
+
+    log_event("commands_list")
+    await safe_reply_html(update, text)
+
 
 async def clear(update: Update, context: ContextTypes.DEFAULT_TYPE):
     await asyncio.to_thread(db.clear_history, update.effective_user.id)