mirror of
https://github.com/mastodon/mastodon.git
synced 2024-08-20 21:08:15 -07:00
5d9acc0ce4
* Fix not handling Undo on some activity types when they aren't inlined When receiving an Undo for a non-inlined activity, try looking it up in database using the URI. The queries are ad-hoc because we don't have a global index of object URIs, and not all activity types are stored in database with an index on their URI. Announces are just statuses, and have an index on URIs, so this check can be done efficiently. Accepts cannot be handled at all because we don't record their URI at any point. Follows don't have an index on URI, but they have an index on the issuing account, which should make such queries largely manageable. Likes don't have an index on URI, they have an index on the issuing account, but the number of favs per account may be very high, so I decided not to handle that. Blocks don't have an index on URI, but they have an index on the issuing account, which should make such queries largely manageable. In all cases, if an Undo could not be handled properly, we call `delete_later!` because that does not require us to know more than the URI of the undone property. * Add tests * Make newer blocks overwrite older ones Allows re-synchronizing block info by re-blocking and un-blocking again when the original Undo Block has been lost.
18 lines
605 B
Ruby
18 lines
605 B
Ruby
# frozen_string_literal: true
|
|
|
|
class ActivityPub::Activity::Block < ActivityPub::Activity
|
|
def perform
|
|
target_account = account_from_uri(object_uri)
|
|
|
|
return if target_account.nil? || !target_account.local?
|
|
|
|
if @account.blocking?(target_account)
|
|
@account.block_relationships.find_by(target_account: target_account).update(uri: @json['id']) if @json['id'].present?
|
|
return
|
|
end
|
|
|
|
UnfollowService.new.call(target_account, @account) if target_account.following?(@account)
|
|
|
|
@account.block!(target_account, uri: @json['id']) unless delete_arrived_first?(@json['id'])
|
|
end
|
|
end
|