From 51a9e8e961ffc89560310bc48cfa2de0d4bc93fa Mon Sep 17 00:00:00 2001
From: fuzzykitten <fuzzykitten@mail.i2p>
Date: Sun, 13 Apr 2025 04:15:44 -0400
Subject: [PATCH] fixed bug that made edited posts reappear (in the first form)
 after bumping

---
 opt/post.php | 41 ++++++++++++++++++++++++-----------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/opt/post.php b/opt/post.php
index f42dc82..a6184c3 100644
--- a/opt/post.php
+++ b/opt/post.php
@@ -103,27 +103,31 @@ function bump_message($db, $org_id, $sub, $settings)
 		}
 	}
   
-    $statement = $db->prepare("SELECT text, global_id, text_id, timestamp,
-                                      name, tripcode, original
+    $statement = $db->prepare("SELECT post_id, text, global_id, text_id, 
+									  timestamp, name, tripcode, original,
+                                      edit_message, move_message
                                FROM threads
-                               WHERE post_id = '$org_id'
-                               AND org_id = '$org_id'
+                               WHERE original = '$org_id'
+                               AND shadow = 'no'
                                AND sub = '$sub'");
     $result = $statement->execute();
 
     while ($row = $result->fetchArray(SQLITE3_NUM)) {
-        $text = "{$row[0]}";
-        $global_id = "{$row[1]}";
-        $text_id = "{$row[2]}";
-        $timestamp = "{$row[3]}";
-        $name = "{$row[4]}";
-        $tripcode = "{$row[5]}";
-        $original = "{$row[6]}";
+        $post_id = "{$row[0]}";
+        $text = "{$row[1]}";
+        $global_id = "{$row[2]}";
+        $text_id = "{$row[3]}";
+        $timestamp = "{$row[4]}";
+        $name = "{$row[5]}";
+        $tripcode = "{$row[6]}";
+        $original = "{$row[7]}";
+        $edit_message = "{$row[8]}";
+        $move_message = "{$row[9]}";
     }
 
     $statement = $db->prepare("DELETE FROM threads
-                               WHERE post_id = '$org_id'
-                               AND org_id = '$org_id'
+                               WHERE original = '$org_id'
+                               AND shadow = 'no'
                                AND sub = '$sub'");
     $result = $statement->execute();
 
@@ -131,13 +135,16 @@ function bump_message($db, $org_id, $sub, $settings)
                                                    org_id, shadow, 
                                                    global_id, text_id,
                                                    timestamp, name, tripcode,
-                                                   original)
-                               VALUES ('$org_id', '$sub', ?, '$org_id',  
+                                                   original,
+                                                   edit_message,
+                                                   move_message)
+                               VALUES ('$post_id', '$sub', ?, '$org_id',  
                                        'no', '$global_id', '$text_id', 
                                        '$timestamp', '$name', '$tripcode',
-                                       '$original')");
+                                       '$original', ?, ?)");
     $statement->bindParam(1, $text);
-
+	$statement->bindParam(2, $edit_message);
+	$statement->bindParam(3, $move_message);
     $statement->execute();
 
 }