From 954ae2dfb12c009ad9b9357da790aa445c8976ef Mon Sep 17 00:00:00 2001 From: Dream Hunter Date: Sat, 25 May 2024 14:38:33 +0800 Subject: [PATCH] fix: telegram bot golbalPush (#272) --- worker/src/telegram_api/miniapp.ts | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/worker/src/telegram_api/miniapp.ts b/worker/src/telegram_api/miniapp.ts index 34e3d1b2..380e2dbc 100644 --- a/worker/src/telegram_api/miniapp.ts +++ b/worker/src/telegram_api/miniapp.ts @@ -136,18 +136,17 @@ async function getMail(c: Context): Promise { ).bind(mailId).first(); const settings = await c.env.KV.get(CONSTANTS.TG_KV_SETTINGS_KEY, "json"); const superUser = settings?.enableGlobalMailPush && settings?.globalMailPushList.includes(userId); - if ( - !superUser && result?.address && - !(result.address as string in addressIdMap) - ) { - return c.text("无权查看此邮件", 403); - } - const address_id = addressIdMap[result?.address as string]; - const db_address_id = await c.env.DB.prepare( - `SELECT id FROM address where id = ? ` - ).bind(address_id).first("id"); - if (!db_address_id) { - return c.text("无权查看此邮件", 403); + if (!superUser) { + if (result?.address && !(result.address as string in addressIdMap)) { + return c.text("无权查看此邮件", 403); + } + const address_id = addressIdMap[result?.address as string]; + const db_address_id = await c.env.DB.prepare( + `SELECT id FROM address where id = ? ` + ).bind(address_id).first("id"); + if (!db_address_id) { + return c.text("无权查看此邮件", 403); + } } return c.json(result); }