From c6ffda9618587b6d48d40b758687ec54e0063623 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 21 May 2023 01:53:25 -0600 Subject: [PATCH 1/2] Update admin moderation logic, only re-add top level posts --- app/Http/Controllers/Admin/AdminReportController.php | 4 +++- app/Http/Controllers/Api/ApiV1Dot1Controller.php | 8 ++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/Admin/AdminReportController.php b/app/Http/Controllers/Admin/AdminReportController.php index 9afe5bceb..d045edd55 100644 --- a/app/Http/Controllers/Admin/AdminReportController.php +++ b/app/Http/Controllers/Admin/AdminReportController.php @@ -1138,7 +1138,9 @@ trait AdminReportController StatusService::del($status->id); StatusService::get($status->id); - PublicTimelineService::add($status->id); + if($status->in_reply_to_id == null && $status->reblog_of_id == null) { + PublicTimelineService::add($status->id); + } } if($action == 'mark-all-read') { diff --git a/app/Http/Controllers/Api/ApiV1Dot1Controller.php b/app/Http/Controllers/Api/ApiV1Dot1Controller.php index 16aa3757e..4c41a8a77 100644 --- a/app/Http/Controllers/Api/ApiV1Dot1Controller.php +++ b/app/Http/Controllers/Api/ApiV1Dot1Controller.php @@ -800,9 +800,13 @@ class ApiV1Dot1Controller extends Controller StatusService::del($status->id, true); if($state !== 'public') { if($status->uri) { - NetworkTimelineService::add($status->id); + if($status->in_reply_to_id == null && $status->reblog_of_id == null) { + NetworkTimelineService::add($status->id); + } } else { - PublicTimelineService::add($status->id); + if($status->in_reply_to_id == null && $status->reblog_of_id == null) { + PublicTimelineService::add($status->id); + } } } } else if ($action == 'mark-unlisted') { From 12ea6f1950003dc5418f506ca85ecd222daa811b Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 21 May 2023 01:53:45 -0600 Subject: [PATCH 2/2] Update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e54a800aa..27ae130bb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -45,6 +45,7 @@ - Update ProfileController, require login to view spam accounts, and disable profile embeds and atom feeds for spam accounts ([dd2f5bb9](https://github.com/pixelfed/pixelfed/commit/dd2f5bb9)) - Update Settings, allow users to disable atom feeds ([3662d3de](https://github.com/pixelfed/pixelfed/commit/3662d3de)) - Update ApiV1Controller, filter muted/blocked accounts from tag timeline ([f42c1140](https://github.com/pixelfed/pixelfed/commit/f42c1140)) +- Update admin moderation logic, only re-add top level posts ([c6ffda96](https://github.com/pixelfed/pixelfed/commit/c6ffda96)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.6 (2023-05-03)](https://github.com/pixelfed/pixelfed/compare/v0.11.5...v0.11.6)