Changeset 285 in code for trunk

Timestamp:

May 1, 2020, 3:39:53 PM (5 years ago)

Author:

contact

Message:

Don't clear channel key on JOIN

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

File:

• trunk/downstream.go (modified) (1 diff)

trunk/downstream.go

@@ -956 +956 @@
 
                         ch := &Channel{Name: upstreamName, Key: key, Detached: false}
+                        if current, ok := uc.network.channels[ch.Name]; ok && key == "" {
+                                // Don't clear the channel key if there's one set
+                                // TODO: add a way to unset the channel key
+                                ch.Key = current.Key
+                        }
                         if err := uc.network.createUpdateChannel(ch); err != nil {
                                 dc.logger.Printf("failed to create or update channel %q: %v", upstreamName, err)