GithubBackup/cloudflare_temp_email
1
0
Fork 0
mirror of https://github.com/dreamhunter2333/cloudflare_temp_email.git synced 2026-07-06 23:01:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: telegram bot golbalPush (#270)

Browse Source
This commit is contained in:
Dream Hunter
2024-05-25 14:20:34 +08:00
committed by GitHub
parent bf3c372d8c
commit 03bb210016
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
worker/src/telegram_api/telegram.ts
View File

@@ -299,18 +299,19 @@ export async function sendMailToTelegram(
return; return;
} }
const userId = await c.env.KV.get(`${CONSTANTS.TG_KV_PREFIX}:${address}`); const userId = await c.env.KV.get(`${CONSTANTS.TG_KV_PREFIX}:${address}`);
if (!userId) {
return;
}
const { mail } = await parseMail(raw_mail); const { mail } = await parseMail(raw_mail);
if (!mail) { if (!mail) {
return; return;
} }
const settings = await c.env.KV.get<TelegramSettings>(CONSTANTS.TG_KV_SETTINGS_KEY, "json");
const golbalPush = settings?.enableGlobalMailPush && settings?.globalMailPushList;
if (!userId && !golbalPush) {
return;
}
const mailId = await c.env.DB.prepare( const mailId = await c.env.DB.prepare(
`SELECT id FROM raw_mails where address = ? and message_id = ?` `SELECT id FROM raw_mails where address = ? and message_id = ?`
).bind(address, message_id).first<string>("id"); ).bind(address, message_id).first<string>("id");
const bot = newTelegramBot(c, c.env.TELEGRAM_BOT_TOKEN); const bot = newTelegramBot(c, c.env.TELEGRAM_BOT_TOKEN);
const settings = await c.env.KV.get<TelegramSettings>(CONSTANTS.TG_KV_SETTINGS_KEY, "json");
const miniAppButtons = [] const miniAppButtons = []
if (settings?.miniAppUrl && settings?.miniAppUrl?.length > 0 && mailId) { if (settings?.miniAppUrl && settings?.miniAppUrl?.length > 0 && mailId) {
const url = new URL(settings.miniAppUrl); const url = new URL(settings.miniAppUrl);
@@ -318,7 +319,7 @@ export async function sendMailToTelegram(
url.searchParams.set("mail_id", mailId); url.searchParams.set("mail_id", mailId);
miniAppButtons.push(Markup.button.webApp("查看邮件", url.toString())); miniAppButtons.push(Markup.button.webApp("查看邮件", url.toString()));
} }
if (settings?.enableGlobalMailPush && settings?.globalMailPushList) { if (golbalPush) {
for (const pushId of settings.globalMailPushList) { for (const pushId of settings.globalMailPushList) {
await bot.telegram.sendMessage(pushId, mail, { await bot.telegram.sendMessage(pushId, mail, {
...Markup.inlineKeyboard([ ...Markup.inlineKeyboard([
@@ -327,6 +328,9 @@ export async function sendMailToTelegram(
}); });
} }
} }
if (!userId) {
return;
}
await bot.telegram.sendMessage(userId, mail, { await bot.telegram.sendMessage(userId, mail, {
...Markup.inlineKeyboard([ ...Markup.inlineKeyboard([
...miniAppButtons, ...miniAppButtons,