Changeset 421 in code for trunk/service.go

Timestamp:

Oct 24, 2020, 1:14:23 PM (5 years ago)

Author:

contact

Message:

Switch DB API to user IDs

This commit changes the Network schema to use user IDs instead of
usernames. While at it, a new UNIQUE(user, name) constraint ensures
there is no conflict with custom network names.

Closes: ​https://todo.sr.ht/~emersion/soju/86
References: ​https://todo.sr.ht/~emersion/soju/29

File:

• trunk/service.go (modified) (4 diffs)

trunk/service.go

@@ -549 +549 @@
         net.SASL.Mechanism = "EXTERNAL"
 
-        if err := dc.srv.db.StoreNetwork(net.Username, &net.Network); err != nil {
+        if err := dc.srv.db.StoreNetwork(dc.user.ID, &net.Network); err != nil {
                 return err
         }
@@ -594 +594 @@
         net.SASL.Mechanism = "PLAIN"
 
-        if err := dc.srv.db.StoreNetwork(net.Username, &net.Network); err != nil {
+        if err := dc.srv.db.StoreNetwork(dc.user.ID, &net.Network); err != nil {
                 return err
         }
@@ -618 +618 @@
         net.SASL.Mechanism = ""
 
-        if err := dc.srv.db.StoreNetwork(dc.user.Username, &net.Network); err != nil {
+        if err := dc.srv.db.StoreNetwork(dc.user.ID, &net.Network); err != nil {
                 return err
         }
@@ -690 +690 @@
         u.stop()
 
-        if err := dc.srv.db.DeleteUser(username); err != nil {
+        if err := dc.srv.db.DeleteUser(dc.user.ID); err != nil {
                 return fmt.Errorf("failed to delete user: %v", err)
         }