diff options
| author | Matt Jankowski <mjankowski@thoughtbot.com> | 2017-04-28 09:10:41 -0400 |
|---|---|---|
| committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-04-28 15:10:41 +0200 |
| commit | effb08edbbaaf61bac4b4fc5c5b9493417b348ec (patch) | |
| tree | d86f7e61354e4f87acd7a8578643265a90de1bb6 /app/models/account.rb | |
| parent | d1b4ebe07d67d8a0aec3a012ca92f2106ebc9377 (diff) | |
More status specs (#2564)
* Add rough outline of coverage needed for public timeline * Specs for visibility, replies, boosts * Specs for silenced account * Specs for local_only option * Specs for blocks and mutes * Add tentative spec around including other silenced account statuses * Add with_public_visibility scope * Add simple coverage for tag_timeline * Tag timeline includes replies * Replace tag.statuses with a tagged_with scope in tag timeline method * Use with_public_visibility in tag timeline * Extract common scope between public and tag timelines to method * Extract local domain check to local_only scope * Extract local_only check to starting scope method * Move list of excluded from timeline account ids to account model * Simplify excluded accounts list on account model * Only join accounts when needed * Rename method for account specific filtering * Extract method for account exclusions * Fix bug where silenced accounts were not including statuses from other silenced accounts * DRY up filter application from account or no account * timeline_scope can be private * Add spec showing that account can find its excluded accounts ids * Add spec which fails if local_only does not have a left outer join * rubocop
Diffstat (limited to 'app/models/account.rb')
| -rw-r--r-- | app/models/account.rb | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index eebcf90b8..b8927c51f 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -46,6 +46,8 @@ class Account < ApplicationRecord # Block relationships has_many :block_relationships, class_name: 'Block', foreign_key: 'account_id', dependent: :destroy has_many :blocking, -> { order('blocks.id desc') }, through: :block_relationships, source: :target_account + has_many :blocked_by_relationships, class_name: 'Block', foreign_key: :target_account_id, dependent: :destroy + has_many :blocked_by, -> { order('blocks.id desc') }, through: :blocked_by_relationships, source: :account # Mute relationships has_many :mute_relationships, class_name: 'Mute', foreign_key: 'account_id', dependent: :destroy @@ -211,6 +213,10 @@ class Account < ApplicationRecord username end + def excluded_from_timeline_account_ids + Rails.cache.fetch("exclude_account_ids_for:#{id}") { blocking.pluck(:target_account_id) + blocked_by.pluck(:account_id) + muting.pluck(:target_account_id) } + end + class << self def find_local!(username) find_remote!(username, nil) |