diff options
| author | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
|---|---|---|
| committer | reverite <samantha@chalker.io> | 2019-03-15 05:54:30 -0700 |
| commit | 75eeb003b09c53d3b4e98046d1c20b0ad8a887bb (patch) | |
| tree | d2ae669ee583c613a474f8698b7ea718da803819 /app/models/account.rb | |
| parent | 41d1369391d70a9cd25bdf96cfe567975793ef5a (diff) | |
| parent | c2fa0f7c40bcc4064e8baaa221665eadd391c001 (diff) | |
Merge remote-tracking branch 'glitch/master' into production
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 79eecc306..6b539f004 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -108,6 +108,8 @@ class Account < ApplicationRecord :current_sign_in_ip, :current_sign_in_at, :confirmed?, + :approved?, + :pending?, :admin?, :moderator?, :staff?, @@ -474,6 +476,7 @@ class Account < ApplicationRecord before_create :generate_keys before_validation :prepare_contents, if: :local? + before_validation :prepare_username, on: :create before_destroy :clean_feed_manager private @@ -483,6 +486,10 @@ class Account < ApplicationRecord note&.strip! end + def prepare_username + username&.squish! + end + def generate_keys return unless local? && !Rails.env.test? |