Changeset 207 in code for trunk/downstream.go

Timestamp:

Apr 1, 2020, 3:34:22 PM (5 years ago)

Author:

contact

Message:

Fix SQL error logged on JOIN

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

File:

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

trunk/downstream.go

@@ -897 +897 @@
                         })
 
-                        err = dc.srv.db.StoreChannel(uc.network.ID, &Channel{
-                                Name: upstreamName,
-                                Key:  key,
-                        })
-                        if err != nil {
-                                dc.logger.Printf("failed to create channel %q in DB: %v", upstreamName, err)
+                        ch, err := dc.srv.db.GetChannel(uc.network.ID, upstreamName)
+                        if err == ErrNoSuchChannel {
+                                ch = &Channel{Name: upstreamName}
+                        } else if err != nil {
+                                return err
+                        }
+
+                        ch.Key = key
+
+                        if err := dc.srv.db.StoreChannel(uc.network.ID, ch); err != nil {
+                                return err
                         }
                 }