Changeset 480 in code for trunk

Timestamp:

Mar 26, 2021, 10:21:14 AM (4 years ago)

Author:

contact

Message:

Introduce deliveredClientMap

Adds more semantics to map[string]string. Simplifies the complicated
mapStringStringCasemapMap type.

Location:

trunk

Files:

• downstream.go (modified) (1 diff)
• irc.go (modified) (1 diff)
• upstream.go (modified) (1 diff)
• user.go (modified) (3 diffs)

trunk/downstream.go

@@ -998 +998 @@
                 // Fast-forward history to last message
                 for target, entry := range net.delivered.innerMap {
-                        delivered := entry.value.(map[string]string)
+                        delivered := entry.value.(deliveredClientMap)
                         ch := net.channels.Value(target)
                         if ch != nil && ch.Detached {

trunk/irc.go

@@ -601 +601 @@
 }
 
-type mapStringStringCasemapMap struct{ casemapMap }
-
-func (cm *mapStringStringCasemapMap) Value(name string) map[string]string {
+type deliveredCasemapMap struct{ casemapMap }
+
+func (cm *deliveredCasemapMap) Value(name string) deliveredClientMap {
         entry, ok := cm.innerMap[cm.casemap(name)]
         if !ok {
                 return nil
         }
-        return entry.value.(map[string]string)
-}
+        return entry.value.(deliveredClientMap)
+}

trunk/upstream.go

@@ -1755 +1755 @@
                 }
 
-                delivered = make(map[string]string)
+                delivered = make(deliveredClientMap)
                 uc.network.delivered.SetValue(entity, delivered)
 

trunk/user.go

@@ -56 +56 @@
 type eventStop struct{}
 
+type deliveredClientMap map[string]string // client name -> msg ID
+
 type network struct {
         Network
@@ -63 +65 @@
         conn           *upstreamConn
         channels       channelCasemapMap
-        delivered      mapStringStringCasemapMap // entity -> client name -> msg ID
-        offlineClients map[string]struct{}       // indexed by client name
+        delivered      deliveredCasemapMap
+        offlineClients map[string]struct{} // indexed by client name
         lastError      error
         casemap        casemapping
@@ -81 +83 @@
                 stopped:        make(chan struct{}),
                 channels:       m,
-                delivered:      mapStringStringCasemapMap{newCasemapMap(0)},
+                delivered:      deliveredCasemapMap{newCasemapMap(0)},
                 offlineClients: make(map[string]struct{}),
                 casemap:        casemapRFC1459,