logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: f8ee136c29aa7185fe05450090229d428986e529
parent: f1ab70649b00e717a00ac295d42ff99160aa713b
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Fri, 19 May 2017 21:19:41 +0200

Fix federated timeline excluding local toots when any domain blocks are set (#3151)


Diffstat:

Mapp/models/status.rb2+-
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/status.rb b/app/models/status.rb @@ -68,7 +68,7 @@ class Status < ApplicationRecord scope :excluding_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: false }) } scope :including_silenced_accounts, -> { left_outer_joins(:account).where(accounts: { silenced: true }) } scope :not_excluded_by_account, ->(account) { where.not(account_id: account.excluded_from_timeline_account_ids) } - scope :not_domain_blocked_by_account, ->(account) { left_outer_joins(:account).where.not(accounts: { domain: account.excluded_from_timeline_domains }) } + scope :not_domain_blocked_by_account, ->(account) { left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) } cache_associated :account, :application, :media_attachments, :tags, :stream_entry, mentions: :account, reblog: [:account, :application, :stream_entry, :tags, :media_attachments, mentions: :account], thread: :account