zelo72
/
mastodon
mirror of https://github.com/mastodon/mastodon
2
2
Fork 1
Code Issues 9 Releases Wiki Activity

Merge 6ad2033374 into 1959365c2f

This commit is contained in:
Jonathan de Jong 2024-05-10 20:06:53 +00:00 committed by GitHub
parent 1959365c2f 6ad2033374
commit 64becd7c71
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/services/suspend_account_service.rb
View File

@ -20,7 +20,7 @@ class SuspendAccountService < BaseService
private
def reject_remote_follows!
return if @account.local? || !@account.activitypub?
return if @account.local? || !@account.activitypub? || @account.suspension_origin_remote?
# When suspending a remote account, the account obviously doesn't
# actually become suspended on its origin server, i.e. unlike a