autonomic-cooperative/hometown
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix admins being able to suspend their instance actor (#14567)

Browse Source 
* Fix admin being able to suspend their own instance account

* Add text about the instance's own actor in admin view

* Change instance actor notice from flash message to template

* Do not list local instance actor in account moderation list
This commit is contained in:
ThibG
2020-12-15 17:23:58 +01:00
committed by GitHub
parent 8485c436d5
commit 8357969559
6 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/account.rb
View File

@ -100,6 +100,7 @@ class Account < ApplicationRecord
scope :sensitized, -> { where.not(sensitized_at: nil) }
scope :without_suspended, -> { where(suspended_at: nil) }
scope :without_silenced, -> { where(silenced_at: nil) }
scope :without_instance_actor, -> { where.not(id: -99) }
scope :recent, -> { reorder(id: :desc) }
scope :bots, -> { where(actor_type: %w(Application Service)) }
scope :groups, -> { where(actor_type: 'Group') }
@ -222,7 +223,7 @@ class Account < ApplicationRecord
end
def suspended?
suspended_at.present?
suspended_at.present? && !instance_actor?
end
def suspended_permanently?