Refactored community-curated world timeline code; **privacy**: remove support for packmate-visible hashtags until we resolve federation caveats.

1 files changed, 8 insertions, 3 deletions

diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index fd7ade02b..42e137564 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -16,9 +16,7 @@ class FavouriteService < BaseService
 
     favourite = Favourite.create!(account: account, status: status)
 
-    # stream it to the world timeline if public
-    FanOutOnWriteService.new.call(status, true, false) if status.public_visibility?
-
+    curate_status(status)
     create_notification(favourite)
     bump_potential_friendship(account, status)
 
@@ -56,4 +54,11 @@ class FavouriteService < BaseService
   def build_xml(favourite)
     OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.favourite_salmon(favourite))
   end
+
+  def curate_status(status)
+    return if status.curated
+    status.curated = true
+    status.save
+    FanOutOnWriteService.new.call(status)
+  end
 end