diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-02 18:49:32 +0100 |
---|---|---|
committer | Eugen Rochko <eugen@zeonfederated.com> | 2017-03-02 18:49:32 +0100 |
commit | c64a1c25c4e9a07c694863a38334ed66e368752e (patch) | |
tree | 9d60c6b37a6adb60b20a674630587de4e55d8765 /app/models/status.rb | |
parent | 442fdbfc5309f46c23a073829e5fe16d10c7c6ca (diff) |
Fix #231 - Muting
Diffstat (limited to 'app/models/status.rb')
-rw-r--r-- | app/models/status.rb | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/app/models/status.rb b/app/models/status.rb index b3424f36d..e5e740360 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -103,10 +103,7 @@ class Status < ApplicationRecord class << self def as_home_timeline(account) - muted = Mute.where(account: account).pluck(:target_account_id) - query = where(account: [account] + account.following) - query = query.where('statuses.account_id NOT IN (?)', muted) unless muted.empty? - query + where(account: [account] + account.following) end def as_public_timeline(account = nil, local_only = false) @@ -171,10 +168,8 @@ class Status < ApplicationRecord private def filter_timeline(query, account) - blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) - muted = Mute.where(account: account).pluck(:target_account_id) - query = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty? # Only give us statuses from people we haven't blocked - query = query.where('statuses.account_id NOT IN (?)', muted) unless muted.empty? # and out of those, only people we haven't muted + blocked = Block.where(account: account).pluck(:target_account_id) + Block.where(target_account: account).pluck(:account_id) + Mute.where(account: account).pluck(:target_account_id) + query = query.where('statuses.account_id NOT IN (?)', blocked) unless blocked.empty? # Only give us statuses from people we haven't blocked, or muted, or that have blocked us query = query.where('accounts.silenced = TRUE') if account.silenced? # and if we're hellbanned, only people who are also hellbanned query end |