Changeset 674 in code for trunk

Timestamp:

Nov 7, 2021, 5:33:59 PM (4 years ago)

Author:

contact

Message:

Fix upstream USER command when both username and nick are empty

Location:

trunk

Files:

• db.go (modified) (2 diffs)
• upstream.go (modified) (1 diff)

trunk/db.go

@@ -106 +106 @@
 }
 
-func (net *Network) GetUsername() string {
-        if net.Username != "" {
-                return net.Username
-        }
-        return net.Nick
-}
-
 func GetNick(user *User, net *Network) string {
         if net.Nick != "" {
@@ -118 +111 @@
         }
         return user.Username
+}
+
+func GetUsername(user *User, net *Network) string {
+        if net.Username != "" {
+                return net.Username
+        }
+        return GetNick(user, net)
 }
 

trunk/upstream.go

@@ -1674 +1674 @@
         uc.nick = GetNick(&uc.user.User, &uc.network.Network)
         uc.nickCM = uc.network.casemap(uc.nick)
-        uc.username = uc.network.GetUsername()
+        uc.username = GetUsername(&uc.user.User, &uc.network.Network)
         uc.realname = GetRealname(&uc.user.User, &uc.network.Network)