Fix remotely-suspended accounts' toots being merged back into timelines (#16628)
* Fix remotely-suspended accounts' toots being merged back into timelines * Mark remotely-deleted accounts as remotely suspended
This commit is contained in:
parent
0cae6c07bb
commit
9ac7e6fef7
2 changed files with 2 additions and 1 deletions
|
@ -8,7 +8,7 @@ class UnsuspendAccountService < BaseService
|
|||
unsuspend!
|
||||
refresh_remote_account!
|
||||
|
||||
return if @account.nil?
|
||||
return if @account.nil? || @account.suspended?
|
||||
|
||||
merge_into_home_timelines!
|
||||
merge_into_list_timelines!
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue