Changeset 451 in code for trunk

Timestamp:

Feb 10, 2021, 10:31:34 AM (4 years ago)

Author:

contact

Message:

Rename network.history to network.delivered

"History" is over-loaded with e.g. CHATHISTORY support.

Location:

trunk

Files:

• downstream.go (modified) (4 diffs)
• upstream.go (modified) (3 diffs)
• user.go (modified) (4 diffs)

trunk/downstream.go

@@ -326 +326 @@
         }
 
-        history, ok := network.history[entity]
+        delivered, ok := network.delivered[entity]
         if !ok {
                 return
         }
 
-        history.clients[dc.clientName] = id
+        delivered[dc.clientName] = id
 }
 
@@ -948 +948 @@
 
                 // Fast-forward history to last message
-                for target, history := range net.history {
+                for target, delivered := range net.delivered {
                         if ch, ok := net.channels[target]; ok && ch.Detached {
                                 continue
@@ -958 +958 @@
                                 continue
                         }
-                        history.clients[dc.clientName] = lastID
+                        delivered[dc.clientName] = lastID
                 }
         })
@@ -983 +983 @@
                 return
         }
-        for target, history := range net.history {
+        for target, delivered := range net.delivered {
                 if ch, ok := net.channels[target]; ok && ch.Detached {
                         continue
                 }
 
-                lastDelivered, ok := history.clients[dc.clientName]
+                lastDelivered, ok := delivered[dc.clientName]
                 if !ok {
                         continue

trunk/upstream.go

@@ -1679 +1679 @@
         }
 
-        history, ok := uc.network.history[entity]
+        delivered, ok := uc.network.delivered[entity]
         if !ok {
                 lastID, err := uc.user.msgStore.LastMsgID(uc.network, entity, time.Now())
@@ -1687 +1687 @@
                 }
 
-                history = &networkHistory{
-                        clients: make(map[string]string),
-                }
-                uc.network.history[entity] = history
+                delivered = make(map[string]string)
+                uc.network.delivered[entity] = delivered
 
                 for clientName, _ := range uc.network.offlineClients {
-                        history.clients[clientName] = lastID
+                        delivered[clientName] = lastID
                 }
 
@@ -1700 +1698 @@
                         // clients too
                         uc.forEachDownstream(func(dc *downstreamConn) {
-                                history.clients[dc.clientName] = lastID
+                                delivered[dc.clientName] = lastID
                         })
                 }

trunk/user.go

@@ -56 +56 @@
 type eventStop struct{}
 
-type networkHistory struct {
-        clients map[string]string // indexed by client name
-}
-
 type network struct {
         Network
@@ -67 +63 @@
         conn           *upstreamConn
         channels       map[string]*Channel
-        history        map[string]*networkHistory // indexed by entity
-        offlineClients map[string]struct{}        // indexed by client name
+        delivered      map[string]map[string]string // entity -> client name -> msg ID
+        offlineClients map[string]struct{}          // indexed by client name
         lastError      error
 }
@@ -84 +80 @@
                 stopped:        make(chan struct{}),
                 channels:       m,
-                history:        make(map[string]*networkHistory),
+                delivered:      make(map[string]map[string]string),
                 offlineClients: make(map[string]struct{}),
         }
@@ -231 +227 @@
                 }
 
-                if net.history[ch.Name] != nil {
+                if _, ok := net.delivered[ch.Name]; ok {
                         dc.sendNetworkBacklog(net)
                 }