diff options
author | Eugen Rochko <eugen@zeonfederated.com> | 2019-07-06 23:26:16 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-07-06 23:26:16 +0200 |
commit | 23aeef52cc4540b4514e9f3b935b21f0530a3746 (patch) | |
tree | 451fec4c4b674063597ee4911ce08fd1e624d74f /app/services/unfavourite_service.rb | |
parent | c07cca4727041ea5a5721acbc603d4bfb45a15a6 (diff) |
Remove Salmon and PubSubHubbub (#11205)
* Remove Salmon and PubSubHubbub endpoints * Add error when trying to follow OStatus accounts * Fix new accounts not being created in ResolveAccountService
Diffstat (limited to 'app/services/unfavourite_service.rb')
-rw-r--r-- | app/services/unfavourite_service.rb | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/app/services/unfavourite_service.rb b/app/services/unfavourite_service.rb index dcc890b7d..37917a64f 100644 --- a/app/services/unfavourite_service.rb +++ b/app/services/unfavourite_service.rb @@ -6,7 +6,7 @@ class UnfavouriteService < BaseService def call(account, status) favourite = Favourite.find_by!(account: account, status: status) favourite.destroy! - create_notification(favourite) unless status.local? + create_notification(favourite) if !status.account.local? && status.account.activitypub? favourite end @@ -14,19 +14,10 @@ class UnfavouriteService < BaseService def create_notification(favourite) status = favourite.status - - if status.account.ostatus? - NotificationWorker.perform_async(build_xml(favourite), favourite.account_id, status.account_id) - elsif status.account.activitypub? - ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url) - end + ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url) end def build_json(favourite) Oj.dump(serialize_payload(favourite, ActivityPub::UndoLikeSerializer)) end - - def build_xml(favourite) - OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.unfavourite_salmon(favourite)) - end end |