diff options
| author | Starfall <us@starfall.systems> | 2020-10-08 20:34:20 -0500 |
|---|---|---|
| committer | Starfall <us@starfall.systems> | 2020-10-08 20:34:20 -0500 |
| commit | 220958fc9fff236e61560f20079be28dea7e23fc (patch) | |
| tree | 6a0f4588fc367462e82d5304b1eab9cf5c890445 /app/models/user.rb | |
| parent | 4966c6cc24107c728fe8e0de7ffc4d0a8cc5510d (diff) | |
| parent | cd861c051ce5500df49d2fc41b2a6084faa34620 (diff) | |
Merge branch 'glitch' into main
Diffstat (limited to 'app/models/user.rb')
| -rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index 4467362e1..6cd2ca6bd 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -169,7 +169,7 @@ class User < ApplicationRecord end def active_for_authentication? - true + !account.memorial? end def suspicious_sign_in?(ip) @@ -177,7 +177,7 @@ class User < ApplicationRecord end def functional? - confirmed? && approved? && !disabled? && !account.suspended? + confirmed? && approved? && !disabled? && !account.suspended? && !account.memorial? end def unconfirmed_or_pending? |