From dd7ef0dc41584089a97444d8192bc61505108e6c Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Tue, 8 Aug 2017 21:52:15 +0200 Subject: Add ActivityPub inbox (#4216) * Add ActivityPub inbox * Handle ActivityPub deletes * Handle ActivityPub creates * Handle ActivityPub announces * Stubs for handling all activities that need to be handled * Add ActivityPub actor resolving * Handle conversation URI passing in ActivityPub * Handle content language in ActivityPub * Send accept header when fetching actor, handle JSON parse errors * Test for ActivityPub::FetchRemoteAccountService * Handle public key and icon/image when embedded/as array/as resolvable URI * Implement ActivityPub::FetchRemoteStatusService * Add stubs for more interactions * Undo activities implemented * Handle out of order activities * Hook up ActivityPub to ResolveRemoteAccountService, handle Update Account activities * Add fragment IDs to all transient activity serializers * Add tests and fixes * Add stubs for missing tests * Add more tests * Add more tests --- app/serializers/activitypub/reject_follow_serializer.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'app/serializers/activitypub/reject_follow_serializer.rb') diff --git a/app/serializers/activitypub/reject_follow_serializer.rb b/app/serializers/activitypub/reject_follow_serializer.rb index 28584d627..7814f4f57 100644 --- a/app/serializers/activitypub/reject_follow_serializer.rb +++ b/app/serializers/activitypub/reject_follow_serializer.rb @@ -1,10 +1,14 @@ # frozen_string_literal: true class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer - attributes :type, :actor + attributes :id, :type, :actor has_one :object, serializer: ActivityPub::FollowSerializer + def id + [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join + end + def type 'Reject' end -- cgit From 116b8a63633cfdff83582f1cc40559c2e3c2ae80 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Thu, 17 Aug 2017 22:15:37 +0200 Subject: Fix #4607 - Accept/reject activities use FollowRequest, which has inverse relations (#4616) --- .../activitypub/accept_follow_serializer.rb | 2 +- .../activitypub/inverse_follow_serializer.rb | 22 ++++++++++++++++++++++ .../activitypub/reject_follow_serializer.rb | 2 +- 3 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 app/serializers/activitypub/inverse_follow_serializer.rb (limited to 'app/serializers/activitypub/reject_follow_serializer.rb') diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb index 3e23591a5..f1c9d9023 100644 --- a/app/serializers/activitypub/accept_follow_serializer.rb +++ b/app/serializers/activitypub/accept_follow_serializer.rb @@ -3,7 +3,7 @@ class ActivityPub::AcceptFollowSerializer < ActiveModel::Serializer attributes :id, :type, :actor - has_one :object, serializer: ActivityPub::FollowSerializer + has_one :object, serializer: ActivityPub::InverseFollowSerializer def id [ActivityPub::TagManager.instance.uri_for(object.target_account), '#accepts/follows/', object.id].join diff --git a/app/serializers/activitypub/inverse_follow_serializer.rb b/app/serializers/activitypub/inverse_follow_serializer.rb new file mode 100644 index 000000000..58e0eaad0 --- /dev/null +++ b/app/serializers/activitypub/inverse_follow_serializer.rb @@ -0,0 +1,22 @@ +# frozen_string_literal: true + +class ActivityPub::InverseFollowSerializer < ActiveModel::Serializer + attributes :id, :type, :actor + attribute :virtual_object, key: :object + + def id + [ActivityPub::TagManager.instance.uri_for(object.target_account), '#follows/', object.id].join + end + + def type + 'Follow' + end + + def actor + ActivityPub::TagManager.instance.uri_for(object.target_account) + end + + def virtual_object + ActivityPub::TagManager.instance.uri_for(object.account) + end +end diff --git a/app/serializers/activitypub/reject_follow_serializer.rb b/app/serializers/activitypub/reject_follow_serializer.rb index 7814f4f57..9a9822914 100644 --- a/app/serializers/activitypub/reject_follow_serializer.rb +++ b/app/serializers/activitypub/reject_follow_serializer.rb @@ -3,7 +3,7 @@ class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer attributes :id, :type, :actor - has_one :object, serializer: ActivityPub::FollowSerializer + has_one :object, serializer: ActivityPub::InverseFollowSerializer def id [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join -- cgit From 774b8661bc578c2e7eae7fff2be24466774fe858 Mon Sep 17 00:00:00 2001 From: Eugen Rochko Date: Sat, 19 Aug 2017 02:23:47 +0200 Subject: Revert #4616 (#4638) --- .../activitypub/accept_follow_serializer.rb | 2 +- .../activitypub/inverse_follow_serializer.rb | 22 ---------------------- .../activitypub/reject_follow_serializer.rb | 2 +- 3 files changed, 2 insertions(+), 24 deletions(-) delete mode 100644 app/serializers/activitypub/inverse_follow_serializer.rb (limited to 'app/serializers/activitypub/reject_follow_serializer.rb') diff --git a/app/serializers/activitypub/accept_follow_serializer.rb b/app/serializers/activitypub/accept_follow_serializer.rb index f1c9d9023..3e23591a5 100644 --- a/app/serializers/activitypub/accept_follow_serializer.rb +++ b/app/serializers/activitypub/accept_follow_serializer.rb @@ -3,7 +3,7 @@ class ActivityPub::AcceptFollowSerializer < ActiveModel::Serializer attributes :id, :type, :actor - has_one :object, serializer: ActivityPub::InverseFollowSerializer + has_one :object, serializer: ActivityPub::FollowSerializer def id [ActivityPub::TagManager.instance.uri_for(object.target_account), '#accepts/follows/', object.id].join diff --git a/app/serializers/activitypub/inverse_follow_serializer.rb b/app/serializers/activitypub/inverse_follow_serializer.rb deleted file mode 100644 index 58e0eaad0..000000000 --- a/app/serializers/activitypub/inverse_follow_serializer.rb +++ /dev/null @@ -1,22 +0,0 @@ -# frozen_string_literal: true - -class ActivityPub::InverseFollowSerializer < ActiveModel::Serializer - attributes :id, :type, :actor - attribute :virtual_object, key: :object - - def id - [ActivityPub::TagManager.instance.uri_for(object.target_account), '#follows/', object.id].join - end - - def type - 'Follow' - end - - def actor - ActivityPub::TagManager.instance.uri_for(object.target_account) - end - - def virtual_object - ActivityPub::TagManager.instance.uri_for(object.account) - end -end diff --git a/app/serializers/activitypub/reject_follow_serializer.rb b/app/serializers/activitypub/reject_follow_serializer.rb index 9a9822914..7814f4f57 100644 --- a/app/serializers/activitypub/reject_follow_serializer.rb +++ b/app/serializers/activitypub/reject_follow_serializer.rb @@ -3,7 +3,7 @@ class ActivityPub::RejectFollowSerializer < ActiveModel::Serializer attributes :id, :type, :actor - has_one :object, serializer: ActivityPub::InverseFollowSerializer + has_one :object, serializer: ActivityPub::FollowSerializer def id [ActivityPub::TagManager.instance.uri_for(object.target_account), '#rejects/follows/', object.id].join -- cgit