Changeset 259 in code for trunk/downstream.go

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.

File:

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

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)},
                                 })