Merge branch 'main' into glitch-soc/merge-upstream

2021-04-21 13:52:03 +02:00
parent b1d4f21db0 0b36e3419d
commit 536892b8ae
10 changed files with 100 additions and 88 deletions
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -16,6 +16,8 @@ class RemoveStatusService < BaseService
    @account  = status.account
    @options  = options

+    @status.discard
+
    RedisLock.acquire(lock_options) do |lock|
      if lock.acquired?
        remove_from_self if @account.local?