about summary refs log tree commit diff
diff options
context:
space:
mode:
authormultiple creatures <dev@multiple-creature.party>2019-04-15 17:22:26 -0500
committermultiple creatures <dev@multiple-creature.party>2019-05-21 03:16:22 -0500
commit08a32175faea769c031b1ac1e8f69985e99a717c (patch)
tree2fc83deeca25ed4c708eb62e3dec35429176e253
parentcec0a7ff3cb48a517d6863c56f7f932eb75d6dad (diff)
Add scope restrictions on curated world timeline considerations.
-rw-r--r--app/controllers/api/v1/statuses/bookmarks_controller.rb2
-rw-r--r--app/services/favourite_service.rb2
-rw-r--r--app/services/reblog_service.rb2
3 files changed, 3 insertions, 3 deletions
diff --git a/app/controllers/api/v1/statuses/bookmarks_controller.rb b/app/controllers/api/v1/statuses/bookmarks_controller.rb
index 267f9dff7..61afd7085 100644
--- a/app/controllers/api/v1/statuses/bookmarks_controller.rb
+++ b/app/controllers/api/v1/statuses/bookmarks_controller.rb
@@ -40,7 +40,7 @@ class Api::V1::Statuses::BookmarksController < Api::BaseController
   end
 
   def curate_status(status)
-    return if status.curated
+    return if status.curated || status.direct_visibility? || (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/favourite_service.rb b/app/services/favourite_service.rb
index 42e137564..2573bde0c 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
+    return if status.curated || status.direct_visibility? || (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 049e915df..a9b662b0c 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
+    return if status.curated || status.direct_visibility? || (status.reply? && status.in_reply_to_account_id != status.account_id)
     status.curated = true
     status.save
     FanOutOnWriteService.new.call(status)