Changeset 676 in code for trunk/downstream.go

Timestamp:

Nov 8, 2021, 6:36:10 PM (4 years ago)

Author:

contact

Message:

Add context support to user and network mutations

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

File:

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

trunk/downstream.go

@@ -1135 +1135 @@
                 dc.logger.Printf("auto-saving network %q", dc.networkName)
                 var err error
-                network, err = dc.user.createNetwork(&Network{
+                network, err = dc.user.createNetwork(context.TODO(), &Network{
                         Addr:    dc.networkName,
                         Nick:    nick,
@@ -1537 +1537 @@
                 // mutates the original list
                 for _, record := range needUpdate {
-                        if _, err := dc.user.updateNetwork(&record); err != nil {
+                        if _, err := dc.user.updateNetwork(ctx, &record); err != nil {
                                 dc.logger.Printf("failed to update network realname: %v", err)
                                 storeErr = err
@@ -1656 +1656 @@
                                 })
 
-                                if err := uc.network.deleteChannel(upstreamName); err != nil {
+                                if err := uc.network.deleteChannel(ctx, upstreamName); err != nil {
                                         dc.logger.Printf("failed to delete channel %q: %v", upstreamName, err)
                                 }
@@ -2442 +2442 @@
                         }
 
-                        network, err := dc.user.createNetwork(record)
+                        network, err := dc.user.createNetwork(ctx, record)
                         if err != nil {
                                 return ircError{&irc.Message{
@@ -2486 +2486 @@
                         }
 
-                        _, err = dc.user.updateNetwork(&record)
+                        _, err = dc.user.updateNetwork(ctx, &record)
                         if err != nil {
                                 return ircError{&irc.Message{
@@ -2517 +2517 @@
                         }
 
-                        if err := dc.user.deleteNetwork(net.ID); err != nil {
+                        if err := dc.user.deleteNetwork(ctx, net.ID); err != nil {
                                 return err
                         }