Changeset 691 in code for trunk/downstream.go

Timestamp:

Nov 15, 2021, 11:38:04 PM (4 years ago)

Author:

contact

Message:

Allow most config options to be reloaded

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

File:

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

trunk/downstream.go

@@ -291 +291 @@
                 dc.supportedCaps[k] = v
         }
-        if srv.LogPath != "" {
+        // TODO: this is racy, we should only enable chathistory after
+        // authentication and then check that user.msgStore implements
+        // chatHistoryMessageStore
+        if srv.Config().LogPath != "" {
                 dc.supportedCaps["draft/chathistory"] = ""
         }
@@ -997 +1000 @@
         }
 
-        if dc.srv.LogPath != "" && dc.network != nil {
+        if _, ok := dc.user.msgStore.(chatHistoryMessageStore); ok && dc.network != nil {
                 dc.setSupportedCap("draft/event-playback", "")
         } else {
@@ -1176 +1179 @@
                 isupport = append(isupport, fmt.Sprintf("BOUNCER_NETID=%v", dc.network.ID))
         }
-        if dc.network == nil && dc.srv.Title != "" {
-                isupport = append(isupport, "NETWORK="+encodeISUPPORT(dc.srv.Title))
+        if title := dc.srv.Config().Title; dc.network == nil && title != "" {
+                isupport = append(isupport, "NETWORK="+encodeISUPPORT(title))
         }
         if dc.network == nil && dc.caps["soju.im/bouncer-networks"] {
@@ -1205 +1208 @@
                 Prefix:  dc.srv.prefix(),
                 Command: irc.RPL_YOURHOST,
-                Params:  []string{dc.nick, "Your host is " + dc.srv.Hostname},
+                Params:  []string{dc.nick, "Your host is " + dc.srv.Config().Hostname},
         })
         dc.SendMessage(&irc.Message{
                 Prefix:  dc.srv.prefix(),
                 Command: irc.RPL_MYINFO,
-                Params:  []string{dc.nick, dc.srv.Hostname, "soju", "aiwroO", "OovaimnqpsrtklbeI"},
+                Params:  []string{dc.nick, dc.srv.Config().Hostname, "soju", "aiwroO", "OovaimnqpsrtklbeI"},
         })
         for _, msg := range generateIsupport(dc.srv.prefix(), dc.nick, isupport) {
@@ -1230 +1233 @@
         }
 
-        if motd := dc.user.srv.MOTD(); motd != "" && dc.network == nil {
+        if motd := dc.user.srv.Config().MOTD; motd != "" && dc.network == nil {
                 for _, msg := range generateMOTD(dc.srv.prefix(), dc.nick, motd) {
                         dc.SendMessage(msg)
@@ -1421 +1424 @@
                         destination = msg.Params[1]
                 }
-                if destination != "" && destination != dc.srv.Hostname {
+                hostname := dc.srv.Config().Hostname
+                if destination != "" && destination != hostname {
                         return ircError{&irc.Message{
                                 Command: irc.ERR_NOSUCHSERVER,
@@ -1430 +1434 @@
                         Prefix:  dc.srv.prefix(),
                         Command: "PONG",
-                        Params:  []string{dc.srv.Hostname, source},
+                        Params:  []string{hostname, source},
                 })
                 return nil
@@ -1947 +1951 @@
                                 Username: dc.user.Username,
                                 Hostname: dc.hostname,
-                                Server:   dc.srv.Hostname,
+                                Server:   dc.srv.Config().Hostname,
                                 Nickname: dc.nick,
                                 Flags:    flags,
@@ -1966 +1970 @@
                                 Username: servicePrefix.User,
                                 Hostname: servicePrefix.Host,
-                                Server:   dc.srv.Hostname,
+                                Server:   dc.srv.Config().Hostname,
                                 Nickname: serviceNick,
                                 Flags:    "H*",
@@ -2026 +2030 @@
                                 Prefix:  dc.srv.prefix(),
                                 Command: irc.RPL_WHOISSERVER,
-                                Params:  []string{dc.nick, dc.nick, dc.srv.Hostname, "soju"},
+                                Params:  []string{dc.nick, dc.nick, dc.srv.Config().Hostname, "soju"},
                         })
                         if dc.user.Admin {
@@ -2056 +2060 @@
                                 Prefix:  dc.srv.prefix(),
                                 Command: irc.RPL_WHOISSERVER,
-                                Params:  []string{dc.nick, serviceNick, dc.srv.Hostname, "soju"},
+                                Params:  []string{dc.nick, serviceNick, dc.srv.Config().Hostname, "soju"},
                         })
                         dc.SendMessage(&irc.Message{
@@ -2105 +2109 @@
 
                 for _, name := range strings.Split(targetsStr, ",") {
-                        if name == "$"+dc.srv.Hostname || (name == "$*" && dc.network == nil) {
+                        if name == "$"+dc.srv.Config().Hostname || (name == "$*" && dc.network == nil) {
                                 // "$" means a server mask follows. If it's the bouncer's
                                 // hostname, broadcast the message to all bouncer users.