diff options
| author | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
|---|---|---|
| committer | Reverite <github@reverite.sh> | 2019-06-26 20:31:07 -0700 |
| commit | 3fa90982efda2109ddf90d81f5ed3449f8282642 (patch) | |
| tree | e5514f4c72c9ffb44059a2afb7fdf24d0348bbd4 /app/models/account.rb | |
| parent | 714940de498e93a8bf40dcda1835217df18741bf (diff) | |
| parent | 9ef25877dfda12cf31ec586294e4d4908f5be4f0 (diff) | |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 520b183e8..3d7b0dda3 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -102,6 +102,7 @@ class Account < ApplicationRecord scope :tagged_with, ->(tag) { joins(:accounts_tags).where(accounts_tags: { tag_id: tag }) } scope :by_recent_status, -> { order(Arel.sql('(case when account_stats.last_status_at is null then 1 else 0 end) asc, account_stats.last_status_at desc')) } scope :popular, -> { order('account_stats.followers_count desc') } + scope :by_domain_and_subdomains, ->(domain) { where(domain: domain).or(where(arel_table[:domain].matches('%.' + domain))) } delegate :email, :unconfirmed_email, @@ -110,6 +111,8 @@ class Account < ApplicationRecord :confirmed?, :approved?, :pending?, + :disabled?, + :role, :admin?, :moderator?, :staff?, |