b7370ac8ba
* Deliver ActivityPub Like * Deliver ActivityPub Undo-Like * Deliver ActivityPub Create/Announce activities * Deliver ActivityPub creates from mentions * Deliver ActivityPub Block/Undo-Block * Deliver ActivityPub Accept/Reject-Follow * Deliver ActivityPub Undo-Follow * Deliver ActivityPub Follow * Deliver ActivityPub Delete activities Incidentally fix #889 * Adjust BatchedRemoveStatusService for ActivityPub * Add tests for ActivityPub workers * Add tests for FollowService * Add tests for FavouriteService, UnfollowService and PostStatusService * Add tests for ReblogService, BlockService, UnblockService, ProcessMentionsService * Add tests for AuthorizeFollowService, RejectFollowService, RemoveStatusService * Add tests for BatchedRemoveStatusService * Deliver updates to a local account to ActivityPub followers * Minor adjustments
33 lines
981 B
Ruby
33 lines
981 B
Ruby
# frozen_string_literal: true
|
|
|
|
class UnblockService < BaseService
|
|
def call(account, target_account)
|
|
return unless account.blocking?(target_account)
|
|
|
|
unblock = account.unblock!(target_account)
|
|
create_notification(unblock) unless target_account.local?
|
|
unblock
|
|
end
|
|
|
|
private
|
|
|
|
def create_notification(unblock)
|
|
if unblock.target_account.ostatus?
|
|
NotificationWorker.perform_async(build_xml(unblock), unblock.account_id, unblock.target_account_id)
|
|
elsif unblock.target_account.activitypub?
|
|
ActivityPub::DeliveryWorker.perform_async(build_json(unblock), unblock.account_id, unblock.target_account.inbox_url)
|
|
end
|
|
end
|
|
|
|
def build_json(unblock)
|
|
ActiveModelSerializers::SerializableResource.new(
|
|
unblock,
|
|
serializer: ActivityPub::UndoBlockSerializer,
|
|
adapter: ActivityPub::Adapter
|
|
).to_json
|
|
end
|
|
|
|
def build_xml(block)
|
|
OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unblock_salmon(block))
|
|
end
|
|
end
|