Make posts and comments with a poll being AP type 'Question'

- if an object contains a poll, it needs to be of type 'Question' in the AP representation
- update the testing snapshots
- scrub the URL from `Question` object snapshots as well

Author: BentiGorlich

src/Factory/ActivityPub/EntryCommentNoteFactory.php

@@ -52,7 +52,7 @@ public function create(EntryComment $comment, array $tags, bool $context = false
 
         $note = array_merge($note ?? [], [
             'id' => $this->getActivityPubId($comment),
-            'type' => 'Note',
+            'type' => $comment->poll ? 'Question' : 'Note',
             'attributedTo' => $this->activityPubManager->getActorProfileId($comment->user),
             'inReplyTo' => $this->getReplyTo($comment),
             'to' => [

src/Factory/ActivityPub/PostCommentNoteFactory.php

@@ -52,7 +52,7 @@ public function create(PostComment $comment, array $tags, bool $context = false)
 
         $note = array_merge($note ?? [], [
             'id' => $this->getActivityPubId($comment),
-            'type' => 'Note',
+            'type' => $comment->poll ? 'Question' : 'Note',
             'attributedTo' => $this->activityPubManager->getActorProfileId($comment->user),
             'inReplyTo' => $this->getReplyTo($comment),
             'to' => [

src/Factory/ActivityPub/PostNoteFactory.php

@@ -58,7 +58,7 @@ public function create(Post $post, array $tags, bool $context = false): array
 
         $note = array_merge($note ?? [], [
             'id' => $this->getActivityPubId($post),
-            'type' => 'Note',
+            'type' => $post->poll ? 'Question' : 'Note',
             'attributedTo' => $this->activityPubManager->getActorProfileId($post->user),
             'inReplyTo' => null,
             'to' => [

tests/ActivityPubJsonDriver.php

@@ -54,7 +54,7 @@ protected function scrubArray(array $data): array
             $data['id'] = 'SCRUBBED_ID';
         }
 
-        if (isset($data['type']) && 'Note' === $data['type'] && isset($data['url'])) {
+        if (isset($data['type']) && ('Note' === $data['type'] || 'Question' === $data['type']) && isset($data['url'])) {
             $data['url'] = 'SCRUBBED_ID';
         }
 
@@ -103,7 +103,7 @@ protected function scrubObject(object $data): object
             $data->id = 'SCRUBBED_ID';
         }
 
-        if (isset($data->type) && 'Note' === $data->type && isset($data->url)) {
+        if (isset($data->type) && ('Note' === $data->type || 'Question' === $data->type) && isset($data->url)) {
             $data->url = 'SCRUBBED_ID';
         }
 

tests/Unit/ActivityPub/Outbox/JsonSnapshots/CreateTest__testCreateEntryCommentWithMultipleChoicePoll__1.json

@@ -18,7 +18,7 @@
     ],
     "object": {
         "id": "SCRUBBED_ID",
-        "type": "Note",
+        "type": "Question",
         "attributedTo": "https://kbin.test/u/user",
         "inReplyTo": "SCRUBBED_ID",
         "to": [

tests/Unit/ActivityPub/Outbox/JsonSnapshots/CreateTest__testCreateEntryCommentWithPoll__1.json

@@ -18,7 +18,7 @@
     ],
     "object": {
         "id": "SCRUBBED_ID",
-        "type": "Note",
+        "type": "Question",
         "attributedTo": "https://kbin.test/u/user",
         "inReplyTo": "SCRUBBED_ID",
         "to": [

tests/Unit/ActivityPub/Outbox/JsonSnapshots/CreateTest__testCreateNestedEntryCommentWithMultipleChoicePoll__1.json

@@ -18,7 +18,7 @@
     ],
     "object": {
         "id": "SCRUBBED_ID",
-        "type": "Note",
+        "type": "Question",
         "attributedTo": "https://kbin.test/u/user",
         "inReplyTo": "SCRUBBED_ID",
         "to": [

tests/Unit/ActivityPub/Outbox/JsonSnapshots/CreateTest__testCreateNestedEntryCommentWithPoll__1.json

@@ -18,7 +18,7 @@
     ],
     "object": {
         "id": "SCRUBBED_ID",
-        "type": "Note",
+        "type": "Question",
         "attributedTo": "https://kbin.test/u/user",
         "inReplyTo": "SCRUBBED_ID",
         "to": [

tests/Unit/ActivityPub/Outbox/JsonSnapshots/CreateTest__testCreateNestedPostCommentWithMultipleChoicePoll__1.json

@@ -18,7 +18,7 @@
     ],
     "object": {
         "id": "SCRUBBED_ID",
-        "type": "Note",
+        "type": "Question",
         "attributedTo": "https://kbin.test/u/user",
         "inReplyTo": "SCRUBBED_ID",
         "to": [

tests/Unit/ActivityPub/Outbox/JsonSnapshots/CreateTest__testCreateNestedPostCommentWithPoll__1.json

@@ -18,7 +18,7 @@
     ],
     "object": {
         "id": "SCRUBBED_ID",
-        "type": "Note",
+        "type": "Question",
         "attributedTo": "https://kbin.test/u/user",
         "inReplyTo": "SCRUBBED_ID",
         "to": [