summaryrefslogtreecommitdiffstats
path: root/app/services/favourite_service.rb
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2017-08-13 00:44:41 +0200
committerGitHub <noreply@github.com>2017-08-13 00:44:41 +0200
commitb7370ac8baa643d93ea727699b3b11f9d3a55bea (patch)
tree869a8c2d44f78d96255ae0bf20a84c150ca23702 /app/services/favourite_service.rb
parentccdd5a9576819cdc95946d98fea0e3c8bbd1d626 (diff)
ActivityPub delivery (#4566)
* 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
Diffstat (limited to 'app/services/favourite_service.rb')
-rw-r--r--app/services/favourite_service.rb28
1 files changed, 21 insertions, 7 deletions
diff --git a/app/services/favourite_service.rb b/app/services/favourite_service.rb
index 291f9e56ef1..4aa935170ec 100644
--- a/app/services/favourite_service.rb
+++ b/app/services/favourite_service.rb
@@ -15,18 +15,32 @@ class FavouriteService < BaseService
return favourite unless favourite.nil?
favourite = Favourite.create!(account: account, status: status)
-
- if status.local?
- NotifyService.new.call(favourite.status.account, favourite)
- else
- NotificationWorker.perform_async(build_xml(favourite), account.id, status.account_id)
- end
-
+ create_notification(favourite)
favourite
end
private
+ def create_notification(favourite)
+ status = favourite.status
+
+ 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?
+ ActivityPub::DeliveryWorker.perform_async(build_json(favourite), favourite.account_id, status.account.inbox_url)
+ end
+ end
+
+ def build_json(favourite)
+ ActiveModelSerializers::SerializableResource.new(
+ favourite,
+ serializer: ActivityPub::LikeSerializer,
+ adapter: ActivityPub::Adapter
+ ).to_json
+ end
+
def build_xml(favourite)
OStatus::AtomSerializer.render(OStatus::AtomSerializer.new.favourite_salmon(favourite))
end