From ca02e60f4f5dab0e53d3d17a3ee5a760c05d6fdd Mon Sep 17 00:00:00 2001 From: Fire Demon Date: Wed, 21 Oct 2020 20:22:30 -0500 Subject: Limit unpublishing to local posts --- app/services/remove_status_service.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index d7bd2ae39..c0055882d 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -33,7 +33,7 @@ class RemoveStatusService < BaseService remove_from_spam_check unless @options[:unpublish] remove_media unless @options[:unpublish] - @status.destroy! if @options[:immediate] || !(@options[:unpublish] || @status.reported?) + @status.destroy! if @options[:immediate] || !((@options[:unpublish] && @status.local?) || @status.reported?) else raise Mastodon::RaceConditionError end -- cgit