Changeset 664 in code for trunk/downstream.go

Timestamp:

Nov 2, 2021, 10:33:17 PM (4 years ago)

Author:

contact

Message:

Make Network.Nick optional

Make Network.Nick optional, default to the user's username. This
will allow adding a global setting to set the nickname in the
future, just like we have for the real name.

References: ​https://todo.sr.ht/~emersion/soju/110

File:

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

trunk/downstream.go

@@ -103 +103 @@
                 "name":     irc.TagValue(network.GetName()),
                 "state":    irc.TagValue(state),
-                "nickname": irc.TagValue(network.Nick),
+                "nickname": irc.TagValue(GetNick(&network.user.User, &network.Network)),
         }
 
@@ -336 +336 @@
         // configured nickname and hope it was the one being used when we were
         // connected.
-        return net.casemap(nick) == net.casemap(net.Nick)
+        return net.casemap(nick) == net.casemap(GetNick(&net.user.User, &net.Network))
 }
 
@@ -2415 +2415 @@
                         }
 
+                        if record.Nick == dc.user.Username {
+                                record.Nick = ""
+                        }
                         if record.Realname == dc.user.Realname {
                                 record.Realname = ""
@@ -2456 +2459 @@
                         }
 
+                        if record.Nick == dc.user.Username {
+                                record.Nick = ""
+                        }
                         if record.Realname == dc.user.Realname {
                                 record.Realname = ""