Changeset 778 in code for trunk

Timestamp:

Feb 9, 2022, 2:16:54 PM (3 years ago)

Author:

contact

Message:

Refactor generateWHOXReply

Isolate the field letter -> value logic into a separate function.

File:

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

trunk/irc.go

@@ -729 +729 @@
 }
 
+// whoxFields is the list of all WHOX field letters, by order of appearance in
+// RPL_WHOSPCRPL messages.
+var whoxFields = []byte("tcuihsnfdlaor")
+
 type whoxInfo struct {
         Token    string
@@ -740 +744 @@
 }
 
+func (info *whoxInfo) get(field byte) string {
+        switch field {
+        case 't':
+                return info.Token
+        case 'c':
+                return "*"
+        case 'u':
+                return info.Username
+        case 'i':
+                return "255.255.255.255"
+        case 'h':
+                return info.Hostname
+        case 's':
+                return info.Server
+        case 'n':
+                return info.Nickname
+        case 'f':
+                return info.Flags
+        case 'd':
+                return "0"
+        case 'l': // idle time
+                return "0"
+        case 'a':
+                account := "0" // WHOX uses "0" to mean "no account"
+                if info.Account != "" && info.Account != "*" {
+                        account = info.Account
+                }
+                return account
+        case 'o':
+                return "0"
+        case 'r':
+                return info.Realname
+        }
+        return ""
+}
+
 func generateWHOXReply(prefix *irc.Prefix, nick, fields string, info *whoxInfo) *irc.Message {
         if fields == "" {
@@ -754 +794 @@
         }
 
-        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)
+        var values []string
+        for _, field := range whoxFields {
+                if !fieldSet[field] {
+                        continue
+                }
+                values = append(values, info.get(field))
         }
 
@@ -802 +805 @@
                 Prefix:  prefix,
                 Command: rpl_whospcrpl,
-                Params:  append([]string{nick}, params...),
+                Params:  append([]string{nick}, values...),
         }
 }