Ensure all who during receiving window are discarded

squidowl · Apr 30, 2024 · c40ae38 · c40ae38
1 parent 6eb019b
commit c40ae38
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/data/src/client.rs b/data/src/client.rs
@@ -700,6 +700,9 @@ impl Client {
                         if matches!(channel.last_who, Some(WhoStatus::Requested(_, None)) | None) {
                             channel.last_who = Some(WhoStatus::Receiving(None));
                             log::debug!("[{}] {target} - WHO receiving...", self.server);
+                        }
+
+                        if matches!(channel.last_who, Some(WhoStatus::Receiving(_))) {
                             // We requested, don't save to history
                             return None;
                         }
@@ -721,11 +724,14 @@ impl Client {
                                     channel.last_who =
                                         Some(WhoStatus::Receiving(Some(request_token)));
                                     log::debug!("[{}] {target} - WHO receiving...", self.server);
-                                    // We requested, don't save to history
-                                    return None;
                                 }
                             }
                         }
+
+                        if matches!(channel.last_who, Some(WhoStatus::Receiving(_))) {
+                            // We requested, don't save to history
+                            return None;
+                        }
                     }
                 }
             }