[ActivityPub] Ensuring federation with other software

ActivityPubPlugin:
- Prevent sending a Delete for an Announce

Activitypub_announce:
- Update announce_to_array to add id, to and cc information to the retrieved object

Activitypub_follow:
- Add id to the arguments of follow_to_array, useful for Accept-Follow activities

Activitypub_notice:
- Fix notice validation, url isn't a MUST

Activitypub_inbox_handler:
- Make handle_follow use the received activity id for the later Accept-Follow

Activitypub_postman:
- Fix call to the updated announce_to_array
- Fix successive unnecessary calls to ActivityPubPlugin::actor_uri()

plugins/ActivityPub/classes/Activitypub_announce.php

@@ -39,18 +39,31 @@ class Activitypub_announce extends Managed_DataObject
     /**
      * Generates an ActivityPub representation of a Announce
      *
-     * @param $actor
-     * @param array $object
+     * @param Profile $actor
+     * @param Notice $notice
      * @return array pretty array to be used in a response
      * @author Diogo Cordeiro <diogo@fc.up.pt>
      */
-    public static function announce_to_array($actor, $object)
+    public static function announce_to_array(Profile $actor, Notice $notice): array
     {
+        $actor_uri = ActivityPubPlugin::actor_uri($actor);
+        $notice_url = Activitypub_notice::getUrl($notice);
+
+        $to = [common_local_url('apActorFollowers', ['id' => $actor->getID()])];
+        foreach ($notice->getAttentionProfiles() as $to_profile) {
+            $to[] = $to_profile->getUri();
+        }
+
+        $cc[]= 'https://www.w3.org/ns/activitystreams#Public';
+
         $res = [
             '@context' => 'https://www.w3.org/ns/activitystreams',
+            'id'     => common_root_url().'share_from_'.urlencode($actor_uri).'_to_'.urlencode($notice_url),
             "type"   => "Announce",
-            "actor"  => $actor,
-            "object" => $object
+            "actor"  => $actor_uri,
+            "object" => $notice_url,
+            "to"     => $to,
+            "cc"     => $cc
         ];
         return $res;
     }

plugins/ActivityPub/classes/Activitypub_follow.php

@@ -42,13 +42,18 @@ class Activitypub_follow extends Managed_DataObject
      * @author Diogo Cordeiro <diogo@fc.up.pt>
      * @param string $actor
      * @param string $object
+     * @param string|null $id Activity id, to be used when generating for an Accept Activity
      * @return array pretty array to be used in a response
      */
-    public static function follow_to_array($actor, $object)
+    public static function follow_to_array(string $actor, string $object, ?string $id = null): array
     {
+        if ($id === null) {
+            $id = common_root_url().'follow_from_'.urlencode($actor).'_to_'.urlencode($object);
+        }
+
         $res = [
             '@context' => 'https://www.w3.org/ns/activitystreams',
-            'id'     => common_root_url().'follow_from_'.urlencode($actor).'_to_'.urlencode($object),
+            'id'     => $id,
             'type'   => 'Follow',
             'actor'  => $actor,
             'object' => $object
@@ -61,13 +66,14 @@ class Activitypub_follow extends Managed_DataObject
      *
      * @param Profile $actor_profile Remote Actor
      * @param string $object Local Actor
+     * @param string $id Activity id
      * @throws AlreadyFulfilledException
      * @throws HTTP_Request2_Exception
      * @throws NoProfileException
      * @throws ServerException
      * @author Diogo Cordeiro <diogo@fc.up.pt>
      */
-    public static function follow($actor_profile, $object)
+    public static function follow(Profile $actor_profile, string $object, string $id)
     {
         // Get Actor's Aprofile
         $actor_aprofile = Activitypub_profile::from_profile($actor_profile);
@@ -87,6 +93,6 @@ class Activitypub_follow extends Managed_DataObject
         // Notify remote instance that we have accepted their request
         common_debug('ActivityPubPlugin: Notifying remote instance that we have accepted their Follow request request from '.ActivityPubPlugin::actor_uri($actor_profile).' to '.$object);
         $postman = new Activitypub_postman($object_profile, [$actor_aprofile]);
-        $postman->accept_follow();
+        $postman->accept_follow($id);
     }
 }

plugins/ActivityPub/classes/Activitypub_notice.php

@@ -77,7 +77,7 @@ class Activitypub_notice extends Managed_DataObject
             'published'    => str_replace(' ', 'T', $notice->getCreated()).'Z',
             'url'          => self::getUrl($notice),
             'attributedTo' => ActivityPubPlugin::actor_uri($profile),
-            'to'           => ['https://www.w3.org/ns/activitystreams#Public'],
+            'to'           => $to,
             'cc'           => $cc,
             'conversation' => $notice->getConversationUrl(),
             'content'      => $notice->getRendered(),
@@ -235,9 +235,7 @@ class Activitypub_notice extends Managed_DataObject
             common_debug('ActivityPub Notice Validator: Rejected because Content was not specified.');
             throw new Exception('Object content was not specified.');
         }
-        if (!isset($object['url'])) {
-            throw new Exception('Object URL was not specified.');
-        } elseif (!filter_var($object['url'], FILTER_VALIDATE_URL)) {
+        if (isset($object['url']) && !filter_var($object['url'], FILTER_VALIDATE_URL)) {
             common_debug('ActivityPub Notice Validator: Rejected because Object URL is invalid.');
             throw new Exception('Invalid Object URL.');
         }