Changeset 636 in code for trunk/downstream.go

Timestamp:

Oct 13, 2021, 8:58:34 AM (4 years ago)

Author:

contact

Message:

Add bouncer MOTD

Closes: ​https://todo.sr.ht/~emersion/soju/137

File:

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

trunk/downstream.go

@@ -1120 +1120 @@
                 dc.SendMessage(msg)
         }
-        motdHint := "No MOTD"
         if uc := dc.upstream(); uc != nil {
-                motdHint = "Use /motd to read the message of the day"
                 dc.SendMessage(&irc.Message{
                         Prefix:  dc.srv.prefix(),
@@ -1129 +1127 @@
                 })
         }
-        dc.SendMessage(&irc.Message{
-                Prefix:  dc.srv.prefix(),
-                Command: irc.ERR_NOMOTD,
-                Params:  []string{dc.nick, motdHint},
-        })
+
+        if motd := dc.user.srv.MOTD(); motd != "" && dc.network == nil {
+                for _, msg := range generateMOTD(dc.srv.prefix(), dc.nick, motd) {
+                        dc.SendMessage(msg)
+                }
+        } else {
+                motdHint := "No MOTD"
+                if dc.network != nil {
+                        motdHint = "Use /motd to read the message of the day"
+                }
+                dc.SendMessage(&irc.Message{
+                        Prefix:  dc.srv.prefix(),
+                        Command: irc.ERR_NOMOTD,
+                        Params:  []string{dc.nick, motdHint},
+                })
+        }
 
         dc.updateNick()