Changeset 31 in code for trunk/downstream.go

Timestamp:

Feb 6, 2020, 9:35:24 PM (5 years ago)

Author:

contact

Message:

Remove downstreamConn.WriteMessage

It wasn't clear what this function was doing

File:

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

trunk/downstream.go

@@ -122 +122 @@
 }
 
-func (c *downstreamConn) WriteMessage(msg *irc.Message) {
-        msg.Prefix = c.srv.prefix()
-        c.messages <- msg
-}
-
 func (c *downstreamConn) handleMessage(msg *irc.Message) error {
         switch msg.Command {
@@ -133 +128 @@
         case "PING":
                 // TODO: handle params
-                c.WriteMessage(&irc.Message{
+                c.messages <- &irc.Message{
+                        Prefix:  c.srv.prefix(),
                         Command: "PONG",
                         Params:  []string{c.srv.Hostname},
-                })
+                }
                 return nil
         default:
@@ -173 +169 @@
         c.registered = true
 
-        c.WriteMessage(&irc.Message{
+        c.messages <- &irc.Message{
+                Prefix:  c.srv.prefix(),
                 Command: irc.RPL_WELCOME,
                 Params:  []string{c.nick, "Welcome to jounce, " + c.nick},
-        })
-
-        c.WriteMessage(&irc.Message{
+        }
+
+        c.messages <- &irc.Message{
+                Prefix:  c.srv.prefix(),
                 Command: irc.RPL_YOURHOST,
                 Params:  []string{c.nick, "Your host is " + c.srv.Hostname},
-        })
-
-        c.WriteMessage(&irc.Message{
+        }
+
+        c.messages <- &irc.Message{
+                Prefix:  c.srv.prefix(),
                 Command: irc.RPL_CREATED,
                 Params:  []string{c.nick, "This server was created <datetime>"}, // TODO
-        })
-
-        c.WriteMessage(&irc.Message{
+        }
+
+        c.messages <- &irc.Message{
+                Prefix:  c.srv.prefix(),
                 Command: irc.RPL_MYINFO,
                 Params:  []string{c.nick, c.srv.Hostname, "jounce", "aiwroO", "OovaimnqpsrtklbeI"},
-        })
-
-        c.WriteMessage(&irc.Message{
+        }
+
+        c.messages <- &irc.Message{
+                Prefix:  c.srv.prefix(),
                 Command: irc.ERR_NOMOTD,
                 Params:  []string{c.nick, "No MOTD"},
-        })
+        }
 
         c.srv.lock.Lock()