Changeset 743 in code

Timestamp:

Dec 4, 2021, 7:07:23 PM (4 years ago)

Author:

contact

Message:

Fallback to alt nick

If the nickname we want is taken, fallback to another one by
appending underscores. Use MONITOR to figure out when we can request
our desired nick again.

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

File:

• trunk/upstream.go (modified) (6 diffs)

trunk/upstream.go

@@ -775 +775 @@
                 }
 
+                uc.updateMonitor()
+
                 uc.forEachDownstream(func(dc *downstreamConn) {
                         if dc.network == nil {
@@ -877 +879 @@
                                 dc.updateNick()
                         })
+                        uc.updateMonitor()
                 }
         case "SETNAME":
@@ -1521 +1524 @@
                         prefix := irc.ParsePrefix(target)
                         uc.monitored.SetValue(prefix.Name, online)
+                }
+
+                // Check if the nick we want is now free
+                wantNick := GetNick(&uc.user.User, &uc.network.Network)
+                wantNickCM := uc.network.casemap(wantNick)
+                if !online && uc.nickCM != wantNickCM {
+                        found := false
+                        for _, target := range targets {
+                                prefix := irc.ParsePrefix(target)
+                                if uc.network.casemap(prefix.Name) == wantNickCM {
+                                        found = true
+                                        break
+                                }
+                        }
+                        if found {
+                                uc.logger.Printf("desired nick %q is now available", wantNick)
+                                uc.SendMessage(&irc.Message{
+                                        Command: "NICK",
+                                        Params:  []string{wantNick},
+                                })
+                        }
                 }
 
@@ -1688 +1712 @@
                 }
                 return fmt.Errorf("fatal server error: %v", text)
-        case irc.ERR_PASSWDMISMATCH, irc.ERR_ERRONEUSNICKNAME, irc.ERR_NICKNAMEINUSE, irc.ERR_NICKCOLLISION, irc.ERR_UNAVAILRESOURCE, irc.ERR_NOPERMFORHOST, irc.ERR_YOUREBANNEDCREEP:
+        case irc.ERR_NICKNAMEINUSE:
+                // At this point, we haven't received ISUPPORT so we don't know the
+                // maximum nickname length or whether the server supports MONITOR. Many
+                // servers have NICKLEN=30 so let's just use that.
+                if !uc.registered && len(uc.nick)+1 < 30 {
+                        uc.nick = uc.nick + "_"
+                        uc.nickCM = uc.network.casemap(uc.nick)
+                        uc.logger.Printf("desired nick is not available, falling back to %q", uc.nick)
+                        uc.SendMessage(&irc.Message{
+                                Command: "NICK",
+                                Params:  []string{uc.nick},
+                        })
+                        return nil
+                }
+                fallthrough
+        case irc.ERR_PASSWDMISMATCH, irc.ERR_ERRONEUSNICKNAME, irc.ERR_NICKCOLLISION, irc.ERR_UNAVAILRESOURCE, irc.ERR_NOPERMFORHOST, irc.ERR_YOUREBANNEDCREEP:
                 if !uc.registered {
                         return registrationError{msg}
@@ -2088 +2127 @@
                                 if _, ok := add[targetCM]; !ok {
                                         addList = append(addList, targetCM)
+                                        add[targetCM] = struct{}{}
                                 }
-                                add[targetCM] = struct{}{}
                         } else {
                                 seen[targetCM] = struct{}{}
@@ -2095 +2134 @@
                 }
         })
+
+        wantNick := GetNick(&uc.user.User, &uc.network.Network)
+        wantNickCM := uc.network.casemap(wantNick)
+        if _, ok := add[wantNickCM]; !ok && !uc.monitored.Has(wantNick) && !uc.isOurNick(wantNick) {
+                addList = append(addList, wantNickCM)
+                add[wantNickCM] = struct{}{}
+        }
 
         removeAll := true