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/favourite_service.rb | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'app/services/favourite_service.rb') diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb index 98275b37e..32699d132 100644 --- a/app/services/favourite_service.rb +++ b/app/services/favourite_service.rb @@ -30,9 +30,7 @@ class FavouriteService < BaseService if status.account.local? NotifyService.new.call(status.account, favourite) - elsif status.account.ostatus? - NotificationWorker.perform_async(build_xml(favourite), favourite.account_id, status.account_id) - elsif status.account.activitypub? + else ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url) end end @@ -51,10 +49,6 @@ class FavouriteService < BaseService ).as_json).sign!(favourite.account)) end - def build_xml(favourite) - OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.favourite_salmon(favourite)) - end - def curate_status(status) return if status.curated || !status.distributable? || (status.reply? && status.in_reply_to_account_id != status.account_id) status.curated = true -- cgit