The following changes were made by the replace_file_content tool to: /root/aadharbot/index.js. If relevant, proactively run terminal commands to execute this code for the USER. Don't ask for permission. [diff_block_start] @@ -3854,8 +3854,8 @@ let lastResetDateStr = ''; -async function startDailyResetBroadcast() { - console.log("[DAILY BROADCAST] Starting daily reset broadcast..."); +async function startDailyResetBroadcast(manualTriggered = false) { + console.log(`[DAILY BROADCAST] Starting daily free search broadcast... (Manual: ${manualTriggered})`); let targets = []; try { if (!process.env.DATABASE_URL) { @@ -3864,7 +3864,7 @@ targets = Object.keys(db); } } else { - const res = await pool.query('SELECT telegram_id FROM users'); + const res = await pool.query('SELECT telegram_id FROM users ORDER BY id ASC'); targets = res.rows.map(r => String(r.telegram_id)); } } catch (err) { @@ -3876,12 +3876,24 @@ const stats = { success: 0, failed: 0, blocked: 0, deactivated: 0 }; let index = 0; - const resetMsg = `๐ŸŽ DAILY FREE SEARCH RESET / เคกเฅ‡เคฒเฅ€ เคซเฅเคฐเฅ€ เคธเคฐเฅเคš เคฐเฅ€เคธเฅ‡เคŸ ๐ŸŽ\n` + - `โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”\n` + - `Aapke account me aaj ka 1 Free Aadhaar Search (1 Credit ${CREDIT_EMOJI}) credit kar diya gaya hai! Abhi search karein.\n\n` + - `(Your daily free search (1 Credit ${CREDIT_EMOJI}) has been credited! Start searching now.)\n` + - `โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”\n` + - ``; + const resetMsg = `๐ŸŽ DAILY 1 FREE SEARCH AVAILABLE / เคกเฅ‡เคฒเฅ€ 1 เคซเฅเคฐเฅ€ เคธเคฐเฅเคš เค‰เคชเคฒเคฌเฅเคง เคนเฅˆ ๐ŸŽ\n` + + `โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”\n` + + `Aapke account me aaj ka 1 Free Aadhaar Search active kar diya gaya hai! Abhi bot me search karein aur use karein.\n\n` + + `โšก (Your daily 1 Free Search is now active! Start searching now.)\n` + + `โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”\n` + + `๐Ÿ” Kaise use karein:\n` + + `โ€ข Direct 10-digit mobile number bheinjiye\n` + + `โ€ข Ya command use karein: /num 9876543210\n` + + `โ€ข Ya niche button par click karein!\n` + + `โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”โ”\n` + + `๐Ÿ’ก Yeh free search aaj raat 12:00 AM IST tak valid hai.`; + + const broadcastKeyboard = Markup.inlineKeyboard([ + [ + { text: '๐Ÿ’ณ Retrieve (SMS)', callback_data: 'START_RETRIEVE_AADHAAR', style: 'primary' }, + { text: '๐Ÿ“ฅ Download PDF', callback_data: 'START_DOWNLOAD_AADHAAR', style: 'success' } + ] + ]); const ownerId = process.env.ADMIN_ID || '8439525687'; @@ -3902,20 +3902,23 @@ const targetId = targets[index]; index++; - try { - await bot.telegram.sendMessage(targetId, resetMsg, { parse_mode: 'HTML' }); - stats.success++; - } catch (err) { - stats.failed++; - const errorMsg = err.message || ""; - if (errorMsg.includes("bot was blocked by the user") || errorMsg.includes("blocked")) { - stats.blocked++; - } else if (errorMsg.includes("user is deactivated") || errorMsg.includes("deactivated")) { - stats.deactivated++; - } - } - - setTimeout(sendNext, 35); + let delay = 35; + try { + await bot.telegram.sendMessage(targetId, resetMsg, { parse_mode: 'HTML', ...broadcastKeyboard }); + stats.success++; + } catch (err) { + stats.failed++; + const errorMsg = err.message || ""; + if (errorMsg.includes("bot was blocked by the user") || errorMsg.includes("blocked")) { + stats.blocked++; + } else if (errorMsg.includes("user is deactivated") || errorMsg.includes("deactivated")) { + stats.deactivated++; + } else if (err.parameters && err.parameters.retry_after) { + delay = (err.parameters.retry_after * 1000) + 500; + } + } + + setTimeout(sendNext, delay); } sendNext(); @@ -3922,45 +3922,30 @@ function scheduleDailyReset() { - console.log("[DAILY RESET] Scheduler initialized for 12:00 AM IST credit reset."); + console.log("[DAILY RESET] Scheduler initialized for 12:00 AM IST daily 1 free search reset & broadcast."); setInterval(async () => { try { + const dateStr = getTodayISTDateStr(); const now = new Date(); - // Convert current UTC time to IST (UTC + 5.5 hours) const istTime = new Date(now.getTime() + (5.5 * 60 * 60 * 1000)); const hour = istTime.getUTCHours(); - const dateStr = `${istTime.getUTCFullYear()}-${istTime.getUTCMonth() + 1}-${istTime.getUTCDate()}`; - + + let lastDate = lastResetDateStr; + if (redisClient) { + try { + const rDate = await redisClient.get('system:last_daily_reset_date'); + if (rDate) lastDate = rDate; + } catch (e) {} + } + // If it is midnight hour (00:xx:xx in IST) and we haven't done reset for this date yet - if (hour === 0 && lastResetDateStr !== dateStr) { + if (hour === 0 && lastDate !== dateStr) { lastResetDateStr = dateStr; - console.log(`[DAILY RESET] Running midnight credit reset for date: ${dateStr}`); - - if (!process.env.DATABASE_URL) { - const fs = require('fs'); - if (fs.existsSync('db.json')) { - let db = JSON.parse(fs.readFileSync('db.json', 'utf8')); - let updated = false; - for (const userId in db) { - if (db[userId] && (!db[userId].plan_type || db[userId].plan_type === 'credits') && (db[userId].credits || 0) < 1) { - db[userId].credits = 1; - updated = true; - } - } - if (updated) { - fs.writeFileSync('db.json', JSON.stringify(db, null, 2)); - } - } - } else { - await pool.query( - `UPDATE users - SET credits = 1 - WHERE (plan_type IS NULL OR plan_type = 'credits') - AND credits < 1` - ); - } - console.log("[DAILY RESET] Midnight credit reset completed successfully."); - - // Trigger daily broadcast here! + if (redisClient) { + await redisClient.set('system:last_daily_reset_date', dateStr, 'EX', 86400).catch(() => {}); + } + console.log(`[DAILY RESET] Running midnight free search broadcast for date: ${dateStr}`); + + // Trigger daily broadcast! startDailyResetBroadcast(); // Trigger automated daily backup @@ -3974,7 +3974,7 @@ } } } catch (err) { - console.error("[DAILY RESET ERROR] Failed to run daily credit reset:", err.message); + console.error("[DAILY RESET ERROR] Failed to run daily reset check:", err.message); } }, 15000); // Check every 15 seconds } [diff_block_end] Please note that the above snippet only shows the MODIFIED lines from the last change. It shows up to 3 lines of unchanged lines before and after the modified lines. The actual file contents may have many more lines not shown.