From 3d828ec976e9cf67403fa87267d13819371adb64 Mon Sep 17 00:00:00 2001 From: Bulat Kurbanov Date: Mon, 14 Mar 2022 20:35:23 +0300 Subject: [PATCH] Fix webhook ip --- src/bots/manager/index.ts | 7 +++++-- src/config.ts | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/bots/manager/index.ts b/src/bots/manager/index.ts index 51c66dd..f5fa22f 100644 --- a/src/bots/manager/index.ts +++ b/src/bots/manager/index.ts @@ -110,12 +110,15 @@ export default class BotsManager { static async _setWebhook(bot: Telegraf, state: BotState): Promise { const dockerIps = (await dockerIpTools.getContainerIp()).split(" "); + const filteredIp = dockerIps.filter((ip) => ip.startsWith(env.NETWORK_IP_PREFIX)); - for (const dockerIp of dockerIps) { + const ips = filteredIp.length !== 0 ? filteredIp : dockerIps; + + for (const ip of ips) { try { await bot.telegram.setWebhook( `${env.WEBHOOK_BASE_URL}:${env.WEBHOOK_PORT}/${state.id}/${bot.telegram.token}`, { - ip_address: dockerIp, + ip_address: ip, } ); return true; diff --git a/src/config.ts b/src/config.ts index d15b2a0..ce616b6 100644 --- a/src/config.ts +++ b/src/config.ts @@ -18,4 +18,5 @@ export default cleanEnv(process.env, { DOWNLOADER_API_KEY: str(), USER_SETTINGS_URL: str(), USER_SETTINGS_API_KEY: str(), + NETWORK_IP_PREFIX: str(), });