Changeset 497 in code for trunk/db.go

Timestamp:

Apr 13, 2021, 4:15:30 PM (4 years ago)

Author:

contact

Message:

Store last internal msg ID in DB when detaching

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

File:

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

trunk/db.go

@@ -110 +110 @@
 
 type Channel struct {
-        ID       int64
-        Name     string
-        Key      string
-        Detached bool
+        ID   int64
+        Name string
+        Key  string
+
+        Detached              bool
+        DetachedInternalMsgID string
 
         RelayDetached MessageFilter
@@ -162 +164 @@
         key VARCHAR(255),
         detached INTEGER NOT NULL DEFAULT 0,
+        detached_internal_msgid VARCHAR(255),
         relay_detached INTEGER NOT NULL DEFAULT 0,
         reattach_on INTEGER NOT NULL DEFAULT 0,
@@ -246 +249 @@
                 );
         `,
+        "ALTER TABLE Channel ADD COLUMN detached_internal_msgid VARCHAR(255)",
 }
 
@@ -547 +551 @@
         defer db.lock.RUnlock()
 
-        rows, err := db.db.Query(`SELECT id, name, key, detached, relay_detached, reattach_on, detach_after, detach_on
+        rows, err := db.db.Query(`SELECT
+                        id, name, key, detached, detached_internal_msgid,
+                        relay_detached, reattach_on, detach_after, detach_on
                 FROM Channel
                 WHERE network = ?`, networkID)
@@ -558 +564 @@
         for rows.Next() {
                 var ch Channel
-                var key sql.NullString
+                var key, detachedInternalMsgID sql.NullString
                 var detachAfter int64
-                if err := rows.Scan(&ch.ID, &ch.Name, &key, &ch.Detached, &ch.RelayDetached, &ch.ReattachOn, &detachAfter, &ch.DetachOn); err != nil {
+                if err := rows.Scan(&ch.ID, &ch.Name, &key, &ch.Detached, &detachedInternalMsgID, &ch.RelayDetached, &ch.ReattachOn, &detachAfter, &ch.DetachOn); err != nil {
                         return nil, err
                 }
                 ch.Key = key.String
+                ch.DetachedInternalMsgID = detachedInternalMsgID.String
                 ch.DetachAfter = time.Duration(detachAfter) * time.Second
                 channels = append(channels, ch)
@@ -584 +591 @@
         if ch.ID != 0 {
                 _, err = db.db.Exec(`UPDATE Channel
-                        SET network = ?, name = ?, key = ?, detached = ?, relay_detached = ?, reattach_on = ?, detach_after = ?, detach_on = ?
+                        SET network = ?, name = ?, key = ?, detached = ?, detached_internal_msgid = ?, relay_detached = ?, reattach_on = ?, detach_after = ?, detach_on = ?
                         WHERE id = ?`,
-                        networkID, ch.Name, key, ch.Detached, ch.RelayDetached, ch.ReattachOn, detachAfter, ch.DetachOn, ch.ID)
+                        networkID, ch.Name, key, ch.Detached, toNullString(ch.DetachedInternalMsgID), ch.RelayDetached, ch.ReattachOn, detachAfter, ch.DetachOn, ch.ID)
         } else {
                 var res sql.Result
-                res, err = db.db.Exec(`INSERT INTO Channel(network, name, key, detached, relay_detached, reattach_on, detach_after, detach_on)
+                res, err = db.db.Exec(`INSERT INTO Channel(network, name, key, detached, detached_internal_msgid, relay_detached, reattach_on, detach_after, detach_on)
                         VALUES (?, ?, ?, ?, ?, ?, ?, ?)`,
-                        networkID, ch.Name, key, ch.Detached, ch.RelayDetached, ch.ReattachOn, detachAfter, ch.DetachOn)
+                        networkID, ch.Name, key, ch.Detached, toNullString(ch.DetachedInternalMsgID), ch.RelayDetached, ch.ReattachOn, detachAfter, ch.DetachOn)
                 if err != nil {
                         return err