From 6c374b51537126a2cba29f3eaf74faf1fc64ba96 Mon Sep 17 00:00:00 2001 From: multiple creatures Date: Mon, 6 May 2019 20:51:20 -0500 Subject: Drop OStatus support. Fix some of the Rspec tests. --- app/services/unfollow_service.rb | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) (limited to 'app/services/unfollow_service.rb') diff --git a/app/services/unfollow_service.rb b/app/services/unfollow_service.rb index 95da2a667..e11f19e14 100644 --- a/app/services/unfollow_service.rb +++ b/app/services/unfollow_service.rb @@ -36,16 +36,11 @@ class UnfollowService < BaseService end def create_notification(follow) - if follow.target_account.ostatus? - NotificationWorker.perform_async(build_xml(follow), follow.account_id, follow.target_account_id) - elsif follow.target_account.activitypub? - ActivityPub::DeliveryWorker.perform_async(build_json(follow), follow.account_id, follow.target_account.inbox_url) - end + ActivityPub::DeliveryWorker.perform_async(build_json(follow), follow.account_id, follow.target_account.inbox_url) end def create_reject_notification(follow) # Rejecting an already-existing follow request - return unless follow.account.activitypub? ActivityPub::DeliveryWorker.perform_async(build_reject_json(follow), follow.target_account_id, follow.account.inbox_url) end @@ -64,8 +59,4 @@ class UnfollowService < BaseService adapter: ActivityPub::Adapter ).to_json end - - def build_xml(follow) - OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unfollow_salmon(follow)) - end end -- cgit