marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

remove the buggy do-not-@-me impl - we'll replace this with a bangtag later

staging
multiple creatures 2019-05-16 20:48:19 -05:00
parent 8a1ac19777
commit 75d114216e
3 changed files with 0 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/lib/feed_manager.rb
View File

@ -171,7 +171,6 @@ class FeedManager
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
should_filter &&= receiver_id != status.in_reply_to_account_id # and it's not a reply to me
should_filter ||= Status.find(status.in_reply_to_id)&.marked_no_replies? # or the parent has no-replies set
should_filter &&= status.account_id != status.in_reply_to_account_id # and it's not a self-reply
return should_filter
elsif status.reblog? # Filter out a reblog
@ -186,7 +185,6 @@ class FeedManager
def filter_from_mentions?(status, receiver_id)
return true if receiver_id == status.account_id
return true if status.reply? && !status.in_reply_to_id.nil? && Status.find(status.in_reply_to_id)&.marked_no_replies?
return true if phrase_filtered?(status, receiver_id, :notifications)
# This filter is called from NotifyService, but already after the sender of

11
app/lib/status_filter.rb
View File

@ -12,8 +12,6 @@ class StatusFilter
def filtered?
return false if !account.nil? && account.id == status.account_id
return true if blocked_by_policy? || (account_present? && filtered_status?) || silenced_account?
# filter non-op posts replying to something marked no replies
non_self_reply? && reply_to_no_replies?
end
private
@ -88,15 +86,6 @@ class StatusFilter
status.in_reply_to_account.present? && status.in_reply_to_account.blocking?(status.account_id)
end
def non_self_reply?
status.reply? && status.in_reply_to_account_id != status.account_id
end
def reply_to_no_replies?
parent_status = Status.find(status.in_reply_to_id)
parent_status&.marked_no_replies? && !parent_status.mentions.pluck(:account_id).include?(status.account_id)
end
def silenced_account?
!account&.silenced? && status_account_silenced? && !account_following_status_account?
end

4
app/models/status.rb
View File

@ -526,10 +526,6 @@ class Status < ApplicationRecord
LOCAL_ONLY_TOKENS.match?(content)
end
def marked_no_replies?
/(:ms_dont_at_me:|(don't|do not|no) ((at|@|mention) me)|reply|replies)/.match?(spoiler_text)
end
private
def update_status_stat!(attrs)