Changeset 119 in code for trunk/downstream.go

Timestamp:

Mar 18, 2020, 11:06:48 PM (5 years ago)

Author:

delthas

Message:

Add suffixing for multi-upstream connections

File:

• trunk/downstream.go (modified) (6 diffs)

trunk/downstream.go

@@ -120 +120 @@
 }
 
-func (dc *downstreamConn) marshalChannel(uc *upstreamConn, name string) string {
-        return name
-}
-
 func (dc *downstreamConn) forEachNetwork(f func(*network)) {
         if dc.network != nil {
@@ -155 +151 @@
 }
 
+func (dc *downstreamConn) marshalEntity(uc *upstreamConn, name string) string {
+        for _, r := range name {
+                switch r {
+                // TODO: support upstream ISUPPORT channel prefixes
+                case '#', '&', '+', '!':
+                        return dc.marshalChannel(uc, name)
+                }
+                break
+        }
+        return dc.marshalNick(uc, name)
+}
+
+func (dc *downstreamConn) marshalChannel(uc *upstreamConn, name string) string {
+        if dc.upstream() != nil {
+                return name
+        }
+        return name + "/" + uc.network.GetName()
+}
+
 func (dc *downstreamConn) unmarshalChannel(name string) (*upstreamConn, string, error) {
         if uc := dc.upstream(); uc != nil {
@@ -160 +175 @@
         }
 
-        // TODO: extract network name from channel name if dc.upstream == nil
+        network := ""
+        if i := strings.LastIndexByte(name, '/'); i >= 0 {
+                network = name[i+1:]
+                name = name[:i]
+        }
+
+        if network != "" {
+                var conn *upstreamConn
+                dc.forEachUpstream(func(uc *upstreamConn) {
+                        if network != uc.network.GetName() {
+                                return
+                        }
+                        conn = uc
+                })
+                return conn, name, nil
+        }
+
         var channel *upstreamChannel
         var err error
@@ -188 +219 @@
                 return dc.nick
         }
-        return nick
+        if dc.upstream() != nil {
+                return nick
+        }
+        return nick + "/" + uc.network.GetName()
 }
 
@@ -195 +229 @@
                 return dc.prefix()
         }
-        return prefix
+        if dc.upstream() != nil {
+                return prefix
+        }
+        return &irc.Prefix{
+                Name: prefix.Name + "/" + uc.network.GetName(),
+                User: prefix.User,
+                Host: prefix.Host,
+        }
 }
 
@@ -260 +301 @@
                                 switch msg.Command {
                                 case "PRIVMSG":
-                                        // TODO: detect whether it's a user or a channel
-                                        msg.Params[0] = dc.marshalChannel(uc, msg.Params[0])
+                                        msg.Prefix = dc.marshalUserPrefix(uc, msg.Prefix)
+                                        msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
                                 default:
                                         panic("expected to consume a PRIVMSG message")