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') {