tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Avoid duplicate work by merging ReplyDistributionWorker into DistributionWorker (#9660)

Browse Source
This commit is contained in:
ThibG
2018-12-30 19:00:04 +01:00
committed by Eugen Rochko
parent b2f4114550
commit 6fb6a53938
3 changed files with 8 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
app/services/post_status_service.rb
View File

@@ -44,7 +44,6 @@ class PostStatusService < BaseService
DistributionWorker.perform_async(status.id)
Pubsubhubbub::DistributionWorker.perform_async(status.stream_entry.id)
ActivityPub::DistributionWorker.perform_async(status.id)
ActivityPub::ReplyDistributionWorker.perform_async(status.id) if status.reply? && status.thread.account.local?
if options[:idempotency].present?
redis.setex("idempotency:status:#{account.id}:#{options[:idempotency]}", 3_600, status.id)

9
app/workers/activitypub/distribution_worker.rb
View File

@@ -31,7 +31,14 @@ class ActivityPub::DistributionWorker
end
def inboxes
@inboxes ||= @account.followers.inboxes
# Deliver the status to all followers.
# If the status is a reply to another local status, also forward it to that
# status' authors' followers.
@inboxes ||= if @status.reply? && @status.thread.account.local? && @status.distributable?
@account.followers.or(@status.thread.account.followers).inboxes
else
@account.followers.inboxes
end
end
def signed_payload

42
app/workers/activitypub/reply_distribution_worker.rb
View File

@@ -1,42 +0,0 @@
# frozen_string_literal: true
class ActivityPub::ReplyDistributionWorker
include Sidekiq::Worker
sidekiq_options queue: 'push'
def perform(status_id)
@status = Status.find(status_id)
@account = @status.thread&.account
return unless @account.present? && @status.distributable?
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
[payload, @status.account_id, inbox_url]
end
rescue ActiveRecord::RecordNotFound
true
end
private
def inboxes
@inboxes ||= @account.followers.inboxes
end
def signed_payload
Oj.dump(ActivityPub::LinkedDataSignature.new(unsigned_payload).sign!(@status.account))
end
def unsigned_payload
ActiveModelSerializers::SerializableResource.new(
@status,
serializer: ActivityPub::ActivitySerializer,
adapter: ActivityPub::Adapter
).as_json
end
def payload
@payload ||= @status.distributable? ? signed_payload : Oj.dump(unsigned_payload)
end
end