From 75d114216e3f60848493c46a68e6b03fb4f07b3d Mon Sep 17 00:00:00 2001
From: multiple creatures <dev@multiple-creature.party>
Date: Thu, 16 May 2019 20:48:19 -0500
Subject: [PATCH] remove the buggy do-not-@-me impl - we'll replace this with a
 bangtag later

---
 app/lib/feed_manager.rb  |  2 --
 app/lib/status_filter.rb | 11 -----------
 app/models/status.rb     |  4 ----
 3 files changed, 17 deletions(-)

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index bd418366c..73d6d4f65 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -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
diff --git a/app/lib/status_filter.rb b/app/lib/status_filter.rb
index 0c5e9e435..dceacf1c8 100644
--- a/app/lib/status_filter.rb
+++ b/app/lib/status_filter.rb
@@ -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
diff --git a/app/models/status.rb b/app/models/status.rb
index 3c98369b1..0de92e0c6 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -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)