Changeset 60 in code for trunk

Timestamp:

Feb 17, 2020, 3:17:31 PM (5 years ago)

Author:

contact

Message:

Add upstreamConn.SendMessage

Allows us to change upstreamConn implementation details without updating
the whole codebase.

Location:

trunk

Files:

• downstream.go (modified) (5 diffs)
• upstream.go (modified) (4 diffs)

trunk/downstream.go

@@ -327 +327 @@
         case "NICK":
                 dc.user.forEachUpstream(func(uc *upstreamConn) {
-                        uc.messages <- msg
+                        uc.SendMessage(msg)
                 })
         case "JOIN":
@@ -355 +355 @@
                 }
 
-                ch.conn.messages <- msg
+                ch.conn.SendMessage(msg)
                 // TODO: remove channel from upstream config
         case "MODE":
@@ -375 +375 @@
 
                         if modeStr != "" {
-                                ch.conn.messages <- msg
+                                ch.conn.SendMessage(msg)
                         } else {
                                 dc.SendMessage(&irc.Message{
@@ -393 +393 @@
                         if modeStr != "" {
                                 dc.user.forEachUpstream(func(uc *upstreamConn) {
-                                        uc.messages <- msg
+                                        uc.SendMessage(msg)
                                 })
                         } else {
@@ -415 +415 @@
                         }
 
-                        ch.conn.messages <- &irc.Message{
+                        ch.conn.SendMessage(&irc.Message{
                                 Prefix:  msg.Prefix,
                                 Command: "PRIVMSG",
                                 Params:  []string{name, text},
-                        }
+                        })
                 }
         default:

trunk/upstream.go

@@ -108 +108 @@
         case "PING":
                 // TODO: handle params
-                uc.messages <- &irc.Message{
+                uc.SendMessage(&irc.Message{
                         Command: "PONG",
                         Params:  []string{uc.srv.Hostname},
-                }
+                })
                 return nil
         case "MODE":
@@ -144 +144 @@
 
                 for _, ch := range uc.upstream.Channels {
-                        uc.messages <- &irc.Message{
+                        uc.SendMessage(&irc.Message{
                                 Command: "JOIN",
                                 Params:  []string{ch},
-                        }
+                        })
                 }
         case irc.RPL_MYINFO:
@@ -326 +326 @@
 func (uc *upstreamConn) register() {
         uc.nick = uc.upstream.Nick
-        uc.messages <- &irc.Message{
+        uc.SendMessage(&irc.Message{
                 Command: "NICK",
                 Params:  []string{uc.upstream.Nick},
-        }
-        uc.messages <- &irc.Message{
+        })
+        uc.SendMessage(&irc.Message{
                 Command: "USER",
                 Params:  []string{uc.upstream.Username, "0", "*", uc.upstream.Realname},
-        }
+        })
 }
 
@@ -352 +352 @@
         return nil
 }
+
+func (uc *upstreamConn) SendMessage(msg *irc.Message) {
+        uc.messages <- msg
+}