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 | |
parent | 442fdbfc5309f46c23a073829e5fe16d10c7c6ca (diff) |
Fix #231 - Muting
Diffstat (limited to 'app/models')
-rw-r--r-- | app/models/mute.rb | 21 | ||||
-rw-r--r-- | app/models/status.rb | 11 |
2 files changed, 3 insertions, 29 deletions
diff --git a/app/models/mute.rb b/app/models/mute.rb index 505196453..a5b334c85 100644 --- a/app/models/mute.rb +++ b/app/models/mute.rb @@ -2,31 +2,10 @@ class Mute < ApplicationRecord include Paginable - include Streamable belongs_to :account belongs_to :target_account, class_name: 'Account' validates :account, :target_account, presence: true validates :account_id, uniqueness: { scope: :target_account_id } - - def verb - destroyed? ? :unmute : :mute - end - - def target - target_account - end - - def object_type - :person - end - - def hidden? - true - end - - def title - destroyed? ? "#{account.acct} is no longer muting #{target_account.acct}" : "#{account.acct} muted #{target_account.acct}" - end end 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 |