Update admin moderation logic, only re-add top level posts

3 years ago · c6ffda9618
parent 79bcaadd49
commit c6ffda9618
2 changed files with 9 additions and 3 deletions
--- 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') {
--- 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') {