Changeset 482 in code for trunk/user.go

Timestamp:

Mar 29, 2021, 2:55:57 PM (4 years ago)

Author:

contact

Message:

Simplify network.offlineClients

Replace it with a list of all clients (online or offline).

File:

• trunk/user.go (modified) (5 diffs)

trunk/user.go

@@ -63 +63 @@
         stopped chan struct{}
 
-        conn           *upstreamConn
-        channels       channelCasemapMap
-        delivered      deliveredCasemapMap
-        offlineClients map[string]struct{} // indexed by client name
-        lastError      error
-        casemap        casemapping
+        conn      *upstreamConn
+        channels  channelCasemapMap
+        delivered deliveredCasemapMap
+        clients   map[string]struct{} // indexed by client name
+        lastError error
+        casemap   casemapping
 }
 
@@ -79 +79 @@
 
         return &network{
-                Network:        *record,
-                user:           user,
-                stopped:        make(chan struct{}),
-                channels:       m,
-                delivered:      deliveredCasemapMap{newCasemapMap(0)},
-                offlineClients: make(map[string]struct{}),
-                casemap:        casemapRFC1459,
+                Network:   *record,
+                user:      user,
+                stopped:   make(chan struct{}),
+                channels:  m,
+                delivered: deliveredCasemapMap{newCasemapMap(0)},
+                clients:   make(map[string]struct{}),
+                casemap:   casemapRFC1459,
         }
 }
@@ -197 +197 @@
 
         net.forEachDownstream(func(dc *downstreamConn) {
-                net.offlineClients[dc.clientName] = struct{}{}
-
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.prefix(),
@@ -449 +447 @@
 
                         dc.forEachNetwork(func(network *network) {
+                                network.clients[dc.clientName] = struct{}{}
                                 if network.lastError != nil {
                                         sendServiceNOTICE(dc, fmt.Sprintf("disconnected from %s: %v", network.GetName(), network.lastError))
@@ -466 +465 @@
                                 }
                         }
-
-                        // Save history if we're the last client with this name
-                        skipHistory := make(map[*network]bool)
-                        u.forEachDownstream(func(conn *downstreamConn) {
-                                if dc.clientName == conn.clientName {
-                                        skipHistory[conn.network] = true
-                                }
-                        })
-
-                        dc.forEachNetwork(func(net *network) {
-                                if skipHistory[net] || skipHistory[nil] {
-                                        return
-                                }
-
-                                net.offlineClients[dc.clientName] = struct{}{}
-                        })
 
                         u.forEachUpstream(func(uc *upstreamConn) {