Merge branch 'master' of https://github.com/glitch-soc/mastodon

1 files changed, 6 insertions, 0 deletions

diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb
index 90a1441f2..1885eff26 100644
--- a/app/lib/feed_manager.rb
+++ b/app/lib/feed_manager.rb
@@ -95,6 +95,12 @@ class FeedManager
   end
 
   def filter_from_home?(status, receiver_id)
+    # extremely violent filtering code BEGIN
+    #filter_string = 'e'
+    #reggie = Regexp.new(filter_string)
+    #return true if reggie === status.content || reggie === status.spoiler_text
+    # extremely violent filtering code END
+
     return true if status.reply? && status.in_reply_to_id.nil?
 
     check_for_mutes = [status.account_id]