about summary refs log tree commit diff
path: root/app/services
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-04-17 13:43:29 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:22 -0500
commit036f422877693ae30079c322bbd3ebf9155a8409 (patch)
treea632a55f6bd7c9bb2b196116efb86c3a42d84f44 /app/services
parent500b485b771a789e3e25f58cf33728bff3881f7a (diff)
Make sure only distributable statuses are marked curated; move bangtags processing into own helper lib.
Diffstat (limited to 'app/services')
-rw-r--r--app/services/favourite_service.rb2
-rw-r--r--app/services/reblog_service.rb2
2 files changed, 2 insertions, 2 deletions
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index 2573bde0c..98275b37e 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -56,7 +56,7 @@ class FavouriteService < BaseService
   end
 
   def curate_status(status)
-    return if status.curated || status.direct_visibility? || (status.reply? && status.in_reply_to_account_id != status.account_id)
+    return if status.curated || !status.distributable? || (status.reply? && status.in_reply_to_account_id != status.account_id)
     status.curated = true
     status.save
     FanOutOnWriteService.new.call(status)
diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb
index a9b662b0c..1a39c6c95 100644
--- a/app/services/reblog_service.rb
+++ b/app/services/reblog_service.rb
@@ -65,7 +65,7 @@ class ReblogService < BaseService
   end
 
   def curate_status(status)
-    return if status.curated || status.direct_visibility? || (status.reply? && status.in_reply_to_account_id != status.account_id)
+    return if status.curated || !status.distributable? || (status.reply? && status.in_reply_to_account_id != status.account_id)
     status.curated = true
     status.save
     FanOutOnWriteService.new.call(status)