nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Forward deletes on the same path as reply forwarding (#7058) 

* Forward deletes on the same path as reply forwarding

* Remove trailing whitespace
This commit is contained in:
Eugen Rochko 2018-04-07 18:54:46 +02:00 committed by GitHub
parent 98146281e1
commit b5726def55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/lib/activitypub/activity/delete.rb
View File

@ -17,21 +17,25 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
end
def delete_note
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_uri, account: @account)
@status ||= Status.find_by(uri: @object['atomUri'], account: @account) if @object.is_a?(Hash) && @object['atomUri'].present?
delete_later!(object_uri)
return if status.nil?
return if @status.nil?
forward_for_reblogs(status)
delete_now!(status)
if @status.public_visibility? || @status.unlisted_visibility?
forward_for_reply
forward_for_reblogs
end
delete_now!
end
def forward_for_reblogs(status)
def forward_for_reblogs
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]
ActivityPub::DeliveryWorker.push_bulk(inboxes) do |inbox_url|
@ -39,8 +43,22 @@ class ActivityPub::Activity::Delete < ActivityPub::Activity
end
end
def delete_now!(status)
RemoveStatusService.new.call(status)
def replied_to_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
def payload