Changeset 54 in code for trunk/downstream.go

Timestamp:

Feb 17, 2020, 11:27:48 AM (5 years ago)

Author:

contact

Message:

Don't write to downstreamConn.messages directly

Use a helper function instead. This will allow us to change
downstreamConn implementation details without having to update the whole
codebase.

File:

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

trunk/downstream.go

@@ -103 +103 @@
                 if ircErr, ok := err.(ircError); ok {
                         ircErr.Message.Prefix = c.srv.prefix()
-                        c.messages <- ircErr.Message
+                        c.SendMessage(ircErr.Message)
                 } else if err != nil {
                         return fmt.Errorf("failed to handle IRC command %q: %v", msg.Command, err)
@@ -141 +141 @@
 
         return nil
+}
+
+func (c *downstreamConn) SendMessage(msg *irc.Message) {
+        c.messages <- msg
 }
 
@@ -149 +153 @@
         case "PING":
                 // TODO: handle params
-                c.messages <- &irc.Message{
+                c.SendMessage(&irc.Message{
                         Prefix:  c.srv.prefix(),
                         Command: "PONG",
                         Params:  []string{c.srv.Hostname},
-                }
+                })
                 return nil
         default:
@@ -190 +194 @@
         if u == nil {
                 c.logger.Printf("failed authentication: unknown username %q", c.username)
-                c.messages <- &irc.Message{
+                c.SendMessage(&irc.Message{
                         Prefix:  c.srv.prefix(),
                         Command: irc.ERR_PASSWDMISMATCH,
                         Params:  []string{"*", "Invalid username or password"},
-                }
+                })
                 return nil
         }
@@ -205 +209 @@
         u.lock.Unlock()
 
-        c.messages <- &irc.Message{
+        c.SendMessage(&irc.Message{
                 Prefix:  c.srv.prefix(),
                 Command: irc.RPL_WELCOME,
                 Params:  []string{c.nick, "Welcome to jounce, " + c.nick},
-        }
-        c.messages <- &irc.Message{
+        })
+        c.SendMessage(&irc.Message{
                 Prefix:  c.srv.prefix(),
                 Command: irc.RPL_YOURHOST,
                 Params:  []string{c.nick, "Your host is " + c.srv.Hostname},
-        }
-        c.messages <- &irc.Message{
+        })
+        c.SendMessage(&irc.Message{
                 Prefix:  c.srv.prefix(),
                 Command: irc.RPL_CREATED,
                 Params:  []string{c.nick, "Who cares when the server was created?"},
-        }
-        c.messages <- &irc.Message{
+        })
+        c.SendMessage(&irc.Message{
                 Prefix:  c.srv.prefix(),
                 Command: irc.RPL_MYINFO,
                 Params:  []string{c.nick, c.srv.Hostname, "jounce", "aiwroO", "OovaimnqpsrtklbeI"},
-        }
-        c.messages <- &irc.Message{
+        })
+        c.SendMessage(&irc.Message{
                 Prefix:  c.srv.prefix(),
                 Command: irc.ERR_NOMOTD,
                 Params:  []string{c.nick, "No MOTD"},
-        }
+        })
 
         u.forEachUpstream(func(uc *upstreamConn) {
@@ -247 +251 @@
                                 break
                         }
-                        c.messages <- msg
+                        c.SendMessage(msg)
                 }
         })
@@ -313 +317 @@
                                 ch.conn.messages <- msg
                         } else {
-                                c.messages <- &irc.Message{
+                                c.SendMessage(&irc.Message{
                                         Prefix:  c.srv.prefix(),
                                         Command: irc.RPL_CHANNELMODEIS,
                                         Params:  []string{ch.Name, string(ch.modes)},
-                                }
+                                })
                         }
                 } else {
@@ -332 +336 @@
                                 })
                         } else {
-                                c.messages <- &irc.Message{
+                                c.SendMessage(&irc.Message{
                                         Prefix:  c.srv.prefix(),
                                         Command: irc.RPL_UMODEIS,
                                         Params:  []string{""}, // TODO
-                                }
+                                })
                         }
                 }