From f6b4eb90405dd81ccb9bc2d2342abf7637e61b3d Mon Sep 17 00:00:00 2001 From: discomrade Date: Sat, 22 Jan 2022 02:00:52 -0100 Subject: [PATCH] Fix multiple issues with anti_bump_flood - bumplocked thread with one reply, delete the reply and no post matches the query - saged posts aren't ignored when finding last bump - 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 93938923..386d1c9e 100755 --- a/inc/functions.php +++ b/inc/functions.php @@ -1601,16 +1601,24 @@ function deletePostPermanent($id, $error_if_doesnt_exist=true, $rebuild_after=tr $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); - $query->bindValue(':thread', $thread_id); - $query->execute() or error(db_error($query)); + // 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) {