about summary refs log tree commit diff
path: root/app/policies/account_policy.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2020-12-15 17:23:58 +0100
committerGitHub <noreply@github.com>2020-12-15 17:23:58 +0100
commit83579695593c941ab39ab545c10a7f711bf715fc (patch)
treec2ff160746dbc34222b73d40b19d689c5bfa0e62 /app/policies/account_policy.rb
parent8485c436d5d083c28df8c942fe521bfb46edfc9f (diff)
Fix admins being able to suspend their instance actor (#14567)
* 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
Diffstat (limited to 'app/policies/account_policy.rb')
-rw-r--r--app/policies/account_policy.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb
index 262ada42e..672e1786b 100644
--- a/app/policies/account_policy.rb
+++ b/app/policies/account_policy.rb
@@ -14,7 +14,7 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def suspend?
-    staff? && !record.user&.staff?
+    staff? && !record.user&.staff? && !record.instance_actor?
   end
 
   def destroy?
@@ -62,6 +62,6 @@ class AccountPolicy < ApplicationPolicy
   end
 
   def memorialize?
-    admin? && !record.user&.admin?
+    admin? && !record.user&.admin? && !record.instance_actor?
   end
 end