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

2022-10-28 11:36:25 +02:00
parent 371563b0e2 8dfe5179ee
commit cb19be67d1
567 changed files with 14361 additions and 20828 deletions
--- a/app/services/remove_status_service.rb
+++ b/app/services/remove_status_service.rb
@@ -21,6 +21,8 @@ class RemoveStatusService < BaseService
    with_lock("distribute:#{@status.id}") do
      @status.discard

+      StatusPin.find_by(status: @status)&.destroy
+
      remove_from_self if @account.local?
      remove_from_followers
      remove_from_lists