Changeset 676 in code for trunk/user.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/user.go (modified) (12 diffs)

trunk/user.go

@@ -320 +320 @@
 }
 
-func (net *network) deleteChannel(name string) error {
+func (net *network) deleteChannel(ctx context.Context, name string) error {
         ch := net.channels.Value(name)
         if ch == nil {
@@ -332 +332 @@
         }
 
-        if err := net.user.srv.db.DeleteChannel(context.TODO(), ch.ID); err != nil {
+        if err := net.user.srv.db.DeleteChannel(ctx, ch.ID); err != nil {
                 return err
         }
@@ -661 +661 @@
                         }
 
-                        e.done <- u.updateUser(&record)
+                        e.done <- u.updateUser(context.TODO(), &record)
 
                         // If the password was updated, kill all downstream connections to
@@ -767 +767 @@
 }
 
-func (u *user) createNetwork(record *Network) (*network, error) {
+func (u *user) createNetwork(ctx context.Context, record *Network) (*network, error) {
         if record.ID != 0 {
                 panic("tried creating an already-existing network")
@@ -781 +781 @@
 
         network := newNetwork(u, record, nil)
-        err := u.srv.db.StoreNetwork(context.TODO(), u.ID, &network.Network)
+        err := u.srv.db.StoreNetwork(ctx, u.ID, &network.Network)
         if err != nil {
                 return nil, err
@@ -803 +803 @@
 }
 
-func (u *user) updateNetwork(record *Network) (*network, error) {
+func (u *user) updateNetwork(ctx context.Context, record *Network) (*network, error) {
         if record.ID == 0 {
                 panic("tried updating a new network")
@@ -823 +823 @@
         }
 
-        if err := u.srv.db.StoreNetwork(context.TODO(), u.ID, record); err != nil {
+        if err := u.srv.db.StoreNetwork(ctx, u.ID, record); err != nil {
                 return nil, err
         }
@@ -884 +884 @@
 }
 
-func (u *user) deleteNetwork(id int64) error {
+func (u *user) deleteNetwork(ctx context.Context, id int64) error {
         network := u.getNetworkByID(id)
         if network == nil {
@@ -890 +890 @@
         }
 
-        if err := u.srv.db.DeleteNetwork(context.TODO(), network.ID); err != nil {
+        if err := u.srv.db.DeleteNetwork(ctx, network.ID); err != nil {
                 return err
         }
@@ -910 +910 @@
 }
 
-func (u *user) updateUser(record *User) error {
+func (u *user) updateUser(ctx context.Context, record *User) error {
         if u.ID != record.ID {
                 panic("ID mismatch when updating user")
@@ -916 +916 @@
 
         realnameUpdated := u.Realname != record.Realname
-        if err := u.srv.db.StoreUser(context.TODO(), record); err != nil {
+        if err := u.srv.db.StoreUser(ctx, record); err != nil {
                 return fmt.Errorf("failed to update user %q: %v", u.Username, err)
         }
@@ -932 +932 @@
                 var netErr error
                 for _, net := range needUpdate {
-                        if _, err := u.updateNetwork(&net); err != nil {
+                        if _, err := u.updateNetwork(ctx, &net); err != nil {
                                 netErr = err
                         }