diff options
| author | ThibG <thib@sitedethib.com> | 2020-09-29 10:29:42 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-09-29 10:29:42 +0200 |
| commit | 62e3f588dee75fc6a37457f8218630daad056cba (patch) | |
| tree | 69439eebc4da7137206ee82e6ec3fa21cf8c7ed0 /app/policies | |
| parent | 787d5d728923393f12421a480b3c7aee789a11fe (diff) | |
| parent | ccfc2b6dce4bfda283bb6bc968a23fe4a76951d7 (diff) | |
Merge pull request #1430 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/policies')
| -rw-r--r-- | app/policies/account_policy.rb | 4 | ||||
| -rw-r--r-- | app/policies/status_policy.rb | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/app/policies/account_policy.rb b/app/policies/account_policy.rb index 9c145979d..1b105e92a 100644 --- a/app/policies/account_policy.rb +++ b/app/policies/account_policy.rb @@ -17,6 +17,10 @@ class AccountPolicy < ApplicationPolicy staff? && !record.user&.staff? end + def destroy? + record.suspended? && record.deletion_request.present? && admin? + end + def unsuspend? staff? end diff --git a/app/policies/status_policy.rb b/app/policies/status_policy.rb index fa5c0dd9c..d0359580d 100644 --- a/app/policies/status_policy.rb +++ b/app/policies/status_policy.rb @@ -12,6 +12,7 @@ class StatusPolicy < ApplicationPolicy end def show? + return false if author.suspended? return false if local_only? && (current_account.nil? || !current_account.local?) if requires_mention? |