diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-01-19 14:22:59 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-01-19 14:22:59 +0100 |
commit | b209e919bddb4bb72bb4f8589f4b15654f22ef53 (patch) | |
tree | ccd980d2d701c03f9c16358908f20560f2d5be2c /app/services/remove_status_service.rb | |
parent | f6acc039ec95c6d1c8cc2e2955f2af31d27e928c (diff) | |
parent | c42938aed4677f52207bbb6389c7edc2772a6f7a (diff) |
Merge pull request #1662 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/services/remove_status_service.rb')
-rw-r--r-- | app/services/remove_status_service.rb | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 9259c69d9..2fe3bab5c 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -9,6 +9,7 @@ class RemoveStatusService < BaseService # @param [Hash] options # @option [Boolean] :redraft # @option [Boolean] :immediate + # @option [Boolean] :preserve # @option [Boolean] :original_removed def call(status, **options) @payload = Oj.dump(event: :delete, payload: status.id.to_s) @@ -44,7 +45,7 @@ class RemoveStatusService < BaseService remove_media end - @status.destroy! if @options[:immediate] || !@status.reported? + @status.destroy! if permanently? else raise Mastodon::RaceConditionError end @@ -143,11 +144,15 @@ class RemoveStatusService < BaseService end def remove_media - return if @options[:redraft] || (!@options[:immediate] && @status.reported?) + return if @options[:redraft] || !permanently? @status.media_attachments.destroy_all end + def permanently? + @options[:immediate] || !(@options[:preserve] || @status.reported?) + end + def lock_options { redis: Redis.current, key: "distribute:#{@status.id}", autorelease: 5.minutes.seconds } end |