Otherkin.Club
/
mastodon
1
0
Fork 0
Code Issues Releases Activity

Only apply a user's string filters if they actually have any set (otherwise all posts will be filtered).

master
multiple creatures 2019-11-18 01:44:33 -06:00
parent 54afd828c2
commit 0d90c0f61a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/status.rb
View File

@ -119,7 +119,7 @@ class Status < ApplicationRecord
scope :mention_not_excluded_by_account, ->(account) { left_outer_joins(:mentions).where('mentions.account_id IS NULL OR mentions.account_id NOT IN (?)', account.excluded_from_timeline_account_ids) }
scope :not_domain_blocked_by_account, ->(account) { account.excluded_from_timeline_domains.blank? ? left_outer_joins(:account) : left_outer_joins(:account).where('accounts.domain IS NULL OR accounts.domain NOT IN (?)', account.excluded_from_timeline_domains) }
scope :not_string_filtered_by_account, ->(account) { where("statuses.normalized_text !~ ANY(ARRAY(#{account.custom_filters.select('unaccent(lower(phrase))').to_sql}))") }
scope :not_string_filtered_by_account, ->(account) { where("statuses.normalized_text !~ ANY(ARRAY(SELECT unaccent(lower(phrase)) FROM custom_filters WHERE account_id = ?))", account.id) }
scope :not_missing_media_desc, -> { left_outer_joins(:media_attachments).where('media_attachments.id IS NULL OR media_attachments.description IS NOT NULL') }
scope :tagged_with_all, ->(tags) {
@ -553,7 +553,7 @@ class Status < ApplicationRecord
query = query.in_chosen_languages(account) if account.chosen_languages.present?
query = query.reply_not_excluded_by_account(account) unless tag_timeline
query = query.mention_not_excluded_by_account(account)
query = query.not_string_filtered_by_account(account)
query = query.not_string_filtered_by_account(account) if account.custom_filters.present?
query = query.not_missing_media_desc if account.filter_undescribed?
query.merge(account_silencing_filter(account))
end