Changeset 259 in code

Timestamp:

Apr 16, 2020, 2:57:33 PM (5 years ago)

Author:

contact

Message:

Kill downstreamConn.marshal{Nick,Channel}

We can just use downstreamConn.marshalEntity instead.

Location:

trunk

Files:

• bridge.go (modified) (2 diffs)
• downstream.go (modified) (3 diffs)
• upstream.go (modified) (13 diffs)

trunk/bridge.go

@@ -17 +17 @@
 
 func sendTopic(dc *downstreamConn, ch *upstreamChannel) {
-        downstreamName := dc.marshalChannel(ch.conn, ch.Name)
+        downstreamName := dc.marshalEntity(ch.conn, ch.Name)
 
         if ch.Topic != "" {
@@ -37 +37 @@
         // TODO: send multiple members in each message
 
-        downstreamName := dc.marshalChannel(ch.conn, ch.Name)
+        downstreamName := dc.marshalEntity(ch.conn, ch.Name)
 
         for nick, membership := range ch.Members {
-                s := membership.String() + dc.marshalNick(ch.conn, nick)
+                s := membership.String() + dc.marshalEntity(ch.conn, nick)
 
                 dc.SendMessage(&irc.Message{

trunk/downstream.go

@@ -138 +138 @@
         }
         return name + "/" + uc.network.GetName()
-}
-
-func (dc *downstreamConn) marshalChannel(uc *upstreamConn, name string) string {
-        return dc.marshalEntity(uc, name)
-}
-
-func (dc *downstreamConn) marshalNick(uc *upstreamConn, name string) string {
-        return dc.marshalEntity(uc, name)
 }
 
@@ -244 +236 @@
         case "NICK":
                 // Nick change for another user
-                msg.Params[0] = dc.marshalNick(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
         case "JOIN", "PART":
-                msg.Params[0] = dc.marshalChannel(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
         case "KICK":
-                msg.Params[0] = dc.marshalChannel(uc, msg.Params[0])
-                msg.Params[1] = dc.marshalNick(uc, msg.Params[1])
+                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
+                msg.Params[1] = dc.marshalEntity(uc, msg.Params[1])
         case "TOPIC":
-                msg.Params[0] = dc.marshalChannel(uc, msg.Params[0])
+                msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
         case "MODE":
                 msg.Params[0] = dc.marshalEntity(uc, msg.Params[0])
@@ -671 +663 @@
                                         Prefix:  dc.prefix(),
                                         Command: "JOIN",
-                                        Params:  []string{dc.marshalChannel(ch.conn, ch.Name)},
+                                        Params:  []string{dc.marshalEntity(ch.conn, ch.Name)},
                                 })
 

trunk/upstream.go

@@ -765 +765 @@
 
                         uc.forEachDownstream(func(dc *downstreamConn) {
-                                params := []string{dc.nick, dc.marshalChannel(uc, channel), modeStr}
+                                params := []string{dc.nick, dc.marshalEntity(uc, channel), modeStr}
                                 params = append(params, modeParams...)
 
@@ -827 +827 @@
                                 Prefix:  dc.srv.prefix(),
                                 Command: irc.RPL_LIST,
-                                Params:  []string{dc.nick, dc.marshalChannel(uc, channel), clients, topic},
+                                Params:  []string{dc.nick, dc.marshalEntity(uc, channel), clients, topic},
                         })
                 })
@@ -845 +845 @@
                         // NAMES on a channel we have not joined, forward to downstream
                         uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                                channel := dc.marshalChannel(uc, name)
+                                channel := dc.marshalEntity(uc, name)
                                 members := splitSpace(members)
                                 for i, member := range members {
                                         membership, nick := uc.parseMembershipPrefix(member)
-                                        members[i] = membership.String() + dc.marshalNick(uc, nick)
+                                        members[i] = membership.String() + dc.marshalEntity(uc, nick)
                                 }
                                 memberStr := strings.Join(members, " ")
@@ -882 +882 @@
                         // NAMES on a channel we have not joined, forward to downstream
                         uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                                channel := dc.marshalChannel(uc, name)
+                                channel := dc.marshalEntity(uc, name)
 
                                 dc.SendMessage(&irc.Message{
@@ -923 +923 @@
                         channel := channel
                         if channel != "*" {
-                                channel = dc.marshalChannel(uc, channel)
-                        }
-                        nick := dc.marshalNick(uc, nick)
+                                channel = dc.marshalEntity(uc, channel)
+                        }
+                        nick := dc.marshalEntity(uc, nick)
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -957 +957 @@
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        nick := dc.marshalNick(uc, nick)
+                        nick := dc.marshalEntity(uc, nick)
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -971 +971 @@
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        nick := dc.marshalNick(uc, nick)
+                        nick := dc.marshalEntity(uc, nick)
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -985 +985 @@
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        nick := dc.marshalNick(uc, nick)
+                        nick := dc.marshalEntity(uc, nick)
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -999 +999 @@
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        nick := dc.marshalNick(uc, nick)
+                        nick := dc.marshalEntity(uc, nick)
                         params := []string{dc.nick, nick}
                         params = append(params, msg.Params[2:]...)
@@ -1016 +1016 @@
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        nick := dc.marshalNick(uc, nick)
+                        nick := dc.marshalEntity(uc, nick)
                         channelList := make([]string, len(channels))
                         for i, channel := range channels {
                                 prefix, channel := uc.parseMembershipPrefix(channel)
-                                channel = dc.marshalChannel(uc, channel)
+                                channel = dc.marshalEntity(uc, channel)
                                 channelList[i] = prefix.String() + channel
                         }
@@ -1037 +1037 @@
 
                 uc.forEachDownstreamByID(downstreamID, func(dc *downstreamConn) {
-                        nick := dc.marshalNick(uc, nick)
+                        nick := dc.marshalEntity(uc, nick)
                         dc.SendMessage(&irc.Message{
                                 Prefix:  dc.srv.prefix(),
@@ -1079 +1079 @@
                                 Prefix:  dc.marshalUserPrefix(uc, msg.Prefix),
                                 Command: "INVITE",
-                                Params:  []string{dc.marshalNick(uc, nick), dc.marshalChannel(uc, channel)},
+                                Params:  []string{dc.marshalEntity(uc, nick), dc.marshalEntity(uc, channel)},
                         })
                 })
@@ -1093 +1093 @@
                                 Prefix:  dc.srv.prefix(),
                                 Command: irc.RPL_INVITING,
-                                Params:  []string{dc.nick, dc.marshalNick(uc, nick), dc.marshalChannel(uc, channel)},
+                                Params:  []string{dc.nick, dc.marshalEntity(uc, nick), dc.marshalEntity(uc, channel)},
                         })
                 })