Changeset 483 in code

Timestamp:

Mar 29, 2021, 2:58:56 PM (4 years ago)

Author:

contact

Message:

Move network.clients to user

No need to have this list per-network.

Location:

trunk

Files:

• upstream.go (modified) (1 diff)
• user.go (modified) (6 diffs)

trunk/upstream.go

@@ -1756 +1756 @@
                 uc.network.delivered.SetValue(entity, delivered)
 
-                for clientName, _ := range uc.network.clients {
+                for clientName, _ := range uc.user.clients {
                         delivered[clientName] = lastID
                 }

trunk/user.go

@@ -66 +66 @@
         channels  channelCasemapMap
         delivered deliveredCasemapMap
-        clients   map[string]struct{} // indexed by client name
         lastError error
         casemap   casemapping
@@ -84 +83 @@
                 channels:  m,
                 delivered: deliveredCasemapMap{newCasemapMap(0)},
-                clients:   make(map[string]struct{}),
                 casemap:   casemapRFC1459,
         }
@@ -276 +274 @@
         downstreamConns []*downstreamConn
         msgStore        messageStore
+        clients         map[string]struct{} // indexed by client name
 
         // LIST commands in progress
@@ -301 +300 @@
                 done:     make(chan struct{}),
                 msgStore: msgStore,
+                clients:  make(map[string]struct{}),
         }
 }
@@ -447 +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))
@@ -456 +455 @@
                                 uc.updateAway()
                         })
+
+                        u.clients[dc.clientName] = struct{}{}
                 case eventDownstreamDisconnected:
                         dc := e.dc