Changeset 416 in code for trunk

Timestamp:

Sep 7, 2020, 9:40:18 AM (5 years ago)

Author:

hubert

Message:

Make DB.DeleteChannel take the channel ID

... to allow the caller to correctly do any necessary casemapping.

Location:

trunk

Files:

• db.go (modified) (1 diff)
• user.go (modified) (1 diff)

trunk/db.go

@@ -462 +462 @@
 }
 
-func (db *DB) DeleteChannel(networkID int64, name string) error {
-        db.lock.Lock()
-        defer db.lock.Unlock()
-
-        _, err := db.db.Exec("DELETE FROM Channel WHERE network = ? AND name = ?", networkID, name)
+func (db *DB) DeleteChannel(id int64) error {
+        db.lock.Lock()
+        defer db.lock.Unlock()
+
+        _, err := db.db.Exec("DELETE FROM Channel WHERE id = ?", id)
         return err
 }

trunk/user.go

@@ -230 +230 @@
 
 func (net *network) deleteChannel(name string) error {
-        if err := net.user.srv.db.DeleteChannel(net.ID, name); err != nil {
+        ch, ok := net.channels[name]
+        if !ok {
+                return fmt.Errorf("unknown channel %q", name)
+        }
+        if err := net.user.srv.db.DeleteChannel(ch.ID); err != nil {
                 return err
         }