fix: refine telegram reactions (#964) (thanks @bohdanpodvirnyi)
This commit is contained in:
@@ -5,6 +5,7 @@ import { computeBackoff, sleepWithAbort } from "../infra/backoff.js";
|
||||
import { formatDurationMs } from "../infra/format-duration.js";
|
||||
import type { RuntimeEnv } from "../runtime.js";
|
||||
import { resolveTelegramAccount } from "./accounts.js";
|
||||
import { resolveTelegramAllowedUpdates } from "./allowed-updates.js";
|
||||
import { createTelegramBot } from "./bot.js";
|
||||
import { makeProxyFetch } from "./proxy.js";
|
||||
import { readTelegramUpdateOffset, writeTelegramUpdateOffset } from "./update-offset-store.js";
|
||||
@@ -33,8 +34,8 @@ export function createTelegramRunnerOptions(cfg: ClawdbotConfig): RunOptions<unk
|
||||
fetch: {
|
||||
// Match grammY defaults
|
||||
timeout: 30,
|
||||
// Request reaction updates from Telegram
|
||||
allowed_updates: ["message", "message_reaction"],
|
||||
// Request reactions without dropping default update types.
|
||||
allowed_updates: resolveTelegramAllowedUpdates(),
|
||||
},
|
||||
// Suppress grammY getUpdates stack traces; we log concise errors ourselves.
|
||||
silent: true,
|
||||
@@ -114,23 +115,6 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) {
|
||||
},
|
||||
});
|
||||
|
||||
const log = opts.runtime?.log ?? console.log;
|
||||
|
||||
// When using polling mode, ensure no webhook is active
|
||||
if (!opts.useWebhook) {
|
||||
try {
|
||||
const webhookInfo = await bot.api.getWebhookInfo();
|
||||
if (webhookInfo.url) {
|
||||
await bot.api.deleteWebhook({ drop_pending_updates: false });
|
||||
log(`telegram: deleted webhook to enable polling`);
|
||||
}
|
||||
} catch (err) {
|
||||
(opts.runtime?.error ?? console.error)(
|
||||
`telegram: failed to check/delete webhook: ${String(err)}`,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
if (opts.useWebhook) {
|
||||
await startTelegramWebhook({
|
||||
token,
|
||||
@@ -148,6 +132,7 @@ export async function monitorTelegramProvider(opts: MonitorTelegramOpts = {}) {
|
||||
}
|
||||
|
||||
// Use grammyjs/runner for concurrent update processing
|
||||
const log = opts.runtime?.log ?? console.log;
|
||||
let restartAttempts = 0;
|
||||
|
||||
while (!opts.abortSignal?.aborted) {
|
||||
|
||||
Reference in New Issue
Block a user