Remove most behaviour disparities between blocks and mutes (#7231)
* Remove most behaviour disparities between blocks and mutes The only differences between block and mute should be: - Mutes can optionally NOT affect notifications - Mutes should not be visible to the muted Fix #7230 Fix #5713 * Do not allow boosting someone you blocked Fix #7248 * Do not allow favouriting someone you blocked * Fix nil error in StatusPolicypull/456/head
parent
c5dcd7d836
commit
f62539ce5c
|
@ -145,19 +145,20 @@ class FeedManager
|
|||
redis.exists("subscribed:#{timeline_id}")
|
||||
end
|
||||
|
||||
def blocks_or_mutes?(receiver_id, account_ids, context)
|
||||
Block.where(account_id: receiver_id, target_account_id: account_ids).any? ||
|
||||
(context == :home ? Mute.where(account_id: receiver_id, target_account_id: account_ids).any? : Mute.where(account_id: receiver_id, target_account_id: account_ids, hide_notifications: true).any?)
|
||||
end
|
||||
|
||||
def filter_from_home?(status, receiver_id)
|
||||
return false if receiver_id == status.account_id
|
||||
return true if status.reply? && (status.in_reply_to_id.nil? || status.in_reply_to_account_id.nil?)
|
||||
|
||||
check_for_mutes = [status.account_id]
|
||||
check_for_mutes.concat([status.reblog.account_id]) if status.reblog?
|
||||
|
||||
return true if Mute.where(account_id: receiver_id, target_account_id: check_for_mutes).any?
|
||||
|
||||
check_for_blocks = status.mentions.pluck(:account_id)
|
||||
check_for_blocks.concat([status.account_id])
|
||||
check_for_blocks.concat([status.reblog.account_id]) if status.reblog?
|
||||
|
||||
return true if Block.where(account_id: receiver_id, target_account_id: check_for_blocks).any?
|
||||
return true if blocks_or_mutes?(receiver_id, check_for_blocks, :home)
|
||||
|
||||
if status.reply? && !status.in_reply_to_account_id.nil? # Filter out if it's a reply
|
||||
should_filter = !Follow.where(account_id: receiver_id, target_account_id: status.in_reply_to_account_id).exists? # and I'm not following the person it's a reply to
|
||||
|
@ -177,11 +178,13 @@ class FeedManager
|
|||
def filter_from_mentions?(status, receiver_id)
|
||||
return true if receiver_id == status.account_id
|
||||
|
||||
check_for_blocks = [status.account_id]
|
||||
check_for_blocks.concat(status.mentions.pluck(:account_id))
|
||||
# This filter is called from NotifyService, but already after the sender of
|
||||
# the notification has been checked for mute/block. Therefore, it's not
|
||||
# necessary to check the author of the toot for mute/block again
|
||||
check_for_blocks = status.mentions.pluck(:account_id)
|
||||
check_for_blocks.concat([status.in_reply_to_account]) if status.reply? && !status.in_reply_to_account_id.nil?
|
||||
|
||||
should_filter = Block.where(account_id: receiver_id, target_account_id: check_for_blocks).any? # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked
|
||||
should_filter = blocks_or_mutes?(receiver_id, check_for_blocks, :mentions) # Filter if it's from someone I blocked, in reply to someone I blocked, or mentioning someone I blocked (or muted)
|
||||
should_filter ||= (status.account.silenced? && !Follow.where(account_id: receiver_id, target_account_id: status.account_id).exists?) # of if the account is silenced and I'm not following them
|
||||
|
||||
should_filter
|
||||
|
|
|
@ -16,7 +16,11 @@ class StatusPolicy < ApplicationPolicy
|
|||
end
|
||||
|
||||
def reblog?
|
||||
!direct? && (!private? || owned?) && show?
|
||||
!direct? && (!private? || owned?) && show? && !current_account&.blocking?(author)
|
||||
end
|
||||
|
||||
def favourite?
|
||||
show? && !current_account&.blocking?(author)
|
||||
end
|
||||
|
||||
def destroy?
|
||||
|
|
|
@ -8,7 +8,7 @@ class FavouriteService < BaseService
|
|||
# @param [Status] status
|
||||
# @return [Favourite]
|
||||
def call(account, status)
|
||||
authorize_with account, status, :show?
|
||||
authorize_with account, status, :favourite?
|
||||
|
||||
favourite = Favourite.find_by(account: account, status: status)
|
||||
|
||||
|
|
Loading…
Reference in New Issue