Changeset 289 in code for trunk

Timestamp:

May 1, 2020, 7:56:40 PM (5 years ago)

Author:

delthas

Message:

Fix not properly marshaling self in single-server mode

In single-server mode, we don't need to add a /network suffix when
marshaling, but we still need to replace our nick with the downstream
nick.

File:

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

trunk/downstream.go

@@ -156 +156 @@
 // user.
 func (dc *downstreamConn) marshalEntity(net *network, name string) string {
+        if isOurNick(net, name) {
+                return dc.nick
+        }
         if dc.network != nil {
                 if dc.network != net {
@@ -161 +164 @@
                 }
                 return name
-        }
-        if isOurNick(net, name) {
-                return dc.nick
         }
         return name + "/" + net.GetName()