Merge pull request #118 from f0x52/clear-names

Ensure channel.users is an accurate representation of the NAMES response after updating by removing stale users

Author: tadzik

changelog.d/118.bugfix

@@ -0,0 +1 @@
+Ensure channel.users is an accurate representation of the NAMES response after updates, removing stale users.

src/irc.ts

@@ -683,25 +683,29 @@ export class Client extends (EventEmitter as unknown as new () => TypedEmitter<C
                     }
                 }
                 if (knownPrefixes.length > 0) {
-                    channel.users.set(match[2], knownPrefixes);
+                    channel.tmpUsers.set(match[2], knownPrefixes);
                 }
                 else {
                     // recombine just in case this server allows weird chars in the nick.
                     // We know it isn't a mode char.
-                    channel.users.set(match[1] + match[2], '');
+                    channel.tmpUsers.set(match[1] + match[2], '');
                 }
             }
         });
-        // If the channel user list was modified, flush.
-        if (users.length) {
-            this.state.flush?.()
-        }
     }
 
     private onReplyNameEnd(message: Message) {
         this._casemap(message, 1);
         const channel = this.chanData(message.args[1]);
         if (channel) {
+            channel.users.clear();
+            channel.tmpUsers.forEach((modes, user) => {
+                channel.users.set(user, modes);
+            });
+            channel.tmpUsers.clear();
+
+            this.state.flush?.();
+
             this.emit('names', message.args[1], channel.users);
             this._send('MODE', message.args[1]);
         }
@@ -1165,6 +1169,7 @@ export class Client extends (EventEmitter as unknown as new () => TypedEmitter<C
                 key: key,
                 serverName: name,
                 users: new Map(),
+                tmpUsers: new Map(),
                 mode: '',
                 modeParams: new Map(),
             });

src/state.ts

@@ -90,6 +90,7 @@ export interface ChanData {
      * nick => mode
      */
     users: Map<string, string>,
+    tmpUsers: Map<string, string>, // used while processing NAMES replies
     mode: string;
     modeParams: Map<string, string[]>,
     topic?: string;