From f97fc9744f7879246ecc04e3f5ec4f358a9d71a2 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 19 Mar 2016 00:41:29 +0100 Subject: [PATCH] Use FanOutOnWriteService AFTER processing mentions --- app/models/status.rb | 1 - app/services/post_status_service.rb | 5 +++++ app/services/process_feed_service.rb | 7 +++++++ app/services/reblog_service.rb | 5 +++++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/app/models/status.rb b/app/models/status.rb index 10f0444e9d4..7c5cd2f8aea 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -78,6 +78,5 @@ class Status < ActiveRecord::Base after_create do self.account.stream_entries.create!(activity: self) - FanOutOnWriteService.new.(self) end end diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index 38863917572..e8335639c3e 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -7,6 +7,7 @@ class PostStatusService < BaseService def call(account, text, in_reply_to = nil) status = account.statuses.create!(text: text, thread: in_reply_to) process_mentions_service.(status) + fan_out_on_write_service.(status) account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url]) status end @@ -16,4 +17,8 @@ class PostStatusService < BaseService def process_mentions_service @process_mentions_service ||= ProcessMentionsService.new end + + def fan_out_on_write_service + @fan_out_on_write_service ||= FanOutOnWriteService.new + end end diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb index 9b342499d3b..7f72ea251d9 100644 --- a/app/services/process_feed_service.rb +++ b/app/services/process_feed_service.rb @@ -52,6 +52,9 @@ class ProcessFeedService < BaseService end end end + + + fan_out_on_write_service.(status) end end end @@ -166,4 +169,8 @@ class ProcessFeedService < BaseService def update_remote_profile_service @update_remote_profile_service ||= UpdateRemoteProfileService.new end + + def fan_out_on_write_service + @fan_out_on_write_service ||= FanOutOnWriteService.new + end end diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index 086f297f4f1..7078e3aff25 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -5,6 +5,7 @@ class ReblogService < BaseService # @return [Status] def call(account, reblogged_status) reblog = account.statuses.create!(reblog: reblogged_status, text: '') + fan_out_on_write_service.(reblog) account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url]) return reblog if reblogged_status.local? send_interaction_service.(reblog.stream_entry, reblogged_status.account) @@ -16,4 +17,8 @@ class ReblogService < BaseService def send_interaction_service @send_interaction_service ||= SendInteractionService.new end + + def fan_out_on_write_service + @fan_out_on_write_service ||= FanOutOnWriteService.new + end end