huskies: merge 1054

2026-05-14 18:53:07 +00:00
parent 96e227d8d4
commit 595777f366
3 changed files with 128 additions and 1 deletions
@@ -33,6 +33,20 @@ pub(in crate::chat::transport::matrix::bot) async fn on_room_message(
        ev.sender,
    );

+    // Deduplicate: the Matrix sync loop replays events on reconnect. Insert the
+    // event_id before any side-effecting work; return early if already handled.
+    {
+        let mut seen = ctx.handled_incoming_event_ids.lock().await;
+        if !seen.insert(ev.event_id.clone()) {
+            slog!(
+                "[matrix-bot] Dropping duplicate event {} from {}",
+                ev.event_id,
+                ev.sender
+            );
+            return;
+        }
+    }
+
    // Only handle messages from rooms we are configured to listen in.
    if !ctx.target_room_ids.iter().any(|r| r == &incoming_room_id) {
        slog!("[matrix-bot] Ignoring message from unconfigured room {incoming_room_id}");