From 01b8f4582fe0d0b8cf698aa578506bb25b31b591 Mon Sep 17 00:00:00 2001
From: Peter Steinberger <steipete@gmail.com>
Date: Fri, 9 Jan 2026 00:31:01 +0100
Subject: [PATCH] fix: align discord monitor + whatsapp activity

---
 src/discord/monitor.ts | 25 +------------------------
 src/web/inbound.ts     |  4 ++--
 2 files changed, 3 insertions(+), 26 deletions(-)

diff --git a/src/discord/monitor.ts b/src/discord/monitor.ts
index 9f04d719e..06f737b1c 100644
--- a/src/discord/monitor.ts
+++ b/src/discord/monitor.ts
@@ -44,8 +44,8 @@ import { loadConfig } from "../config/config.js";
 import { resolveStorePath, updateLastRoute } from "../config/sessions.js";
 import { danger, logVerbose, shouldLogVerbose } from "../globals.js";
 import { formatDurationSeconds } from "../infra/format-duration.js";
-import { enqueueSystemEvent } from "../infra/system-events.js";
 import { recordProviderActivity } from "../infra/provider-activity.js";
+import { enqueueSystemEvent } from "../infra/system-events.js";
 import { getChildLogger } from "../logging.js";
 import { detectMime } from "../media/mime.js";
 import { saveMediaBuffer } from "../media/store.js";
@@ -325,9 +325,6 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
       publicKey: "a",
       token,
       autoDeploy: nativeEnabled,
-      eventQueue: {
-        listenerTimeout: 120_000,
-      },
     },
     {
       commands,
@@ -416,28 +413,11 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
 
   const gateway = client.getPlugin<GatewayPlugin>("gateway");
   const gatewayEmitter = getDiscordGatewayEmitter(gateway);
-  let queueMetricsTimer: ReturnType<typeof setInterval> | undefined;
-  let lastQueueTimeouts = 0;
-  let lastQueueDropped = 0;
   const onGatewayWarning = (warning: unknown) => {
     logVerbose(`discord gateway warning: ${String(warning)}`);
   };
   if (shouldLogVerbose()) {
     gatewayEmitter?.on("warning", onGatewayWarning);
-    queueMetricsTimer = setInterval(() => {
-      const metrics = client.eventHandler?.getMetrics?.();
-      if (!metrics) return;
-      const nearCapacity =
-        metrics.maxQueueSize > 0 &&
-        metrics.queueSize / metrics.maxQueueSize >= 0.8;
-      const hasNewTimeouts = metrics.timeouts > lastQueueTimeouts;
-      const hasNewDrops = metrics.dropped > lastQueueDropped;
-      if (nearCapacity || hasNewTimeouts || hasNewDrops) {
-        logVerbose(`discord event queue metrics: ${JSON.stringify(metrics)}`);
-      }
-      lastQueueTimeouts = metrics.timeouts;
-      lastQueueDropped = metrics.dropped;
-    }, 60000);
   }
   try {
     await waitForDiscordGatewayStop({
@@ -460,9 +440,6 @@ export async function monitorDiscordProvider(opts: MonitorDiscordOpts = {}) {
       },
     });
   } finally {
-    if (queueMetricsTimer) {
-      clearInterval(queueMetricsTimer);
-    }
     gatewayEmitter?.removeListener("warning", onGatewayWarning);
   }
 }
diff --git a/src/web/inbound.ts b/src/web/inbound.ts
index 6bbde2155..804b6b285 100644
--- a/src/web/inbound.ts
+++ b/src/web/inbound.ts
@@ -540,7 +540,7 @@ export async function monitorWebInbox(options: {
       text: string,
       mediaBuffer?: Buffer,
       mediaType?: string,
-      options?: ActiveWebSendOptions,
+      sendOptions?: ActiveWebSendOptions,
     ): Promise<{ messageId: string }> => {
       const jid = toWhatsappJid(to);
       let payload: AnyMessageContent;
@@ -558,7 +558,7 @@ export async function monitorWebInbox(options: {
             mimetype: mediaType,
           };
         } else if (mediaType.startsWith("video/")) {
-          const gifPlayback = options?.gifPlayback;
+          const gifPlayback = sendOptions?.gifPlayback;
           payload = {
             video: mediaBuffer,
             caption: text || undefined,