From 7403e5d306d36c83bfb80cd900235373186cd51a Mon Sep 17 00:00:00 2001 From: Yamagishi Kazutoshi Date: Mon, 21 May 2018 19:43:38 +0900 Subject: Add media timeline (#6631) --- app/services/batched_remove_status_service.rb | 5 +++++ app/services/fan_out_on_write_service.rb | 8 ++++++++ app/services/remove_status_service.rb | 8 ++++++++ 3 files changed, 21 insertions(+) (limited to 'app/services') diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb index cb65a2256..425a11d01 100644 --- a/app/services/batched_remove_status_service.rb +++ b/app/services/batched_remove_status_service.rb @@ -81,6 +81,11 @@ class BatchedRemoveStatusService < BaseService redis.publish('timeline:public', payload) redis.publish('timeline:public:local', payload) if status.local? + if status.media_attachments.exists? + redis.publish('timeline:public:media', payload) + redis.publish('timeline:public:local:media', payload) if status.local? + end + @tags[status.id].each do |hashtag| redis.publish("timeline:hashtag:#{hashtag}", payload) redis.publish("timeline:hashtag:#{hashtag}:local", payload) if status.local? diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index cb82a79ed..b4b9986f3 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -25,6 +25,7 @@ class FanOutOnWriteService < BaseService return if status.reply? && status.in_reply_to_account_id != status.account_id deliver_to_public(status) + deliver_to_media(status) if status.media_attachments.exists? end private @@ -85,6 +86,13 @@ class FanOutOnWriteService < BaseService Redis.current.publish('timeline:public:local', @payload) if status.local? end + def deliver_to_media(status) + Rails.logger.debug "Delivering status #{status.id} to media timeline" + + Redis.current.publish('timeline:public:media', @payload) + Redis.current.publish('timeline:public:local:media', @payload) if status.local? + end + def deliver_to_direct_timelines(status) Rails.logger.debug "Delivering status #{status.id} to direct timelines" diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index e164c03ab..53f2be6f8 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -20,6 +20,7 @@ class RemoveStatusService < BaseService remove_reblogs remove_from_hashtags remove_from_public + remove_from_media if status.media_attachments.exists? remove_from_direct if status.direct_visibility? @status.destroy! @@ -131,6 +132,13 @@ class RemoveStatusService < BaseService Redis.current.publish('timeline:public:local', @payload) if @status.local? end + def remove_from_media + return unless @status.public_visibility? + + Redis.current.publish('timeline:public:media', @payload) + Redis.current.publish('timeline:public:local:media', @payload) if @status.local? + end + def remove_from_direct @mentions.each do |mention| Redis.current.publish("timeline:direct:#{mention.account.id}", @payload) if mention.account.local? -- cgit From 32d437238191c94534c2010e640c2b5711fa3d0d Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Mon, 21 May 2018 16:01:16 +0200 Subject: Use #any? instead of #exists? when checking media attachments (#7570) If media_attachments are not loaded, SQL query is the same, but the #exists? method performs SQL query even if preloaded --- app/services/batched_remove_status_service.rb | 2 +- app/services/fan_out_on_write_service.rb | 2 +- app/services/remove_status_service.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'app/services') diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb index 425a11d01..ace51a1fc 100644 --- a/app/services/batched_remove_status_service.rb +++ b/app/services/batched_remove_status_service.rb @@ -81,7 +81,7 @@ class BatchedRemoveStatusService < BaseService redis.publish('timeline:public', payload) redis.publish('timeline:public:local', payload) if status.local? - if status.media_attachments.exists? + if status.media_attachments.any? redis.publish('timeline:public:media', payload) redis.publish('timeline:public:local:media', payload) if status.local? end diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index b4b9986f3..8b3630229 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -25,7 +25,7 @@ class FanOutOnWriteService < BaseService return if status.reply? && status.in_reply_to_account_id != status.account_id deliver_to_public(status) - deliver_to_media(status) if status.media_attachments.exists? + deliver_to_media(status) if status.media_attachments.any? end private diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 53f2be6f8..8c3e18444 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -20,7 +20,7 @@ class RemoveStatusService < BaseService remove_reblogs remove_from_hashtags remove_from_public - remove_from_media if status.media_attachments.exists? + remove_from_media if status.media_attachments.any? remove_from_direct if status.direct_visibility? @status.destroy! -- cgit