forked from treehouse/mastodon
Forward deletes on the same path as reply forwarding (#7058)
* Forward deletes on the same path as reply forwarding * Remove trailing whitespacerebase/4.0.0rc2
parent
98146281e1
commit
b5726def55
|
@ -17,21 +17,25 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete_note
|
def delete_note
|
||||||
status = Status.find_by(uri: object_uri, account: @account)
|
@status = Status.find_by(uri: object_uri, account: @account)
|
||||||
status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
|
@status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
|
||||||
|
|
||||||
delete_later!(object_uri)
|
delete_later!(object_uri)
|
||||||
|
|
||||||
return if status.nil?
|
return if @status.nil?
|
||||||
|
|
||||||
forward_for_reblogs(status)
|
if @status.public_visibility? || @status.unlisted_visibility?
|
||||||
delete_now!(status)
|
forward_for_reply
|
||||||
|
forward_for_reblogs
|
||||||
|
end
|
||||||
|
|
||||||
|
delete_now!
|
||||||
end
|
end
|
||||||
|
|
||||||
def forward_for_reblogs(status)
|
def forward_for_reblogs
|
||||||
return if @json['signature'].blank?
|
return if @json['signature'].blank?
|
||||||
|
|
||||||
rebloggers_ids = status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
|
rebloggers_ids = @status.reblogs.includes(:account).references(:account).merge(Account.local).pluck(:account_id)
|
||||||
inboxes = Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes - [@account.preferred_inbox_url]
|
inboxes = Account.where(id: ::Follow.where(target_account_id: rebloggers_ids).select(:account_id)).inboxes - [@account.preferred_inbox_url]
|
||||||
|
|
||||||
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
|
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
|
||||||
|
@ -39,8 +43,22 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def delete_now!(status)
|
def replied_to_status
|
||||||
RemoveStatusService.new.call(status)
|
return @replied_to_status if defined?(@replied_to_status)
|
||||||
|
@replied_to_status = @status.thread
|
||||||
|
end
|
||||||
|
|
||||||
|
def reply_to_local?
|
||||||
|
!replied_to_status.nil? && replied_to_status.account.local?
|
||||||
|
end
|
||||||
|
|
||||||
|
def forward_for_reply
|
||||||
|
return unless @json['signature'].present? && reply_to_local?
|
||||||
|
ActivityPub::RawDistributionWorker.perform_async(Oj.dump(@json), replied_to_status.account_id, [@account.preferred_inbox_url])
|
||||||
|
end
|
||||||
|
|
||||||
|
def delete_now!
|
||||||
|
RemoveStatusService.new.call(@status)
|
||||||
end
|
end
|
||||||
|
|
||||||
def payload
|
def payload
|
||||||
|
|
Loading…
Reference in New Issue