Changeset 89 in code for trunk

Timestamp:

Mar 12, 2020, 5:33:03 PM (5 years ago)

Author:

contact

Message:

Update DB on JOIN and PART

Location:

trunk

Files:

• db.go (modified) (2 diffs)
• downstream.go (modified) (2 diffs)

trunk/db.go

@@ -78 +78 @@
         defer db.lock.Unlock()
 
-        tx, err := db.db.Begin()
-        if err != nil {
-                return err
-        }
-        defer tx.Rollback()
-
         var password *string
         if user.Password != "" {
                 password = &user.Password
         }
-        _, err = tx.Exec("INSERT INTO User(username, password) VALUES (?, ?)", user.Username, password)
-        if err != nil {
-                return err
-        }
-
-        return tx.Commit()
+        _, err := db.db.Exec("INSERT INTO User(username, password) VALUES (?, ?)", user.Username, password)
+        return err
 }
 
@@ -152 +142 @@
         return channels, nil
 }
+
+func (db *DB) StoreChannel(networkID int64, ch *Channel) error {
+        db.lock.Lock()
+        defer db.lock.Unlock()
+
+        _, err := db.db.Exec("INSERT OR REPLACE INTO Channel(network, name) VALUES (?, ?)", networkID, ch.Name)
+        return err
+}
+
+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)
+        return err
+}

trunk/downstream.go

@@ -115 +115 @@
 }
 
+// upstream returns the upstream connection, if any. If there are zero or if
+// there are multiple upstream connections, it returns nil.
+func (dc *downstreamConn) upstream() *upstreamConn {
+        if dc.network == nil {
+                return nil
+        }
+
+        var upstream *upstreamConn
+        dc.forEachUpstream(func(uc *upstreamConn) {
+                upstream = uc
+        })
+        return upstream
+}
+
 func (dc *downstreamConn) unmarshalChannel(name string) (*upstreamConn, string, error) {
+        if uc := dc.upstream(); uc != nil {
+                return uc, name, nil
+        }
+
         // TODO: extract network name from channel name if dc.upstream == nil
         var channel *upstreamChannel
@@ -462 +480 @@
                         Params:  []string{upstreamName},
                 })
-                // TODO: add/remove channel from upstream config
+
+                switch msg.Command {
+                case "JOIN":
+                        err := dc.srv.db.StoreChannel(uc.network.ID, &Channel{
+                                Name: upstreamName,
+                        })
+                        if err != nil {
+                                dc.logger.Printf("failed to create channel %q in DB: %v", upstreamName, err)
+                        }
+                case "PART":
+                        if err := dc.srv.db.DeleteChannel(uc.network.ID, upstreamName); err != nil {
+                                dc.logger.Printf("failed to delete channel %q in DB: %v", upstreamName, err)
+                        }
+                }
         case "MODE":
                 if msg.Prefix == nil {