Changeset 662 in code for trunk

Timestamp:

Nov 2, 2021, 9:38:07 PM (4 years ago)

Author:

contact

Message:

Add title config option

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

Location:

trunk

Files:

• cmd/soju/main.go (modified) (1 diff)
• config/config.go (modified) (3 diffs)
• doc/soju.1.scd (modified) (1 diff)
• downstream.go (modified) (1 diff)
• irc.go (modified) (1 diff)
• server.go (modified) (1 diff)

trunk/cmd/soju/main.go

@@ -98 +98 @@
 
         srv := soju.NewServer(db)
-        // TODO: load from config/DB
         srv.Hostname = cfg.Hostname
+        srv.Title = cfg.Title
         srv.LogPath = cfg.LogPath
         srv.HTTPOrigins = cfg.HTTPOrigins

trunk/config/config.go

@@ -39 +39 @@
 type Server struct {
         Listen   []string
+        TLS      *TLS
         Hostname string
-        TLS      *TLS
+        Title    string
         MOTDPath string
 
@@ -88 +89 @@
                                 return nil, err
                         }
+                case "title":
+                        if err := d.ParseParams(&srv.Title); err != nil {
+                                return nil, err
+                        }
+                case "motd":
+                        if err := d.ParseParams(&srv.MOTDPath); err != nil {
+                                return nil, err
+                        }
                 case "tls":
                         tls := &TLS{}
@@ -130 +139 @@
                                 return nil, fmt.Errorf("directive %q: %v", d.Name, err)
                         }
-                case "motd":
-                        if err := d.ParseParams(&srv.MOTDPath); err != nil {
-                                return nil, err
-                        }
                 default:
                         return nil, fmt.Errorf("unknown directive %q", d.Name)

trunk/doc/soju.1.scd

@@ -105 +105 @@
         Server hostname (default: system hostname).
 
+*title* <title>
+        Server title. This will be sent as the _ISUPPORT NETWORK_ value when clients
+        don't select a specific network.
+
 *tls* <cert> <key>
         Enable TLS support. The certificate and the key files must be PEM-encoded.

trunk/downstream.go

@@ -1158 +1158 @@
                 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 dc.network == nil && dc.caps["soju.im/bouncer-networks"] {
                 isupport = append(isupport, "WHOX")

trunk/irc.go

@@ -762 +762 @@
         }
 }
+
+var isupportEncoder = strings.NewReplacer(" ", "\\x20", "\\", "\\x5C")
+
+func encodeISUPPORT(s string) string {
+        return isupportEncoder.Replace(s)
+}

trunk/server.go

@@ -51 +51 @@
 type Server struct {
         Hostname        string
+        Title           string
         Logger          Logger
         HistoryLimit    int