diff options
author | Claire <claire.github-309c@sitedethib.com> | 2022-11-17 13:55:37 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-17 13:55:37 +0100 |
commit | 381137c94e6cf341117adddc673cfac82760c710 (patch) | |
tree | 5cfc5f89aaa1d20f5801da6bf56e4cd14bb59433 /app/models | |
parent | ab7d99e035f5b880ef77440e7c2e76f8e8728992 (diff) | |
parent | c22f3a87a3598210ffa28517e42c2fc619dbcef5 (diff) |
Merge pull request #1951 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/form/account_batch.rb | 4 | ||||
-rw-r--r-- | app/models/user.rb | 5 |
2 files changed, 9 insertions, 0 deletions
diff --git a/app/models/form/account_batch.rb b/app/models/form/account_batch.rb index 5cfcf7205..473622edf 100644 --- a/app/models/form/account_batch.rb +++ b/app/models/form/account_batch.rb @@ -115,6 +115,10 @@ class Form::AccountBatch authorize(account, :suspend?) log_action(:suspend, account) account.suspend!(origin: :local) + account.strikes.create!( + account: current_account, + action: :suspend + ) Admin::SuspensionWorker.perform_async(account.id) end diff --git a/app/models/user.rb b/app/models/user.rb index 0e8a87aea..0eb975dec 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -237,6 +237,11 @@ class User < ApplicationRecord end def functional? + + functional_or_moved? + end + + def functional_or_moved? confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? end |