From 77bab66293b32ec23ffeaf7cf02bce56ffaefcfb Mon Sep 17 00:00:00 2001
From: discomrade <83621080+discomrade@users.noreply.github.com>
Date: Sat, 22 Jan 2022 03:31:52 +0000
Subject: [PATCH] Fix multiple issues in anti bump flood

- saged posts aren't ignored when finding last bump
- bumplocked thread with one reply, delete the reply and no post matches the query
- bumplocked threads should be ignored
---
 inc/functions.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/inc/functions.php b/inc/functions.php
index e2e71036..4ecf249d 100755
--- a/inc/functions.php
+++ b/inc/functions.php
@@ -1270,19 +1270,27 @@ function deletePost($id, $error_if_doesnt_exist=true, $rebuild_after=true) {
 	$query = prepare("DELETE FROM ``cites`` WHERE (`target_board` = :board AND (`target` = " . implode(' OR `target` = ', $ids) . ")) OR (`board` = :board AND (`post` = " . implode(' OR `post` = ', $ids) . "))");
 	$query->bindValue(':board', $board['uri']);
 	$query->execute() or error(db_error($query));
-	
-	if ($config['anti_bump_flood']) {
-                $query = prepare(sprintf("SELECT `time` FROM ``posts_%s`` WHERE (`thread` = :thread OR `id` = :thread) AND `sage` = 0 ORDER BY `time` DESC LIMIT 1", $board['uri']));
-                $query->bindValue(':thread', $thread_id);
-                $query->execute() or error(db_error($query));
-                $bump = $query->fetchColumn();
 
-                $query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :bump WHERE `id` = :thread", $board['uri']));
-                $query->bindValue(':bump', $bump);
+        // No need to run on OPs
+        if ($config['anti_bump_flood'] && isset($thread_id)) {
+                $query = prepare(sprintf("SELECT `sage` FROM ``posts_%s`` WHERE `id` = :thread", $board['uri']));
                 $query->bindValue(':thread', $thread_id);
                 $query->execute() or error(db_error($query));
-	}
-	
+                $bumplocked = (bool)$query->fetchColumn();
+
+                if (!$bumplocked) {
+                        $query = prepare(sprintf("SELECT `time` FROM ``posts_%s`` WHERE (`thread` = :thread AND NOT email <=> 'sage') OR `id` = :thread ORDER BY `time` DESC LIMIT 1", $board['uri']));
+                        $query->bindValue(':thread', $thread_id);
+                        $query->execute() or error(db_error($query));
+                        $bump = $query->fetchColumn();
+
+                        $query = prepare(sprintf("UPDATE ``posts_%s`` SET `bump` = :bump WHERE `id` = :thread", $board['uri']));
+                        $query->bindValue(':bump', $bump);
+                        $query->bindValue(':thread', $thread_id);
+                        $query->execute() or error(db_error($query));
+                }
+        }
+
 	if (isset($rebuild) && $rebuild_after) {
 		buildThread($rebuild);
 		buildIndex();