Only return join event when we joined channel

squidowl · Sep 24, 2024 · 7879273 · 7879273
1 parent bd717e2
commit 7879273
Showing 1 changed file with 2 additions and 5 deletions.
diff --git a/data/src/client.rs b/data/src/client.rs
@@ -862,6 +862,8 @@ impl Client {
                         }
                         log::debug!("[{}] {channel} - WHO requested", self.server);
                     }
+
+                    return Some(vec![Event::JoinedChannel(channel.clone())]);
                 } else if let Some(channel) = self.chanmap.get_mut(channel) {
                     let user = if self.supports_extended_join {
                         accountname.as_ref().map_or(user.clone(), |accountname| {
@@ -873,11 +875,6 @@ impl Client {
 
                     channel.users.insert(user);
                 }
-
-                return Some(vec![
-                    Event::JoinedChannel(channel.clone()),
-                    Event::Single(message, self.nickname().to_owned()),
-                ]);
             }
             Command::KICK(channel, victim, _) => {
                 if victim == self.nickname().as_ref() {