Changeset 660 in code for trunk/irc.go

Timestamp:

Nov 2, 2021, 5:25:43 PM (4 years ago)

Author:

contact

Message:

Add support for WHOX

This adds support for WHOX, without bothering about flags and mask2
because Solanum and Ergo [1] don't support it either.

The motivation is to allow clients to reliably query account names.

It's not possible to use WHOX tokens to route replies to the right
client, because RPL_ENDOFWHO doesn't contain it.

[1]: ​https://github.com/ergochat/ergo/pull/1184

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

File:

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

trunk/irc.go

@@ -18 +18 @@
         rpl_creationtime  = "329"
         rpl_topicwhotime  = "333"
+        rpl_whospcrpl     = "354"
         err_invalidcapcmd = "410"
 )
@@ -683 +684 @@
         }
 }
+
+type whoxInfo struct {
+        Token    string
+        Username string
+        Hostname string
+        Server   string
+        Nickname string
+        Flags    string
+        Account  string
+        Realname string
+}
+
+func generateWHOXReply(prefix *irc.Prefix, nick, fields string, info *whoxInfo) *irc.Message {
+        if fields == "" {
+                return &irc.Message{
+                        Prefix:  prefix,
+                        Command: irc.RPL_WHOREPLY,
+                        Params:  []string{nick, "*", info.Username, info.Hostname, info.Server, info.Nickname, info.Flags, "0 " + info.Realname},
+                }
+        }
+
+        fieldSet := make(map[byte]bool)
+        for i := 0; i < len(fields); i++ {
+                fieldSet[fields[i]] = true
+        }
+
+        var params []string
+        if fieldSet['t'] {
+                params = append(params, info.Token)
+        }
+        if fieldSet['c'] {
+                params = append(params, "*")
+        }
+        if fieldSet['u'] {
+                params = append(params, info.Username)
+        }
+        if fieldSet['i'] {
+                params = append(params, "255.255.255.255")
+        }
+        if fieldSet['h'] {
+                params = append(params, info.Hostname)
+        }
+        if fieldSet['s'] {
+                params = append(params, info.Server)
+        }
+        if fieldSet['n'] {
+                params = append(params, info.Nickname)
+        }
+        if fieldSet['f'] {
+                params = append(params, info.Flags)
+        }
+        if fieldSet['d'] {
+                params = append(params, "0")
+        }
+        if fieldSet['l'] { // idle time
+                params = append(params, "0")
+        }
+        if fieldSet['a'] {
+                account := "0" // WHOX uses "0" to mean "no account"
+                if info.Account != "" && info.Account != "*" {
+                        account = info.Account
+                }
+                params = append(params, account)
+        }
+        if fieldSet['o'] {
+                params = append(params, "0")
+        }
+        if fieldSet['r'] {
+                params = append(params, info.Realname)
+        }
+
+        return &irc.Message{
+                Prefix:  prefix,
+                Command: rpl_whospcrpl,
+                Params:  append([]string{nick}, params...),
+        }
+}