diff options
| author | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
|---|---|---|
| committer | Claire <claire.github-309c@sitedethib.com> | 2022-04-06 21:10:23 +0200 |
| commit | b368c7502931aa06121ecad8a97193b1f17cf90a (patch) | |
| tree | 2b598363926388d30a4c5c6197436b46f6d4610a /app/services/remove_status_service.rb | |
| parent | 00c9363f07081e0149533023992fba47dd905384 (diff) | |
| parent | dd4c156f33a24b8bb89b45b2697aa4036c3ae5be (diff) | |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `app/controllers/concerns/sign_in_token_authentication_concern.rb`: Upstream removed this file, while glitch-soc had changes to deal with its theming system. Removed the file like upstream did.
Diffstat (limited to 'app/services/remove_status_service.rb')
| -rw-r--r-- | app/services/remove_status_service.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index c28e16572..dfe9f9ac5 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -17,10 +17,10 @@ class RemoveStatusService < BaseService @account = status.account @options = options - @status.discard - RedisLock.acquire(lock_options) do |lock| if lock.acquired? + @status.discard + remove_from_self if @account.local? remove_from_followers remove_from_lists |