Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Add support for editing for published statuses (#16697)

Browse source 
* Add support for editing for published statuses

* Fix references to stripped-out code

* Various fixes and improvements

* Further fixes and improvements

* Fix updates being potentially sent to unauthorized recipients

* Various fixes and improvements

* Fix wrong words in test

* Fix notifying accounts that were tagged but were not in the audience

* Fix mistake
This commit is contained in:
Eugen Rochko 2022-01-19 22:37:27 +01:00 • committed by GitHub
parent 2d1f082bb6
commit 1060666c58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
56 changed files with 1415 additions and 574 deletions
Download patch file Download diff file Expand all files Collapse all files

48
app/workers/activitypub/distribution_worker.rb
View file

@ -1,54 +1,32 @@
# frozen_string_literal: true
class ActivityPub::DistributionWorker
include Sidekiq::Worker
include Payloadable
sidekiq_options queue: 'push'
class ActivityPub::DistributionWorker < ActivityPub::RawDistributionWorker
# Distribute a new status or an edit of a status to all the places
# where the status is supposed to go or where it was interacted with
def perform(status_id)
@status = Status.find(status_id)
@account = @status.account
return if skip_distribution?
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
[payload, @account.id, inbox_url, { synchronize_followers: !@status.distributable? }]
end
relay! if relayable?
distribute!
rescue ActiveRecord::RecordNotFound
true
end
private
def skip_distribution?
@status.direct_visibility? || @status.limited_visibility?
end
def relayable?
@status.public_visibility?
end
protected
def 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.in_reply_to_local_account? && @status.distributable?
@account.followers.or(@status.thread.account.followers).inboxes
else
@account.followers.inboxes
end
@inboxes ||= StatusReachFinder.new(@status).inboxes
end
def payload
@payload ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @account))
@payload ||= Oj.dump(serialize_payload(activity, ActivityPub::ActivitySerializer, signer: @account))
end
def relay!
ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
[payload, @account.id, inbox_url]
end
def activity
ActivityPub::ActivityPresenter.from_status(@status)
end
def options
{ synchronize_followers: @status.private_visibility? }
end
end

37
app/workers/activitypub/raw_distribution_worker.rb
View file

@ -2,22 +2,47 @@
class ActivityPub::RawDistributionWorker
include Sidekiq::Worker
include Payloadable
sidekiq_options queue: 'push'
# Base worker for when you want to queue up a bunch of deliveries of
# some payload. In this case, we have already generated JSON and
# we are going to distribute it to the account's followers minus
# the explicitly provided inboxes
def perform(json, source_account_id, exclude_inboxes = [])
@account = Account.find(source_account_id)
@account = Account.find(source_account_id)
@json = json
@exclude_inboxes = exclude_inboxes
ActivityPub::DeliveryWorker.push_bulk(inboxes - exclude_inboxes) do |inbox_url|
[json, @account.id, inbox_url]
end
distribute!
rescue ActiveRecord::RecordNotFound
true
end
private
protected
def distribute!
return if inboxes.empty?
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
[payload, source_account_id, inbox_url, options]
end
end
def payload
@json
end
def source_account_id
@account.id
end
def inboxes
@inboxes ||= @account.followers.inboxes
@inboxes ||= @account.followers.inboxes - @exclude_inboxes
end
def options
nil
end
end

34
app/workers/activitypub/reply_distribution_worker.rb
View file

@ -1,34 +0,0 @@
# frozen_string_literal: true
# Obsolete but kept around to make sure existing jobs do not fail after upgrade.
# Should be removed in a subsequent release.
class ActivityPub::ReplyDistributionWorker
include Sidekiq::Worker
include Payloadable
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 payload
@payload ||= Oj.dump(serialize_payload(ActivityPub::ActivityPresenter.from_status(@status), ActivityPub::ActivitySerializer, signer: @status.account))
end
end

25
app/workers/activitypub/update_distribution_worker.rb
View file

@ -1,33 +1,24 @@
# frozen_string_literal: true
class ActivityPub::UpdateDistributionWorker
include Sidekiq::Worker
include Payloadable
sidekiq_options queue: 'push'
class ActivityPub::UpdateDistributionWorker < ActivityPub::RawDistributionWorker
# Distribute an profile update to servers that might have a copy
# of the account in question
def perform(account_id, options = {})
@options = options.with_indifferent_access
@account = Account.find(account_id)
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
[signed_payload, @account.id, inbox_url]
end
ActivityPub::DeliveryWorker.push_bulk(Relay.enabled.pluck(:inbox_url)) do |inbox_url|
[signed_payload, @account.id, inbox_url]
end
distribute!
rescue ActiveRecord::RecordNotFound
true
end
private
protected
def inboxes
@inboxes ||= @account.followers.inboxes
@inboxes ||= AccountReachFinder.new(@account).inboxes
end
def signed_payload
@signed_payload ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account, sign_with: @options[:sign_with]))
def payload
@payload ||= Oj.dump(serialize_payload(@account, ActivityPub::UpdateSerializer, signer: @account, sign_with: @options[:sign_with]))
end
end