diff options
author | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
---|---|---|
committer | Thibaut Girka <thib@sitedethib.com> | 2018-06-21 20:49:57 +0200 |
commit | ab5f450700085ce73621b28b813f2edc5f199785 (patch) | |
tree | 766214b52ed217903ae821285391f8e2d4b5f545 /app/models/status.rb | |
parent | 26c20a4ec7868753b284670575f28f201a5cef9f (diff) | |
parent | 7f59206944193591d7aef5cbd73edc7f5303add7 (diff) |
Merge branch 'master' into glitch-soc/merge-upstream
Conflicts: app/models/user.rb Resolved by adding :default_language to user settings fields
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index c0e241ddd..398462302 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -197,8 +197,8 @@ class Status < ApplicationRecord before_validation :set_local class << self - def not_in_filtered_languages(account) - where(language: nil).or where.not(language: account.filtered_languages) + def in_chosen_languages(account) + where(language: nil).or where(language: account.chosen_languages) end def as_home_timeline(account) @@ -344,7 +344,7 @@ class Status < ApplicationRecord def filter_timeline_for_account(query, account, local_only) query = query.not_excluded_by_account(account) query = query.not_domain_blocked_by_account(account) unless local_only - query = query.not_in_filtered_languages(account) if account.filtered_languages.present? + query = query.in_chosen_languages(account) if account.chosen_languages.present? query.merge(account_silencing_filter(account)) end |