about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbeatrix-bitrot <beatrix.bitrot@gmail.com>2017-06-05 22:34:08 +0000
committerbeatrix-bitrot <beatrix.bitrot@gmail.com>2017-06-26 02:19:21 +0000
commit93fc8aa14c914d03643197306c325becbaed2581 (patch)
tree1200351f7cb5ad71a19564838eb96656158a12b5
parentc0a665865e5f06f45296e76bfef3790f8149b0ee (diff)
keyword muting and local only tooting WIP
-rw-r--r--app/lib/feed_manager.rb6
-rw-r--r--app/services/post_status_service.rb5
-rw-r--r--app/services/reblog_service.rb5
3 files changed, 14 insertions, 2 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]
diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 2e6fbb5c3..d86ae04d4 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -36,7 +36,10 @@ class PostStatusService < BaseService
 
     LinkCrawlWorker.perform_async(status.id) unless status.spoiler_text?
     DistributionWorker.perform_async(status.id)
-    Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
+
+    unless /👁$/.match?(status.content)
+      Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
+    end
 
     if options[:idempotency].present?
       redis.setex("idempotency:status:#{account.id}:#{options[:idempotency]}", 3_600, status.id)
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index ba24b1f9d..497cdb4f5 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -20,7 +20,10 @@ class ReblogService < BaseService
     reblog = account.statuses.create!(reblog: reblogged_status, text: '')
 
     DistributionWorker.perform_async(reblog.id)
-    Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
+    unless /👁$/.match?(reblogged_status.content)
+      Pubsubhubbub::DistributionWorker.perform_async(reblog.stream_entry.id)
+    end
+
 
     if reblogged_status.local?
       NotifyService.new.call(reblog.reblog.account, reblog)