diff options
author | Reverite <github@reverite.sh> | 2019-04-01 13:28:33 -0700 |
---|---|---|
committer | Reverite <github@reverite.sh> | 2019-04-01 13:28:33 -0700 |
commit | ff736905fa534f7189e57c1d0c14fbac45f239a1 (patch) | |
tree | 4502f6d993ba60bd4ab68f41a53a642901d244fd /app/models/account.rb | |
parent | 4d77314005483e53e320a82c87805c6bcca1c463 (diff) | |
parent | 3f5acc1ab3bc9c5a6c5805901a393ccd3457b909 (diff) |
Merge branch 'glitch' into production
Diffstat (limited to 'app/models/account.rb')
-rw-r--r-- | app/models/account.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index a82251d2e..983d38e0e 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 :without_blocking, ->(account) { account.nil? ? all : where.not(id: Block.where(target_account_id: account.id).pluck(:account_id)) } delegate :email, :unconfirmed_email, |