diff options
Diffstat (limited to 'app/services')
-rw-r--r-- | app/services/backup_service.rb | 5 | ||||
-rw-r--r-- | app/services/batched_remove_status_service.rb | 7 | ||||
-rw-r--r-- | app/services/fan_out_on_write_service.rb | 12 | ||||
-rw-r--r-- | app/services/post_status_service.rb | 14 | ||||
-rw-r--r-- | app/services/precompute_feed_service.rb | 1 | ||||
-rw-r--r-- | app/services/reblog_service.rb | 2 | ||||
-rw-r--r-- | app/services/remove_status_service.rb | 8 | ||||
-rw-r--r-- | app/services/update_status_service.rb | 4 |
8 files changed, 45 insertions, 8 deletions
diff --git a/app/services/backup_service.rb b/app/services/backup_service.rb index 037f519d3..f07f407d8 100644 --- a/app/services/backup_service.rb +++ b/app/services/backup_service.rb @@ -22,7 +22,7 @@ class BackupService < BaseService account.statuses.with_includes.reorder(nil).find_in_batches do |statuses| statuses.each do |status| - item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status), ActivityPub::ActivitySerializer, signer: @account) + item = serialize_payload(ActivityPub::ActivityPresenter.from_status(status), ActivityPub::ActivitySerializer, signer: @account, allow_local_only: true) item.delete(:'@context') unless item[:type] == 'Announce' || item[:object][:attachment].blank? @@ -153,7 +153,8 @@ class BackupService < BaseService ActiveModelSerializers::SerializableResource.new( object, serializer: serializer, - adapter: ActivityPub::Adapter + adapter: ActivityPub::Adapter, + allow_local_only: true, ).as_json end diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb index 5000062e4..2b649ee22 100644 --- a/app/services/batched_remove_status_service.rb +++ b/app/services/batched_remove_status_service.rb @@ -21,6 +21,7 @@ class BatchedRemoveStatusService < BaseService statuses_with_account_conversations.each do |status| status.send(:unlink_from_conversations) + unpush_from_direct_timelines(status) end # We do not batch all deletes into one to avoid having a long-running @@ -90,4 +91,10 @@ class BatchedRemoveStatusService < BaseService redis.publish("timeline:hashtag:#{hashtag}:local", payload) if status.local? end end + + def unpush_from_direct_timelines(status) + status.mentions.each do |mention| + FeedManager.instance.unpush_from_direct(mention.account, status) if mention.account.local? + end + end end diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb index 76404c6b8..f182cb83e 100644 --- a/app/services/fan_out_on_write_service.rb +++ b/app/services/fan_out_on_write_service.rb @@ -45,6 +45,7 @@ class FanOutOnWriteService < BaseService else deliver_to_mentioned_followers! deliver_to_conversation! + deliver_to_direct_timelines! end end @@ -55,6 +56,7 @@ class FanOutOnWriteService < BaseService def deliver_to_self! FeedManager.instance.push_to_home(@account, @status, update: update?) if @account.local? + FeedManager.instance.push_to_direct(@account, @status, update: update?) if @account.local? && @status.direct_visibility? end def notify_mentioned_accounts! @@ -97,6 +99,12 @@ class FanOutOnWriteService < BaseService end end + def deliver_to_direct_timelines! + FeedInsertWorker.push_bulk(@status.mentions.includes(:account).map(&:account).select { |mentioned_account| mentioned_account.local? }) do |account| + [@status.id, account.id, 'direct', { 'update' => update? }] + end + end + def broadcast_to_hashtag_streams! @status.tags.pluck(:name).each do |hashtag| Redis.current.publish("timeline:hashtag:#{hashtag.mb_chars.downcase}", anonymous_payload) @@ -105,7 +113,7 @@ class FanOutOnWriteService < BaseService end def broadcast_to_public_streams! - return if @status.reply? && @status.in_reply_to_account_id != @account.id + return if @status.reply? && @status.in_reply_to_account_id != @account.id && !Setting.show_replies_in_public_timelines Redis.current.publish('timeline:public', anonymous_payload) Redis.current.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload) @@ -132,6 +140,6 @@ class FanOutOnWriteService < BaseService end def broadcastable? - @status.public_visibility? && !@status.reblog? && !@account.silenced? + @status.public_visibility? && !@account.silenced? && (!@status.reblog? || Setting.show_reblogs_in_public_timelines) end end diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb index c132930a9..36592a531 100644 --- a/app/services/post_status_service.rb +++ b/app/services/post_status_service.rb @@ -49,8 +49,17 @@ class PostStatusService < BaseService private def preprocess_attributes! + if @text.blank? && @options[:spoiler_text].present? + @text = '.' + if @media&.find(&:video?) || @media&.find(&:gifv?) + @text = '📹' + elsif @media&.find(&:audio?) + @text = '🎵' + elsif @media&.find(&:image?) + @text = '🖼' + end + end @sensitive = (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present? - @text = @options.delete(:spoiler_text) if @text.blank? && @options[:spoiler_text].present? @visibility = @options[:visibility] || @account.user&.setting_default_privacy @visibility = :unlisted if @visibility&.to_sym == :public && @account.silenced? @scheduled_at = @options[:scheduled_at]&.to_datetime @@ -95,7 +104,7 @@ class PostStatusService < BaseService Trends.tags.register(@status) LinkCrawlWorker.perform_async(@status.id) DistributionWorker.perform_async(@status.id) - ActivityPub::DistributionWorker.perform_async(@status.id) + ActivityPub::DistributionWorker.perform_async(@status.id) unless @status.local_only? PollExpirationNotifyWorker.perform_at(@status.poll.expires_at, @status.poll.id) if @status.poll end @@ -168,6 +177,7 @@ class PostStatusService < BaseService visibility: @visibility, language: valid_locale_cascade(@options[:language], @account.user&.preferred_posting_language, I18n.default_locale), application: @options[:application], + content_type: @options[:content_type] || @account.user&.setting_default_content_type, rate_limit: @options[:with_rate_limit], }.compact end diff --git a/app/services/precompute_feed_service.rb b/app/services/precompute_feed_service.rb index 61f573534..b4fa70710 100644 --- a/app/services/precompute_feed_service.rb +++ b/app/services/precompute_feed_service.rb @@ -3,6 +3,7 @@ class PrecomputeFeedService < BaseService def call(account) FeedManager.instance.populate_home(account) + FeedManager.instance.populate_direct_feed(account) ensure Redis.current.del("account:#{account.id}:regeneration") end diff --git a/app/services/reblog_service.rb b/app/services/reblog_service.rb index 7d2981709..97f9f8e92 100644 --- a/app/services/reblog_service.rb +++ b/app/services/reblog_service.rb @@ -32,7 +32,7 @@ class ReblogService < BaseService Trends.register!(reblog) DistributionWorker.perform_async(reblog.id) - ActivityPub::DistributionWorker.perform_async(reblog.id) + ActivityPub::DistributionWorker.perform_async(reblog.id) unless reblogged_status.local_only? create_notification(reblog) bump_potential_friendship(account, reblog) diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb index 159aec1f2..c28e16572 100644 --- a/app/services/remove_status_service.rb +++ b/app/services/remove_status_service.rb @@ -41,6 +41,7 @@ class RemoveStatusService < BaseService remove_from_hashtags remove_from_public remove_from_media if @status.with_media? + remove_from_direct if status.direct_visibility? remove_media end @@ -55,6 +56,7 @@ class RemoveStatusService < BaseService def remove_from_self FeedManager.instance.unpush_from_home(@account, @status) + FeedManager.instance.unpush_from_direct(@account, @status) if @status.direct_visibility? end def remove_from_followers @@ -135,6 +137,12 @@ class RemoveStatusService < BaseService redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', @payload) end + def remove_from_direct + @status.active_mentions.each do |mention| + FeedManager.instance.unpush_from_direct(mention.account, @status) if mention.account.local? + end + end + def remove_media return if @options[:redraft] || !permanently? diff --git a/app/services/update_status_service.rb b/app/services/update_status_service.rb index 055e5968d..f5155a2f5 100644 --- a/app/services/update_status_service.rb +++ b/app/services/update_status_service.rb @@ -13,6 +13,7 @@ class UpdateStatusService < BaseService # @option options [String] :spoiler_text # @option options [Boolean] :sensitive # @option options [String] :language + # @option options [String] :content_type def call(status, account_id, options = {}) @status = status @options = options @@ -90,6 +91,7 @@ class UpdateStatusService < BaseService @status.spoiler_text = @options[:spoiler_text] || '' if @options.key?(:spoiler_text) @status.sensitive = @options[:sensitive] || @options[:spoiler_text].present? if @options.key?(:sensitive) || @options.key?(:spoiler_text) @status.language = valid_locale_cascade(@options[:language], @status.language, @status.account.user&.preferred_posting_language, I18n.default_locale) + @status.content_type = @options[:content_type] || @status.content_type @status.edited_at = Time.now.utc @status.save! @@ -109,7 +111,7 @@ class UpdateStatusService < BaseService def broadcast_updates! DistributionWorker.perform_async(@status.id, { 'update' => true }) - ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id) + ActivityPub::StatusUpdateDistributionWorker.perform_async(@status.id) unless @status.local_only? end def queue_poll_notifications! |