Fix inability to locally suspend remotely-suspended accounts in moderation interface (#31899)
This commit is contained in:
@@ -259,6 +259,10 @@ class Account < ApplicationRecord
|
||||
suspended_at.present? && !instance_actor?
|
||||
end
|
||||
|
||||
def suspended_locally?
|
||||
suspended? && suspension_origin_local?
|
||||
end
|
||||
|
||||
def suspended_permanently?
|
||||
suspended? && deletion_request.nil?
|
||||
end
|
||||
|
||||
@@ -74,7 +74,7 @@ class Admin::AccountAction
|
||||
end
|
||||
|
||||
def disabled_types_for_account(account)
|
||||
if account.suspended?
|
||||
if account.suspended_locally?
|
||||
%w(silence suspend)
|
||||
elsif account.silenced?
|
||||
%w(silence)
|
||||
|
||||
Reference in New Issue
Block a user