all endpoints are now working

diff --git a/mod/admin.php b/mod/admin.php
index d4fcc533f73f60d1a79c0c4cff6be9b9eac9f744..de7b78c08484525d8daa2445f341f8963e616ce6 100644 (file)
--- a/mod/admin.php
+++ b/mod/admin.php
@@ -1478,7 +1478,7 @@ function admin_page_site(App $a)
                '$community_page_style' => ['community_page_style', L10n::t("Community pages for visitors"), Config::get('system','community_page_style'), L10n::t("Which community pages should be available for visitors. Local users always see both pages."), $community_page_style_choices],
                '$max_author_posts_community_page' => ['max_author_posts_community_page', L10n::t("Posts per user on community page"), Config::get('system','max_author_posts_community_page'), L10n::t("The maximum number of posts per user on the community page. \x28Not valid for 'Global Community'\x29")],
                '$ostatus_disabled'     => ['ostatus_disabled', L10n::t("Enable OStatus support"), !Config::get('system','ostatus_disabled'), L10n::t("Provide built-in OStatus \x28StatusNet, GNU Social etc.\x29 compatibility. All communications in OStatus are public, so privacy warnings will be occasionally displayed.")],
-               '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus contacts. With this option we only store threads that are started by a contact that is known on our system.")],
+               '$ostatus_full_threads' => ['ostatus_full_threads', L10n::t("Only import OStatus/ActivityPub threads from our contacts"), Config::get('system','ostatus_full_threads'), L10n::t("Normally we import every content from our OStatus and ActivityPub contacts. With this option we only store threads that are started by a contact that is known on our system.")],
                '$ostatus_not_able'     => L10n::t("OStatus support can only be enabled if threading is enabled."),
                '$diaspora_able'        => $diaspora_able,
                '$diaspora_not_able'    => L10n::t("Diaspora support can't be enabled because Friendica was installed into a sub directory."),

diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 3a014517da9b158875c176c4654c0428e3686f95..d25bdd4fadbdd5f5c04951f06e117c8170c79636 100644 (file)
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -28,6 +28,19 @@ require_once 'include/dba.php';
 
 class Profile
 {
+       /**
+        * @brief Returns default profile for a given user id
+        *
+        * @param integer User ID
+        *
+        * @return array Profile data
+        */
+       public static function getProfileForUser($uid)
+       {
+               $profile = DBA::selectFirst('profile', [], ['uid' => $uid, 'is-default' => true]);
+               return $profile;
+       }
+
        /**
         * @brief Returns a formatted location string from the given profile array
         *

diff --git a/src/Module/Followers.php b/src/Module/Followers.php
new file mode 100644 (file)
index 0000000..80ad68d
--- /dev/null
+++ b/src/Module/Followers.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @file src/Module/Followers.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Model\User;
+
+/**
+ * ActivityPub Followers
+ */
+class Followers extends BaseModule
+{
+       public static function init()
+       {
+               $a = self::getApp();
+
+               if (empty($a->argv[1])) {
+                       System::httpExit(404);
+               }
+
+               $owner = User::getOwnerDataByNick($a->argv[1]);
+               if (empty($owner)) {
+                       System::httpExit(404);
+               }
+
+               $page = defaults($_REQUEST, 'page', null);
+
+               $followers = ActivityPub::getFollowers($owner, $page);
+
+               header('Content-Type: application/activity+json');
+               echo json_encode($followers);
+               exit();
+       }
+}

diff --git a/src/Module/Following.php b/src/Module/Following.php
new file mode 100644 (file)
index 0000000..091a505
--- /dev/null
+++ b/src/Module/Following.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @file src/Module/Following.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Model\User;
+
+/**
+ * ActivityPub Following
+ */
+class Following extends BaseModule
+{
+       public static function init()
+       {
+               $a = self::getApp();
+
+               if (empty($a->argv[1])) {
+                       System::httpExit(404);
+               }
+
+               $owner = User::getOwnerDataByNick($a->argv[1]);
+               if (empty($owner)) {
+                       System::httpExit(404);
+               }
+
+               $page = defaults($_REQUEST, 'page', null);
+
+               $Following = ActivityPub::getFollowing($owner, $page);
+
+               header('Content-Type: application/activity+json');
+               echo json_encode($Following);
+               exit();
+       }
+}

diff --git a/src/Module/Outbox.php b/src/Module/Outbox.php
new file mode 100644 (file)
index 0000000..7223151
--- /dev/null
+++ b/src/Module/Outbox.php
@@ -0,0 +1,38 @@
+<?php
+/**
+ * @file src/Module/Outbox.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Model\User;
+
+/**
+ * ActivityPub Outbox
+ */
+class Outbox extends BaseModule
+{
+       public static function init()
+       {
+               $a = self::getApp();
+
+               if (empty($a->argv[1])) {
+                       System::httpExit(404);
+               }
+
+               $owner = User::getOwnerDataByNick($a->argv[1]);
+               if (empty($owner)) {
+                       System::httpExit(404);
+               }
+
+               $page = defaults($_REQUEST, 'page', null);
+
+               $Outbox = ActivityPub::getOutbox($owner, $page);
+
+               header('Content-Type: application/activity+json');
+               echo json_encode($Outbox);
+               exit();
+       }
+}

diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
index 4d7657865c226e3c19bfd7921cd28504df0a4363..fa88847f37892e50e203a7d78d375c7dcd952d56 100644 (file)
--- a/src/Protocol/ActivityPub.php
+++ b/src/Protocol/ActivityPub.php
@@ -13,6 +13,7 @@ use Friendica\Core\Protocol;
 use Friendica\Model\Conversation;
 use Friendica\Model\Contact;
 use Friendica\Model\Item;
+use Friendica\Model\Profile;
 use Friendica\Model\Term;
 use Friendica\Model\User;
 use Friendica\Util\DateTimeFormat;
@@ -21,6 +22,7 @@ use Friendica\Content\Text\BBCode;
 use Friendica\Content\Text\HTML;
 use Friendica\Util\JsonLD;
 use Friendica\Util\LDSignature;
+use Friendica\Core\Config;
 
 /**
  * @brief ActivityPub Protocol class
@@ -35,24 +37,32 @@ use Friendica\Util\LDSignature;
  * Digest: https://tools.ietf.org/html/rfc5843
  * https://tools.ietf.org/html/draft-cavage-http-signatures-10#ref-15
  *
+ * Mastodon implementation of supported activities:
+ * https://github.com/tootsuite/mastodon/blob/master/app/lib/activitypub/activity.rb#L26
+ *
  * To-do:
  *
  * Receiver:
- * - Activities: Update, Delete (Activities/Notes)
+ * - Activities: Update (Notes, Person), Delete (Person, Activities, Notes)
  * - Object Types: Person, Tombstome
  *
  * Transmitter:
- * - Activities: Announce
+ * - Activities: Announce, Update (Person)
  * - Object Tyoes: Person
  *
  * General:
- * - Endpoints: Outbox, Follower, Following
- * - General cleanup
  * - Queueing unsucessful deliveries
+ * - Event support
+ * - Polling the outboxes for missing content?
  */
 class ActivityPub
 {
        const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
+       const CONTEXT = ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+               ['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
+               'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
+               'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
+               'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']];
 
        public static function isRequest()
        {
@@ -60,6 +70,124 @@ class ActivityPub
                        stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
        }
 
+       public static function getFollowers($owner, $page = null)
+       {
+               $condition = ['rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+                       'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+               $count = DBA::count('contact', $condition);
+
+               $data = ['@context' => self::CONTEXT];
+               $data['id'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+               $data['type'] = 'OrderedCollection';
+               $data['totalItems'] = $count;
+
+               // When we hide our friends we will only show the pure number but don't allow more.
+               $profile = Profile::getProfileForUser($owner['uid']);
+               if (!empty($profile['hide-friends'])) {
+                       return $data;
+               }
+
+               if (empty($page)) {
+                       $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
+               } else {
+                       $list = [];
+
+                       $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+                       while ($contact = DBA::fetch($contacts)) {
+                               $list[] = $contact['url'];
+                       }
+
+                       if (!empty($list)) {
+                               $data['next'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
+                       }
+
+                       $data['partOf'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+
+                       $data['orderedItems'] = $list;
+               }
+
+               return $data;
+       }
+
+       public static function getFollowing($owner, $page = null)
+       {
+               $condition = ['rel' => [Contact::SHARING, Contact::FRIEND], 'network' => Protocol::NATIVE_SUPPORT, 'uid' => $owner['uid'],
+                       'self' => false, 'hidden' => false, 'archive' => false, 'pending' => false];
+               $count = DBA::count('contact', $condition);
+
+               $data = ['@context' => self::CONTEXT];
+               $data['id'] = System::baseUrl() . '/following/' . $owner['nickname'];
+               $data['type'] = 'OrderedCollection';
+               $data['totalItems'] = $count;
+
+               // When we hide our friends we will only show the pure number but don't allow more.
+               $profile = Profile::getProfileForUser($owner['uid']);
+               if (!empty($profile['hide-friends'])) {
+                       return $data;
+               }
+
+               if (empty($page)) {
+                       $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
+               } else {
+                       $list = [];
+
+                       $contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
+                       while ($contact = DBA::fetch($contacts)) {
+                               $list[] = $contact['url'];
+                       }
+
+                       if (!empty($list)) {
+                               $data['next'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
+                       }
+
+                       $data['partOf'] = System::baseUrl() . '/following/' . $owner['nickname'];
+
+                       $data['orderedItems'] = $list;
+               }
+
+               return $data;
+       }
+
+       public static function getOutbox($owner, $page = null)
+       {
+               $public_contact = Contact::getIdForURL($owner['url'], 0, true);
+
+               $condition = ['uid' => $owner['uid'], 'contact-id' => $owner['id'], 'author-id' => $public_contact,
+                       'wall' => true, 'private' => false, 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT],
+                       'deleted' => false, 'visible' => true];
+               $count = DBA::count('item', $condition);
+
+               $data = ['@context' => self::CONTEXT];
+               $data['id'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+               $data['type'] = 'OrderedCollection';
+               $data['totalItems'] = $count;
+
+               if (empty($page)) {
+                       $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
+               } else {
+                       $list = [];
+
+                       $condition['parent-network'] = Protocol::NATIVE_SUPPORT;
+
+                       $items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
+                       while ($item = Item::fetch($items)) {
+                               $object = self::createObjectFromItemID($item['id']);
+                               unset($object['@context']);
+                               $list[] = $object;
+                       }
+
+                       if (!empty($list)) {
+                               $data['next'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
+                       }
+
+                       $data['partOf'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+
+                       $data['orderedItems'] = $list;
+               }
+
+               return $data;
+       }
+
        /**
         * Return the ActivityPub profile of the given user
         *
@@ -186,7 +314,7 @@ class ActivityPub
                                if ($term['type'] != TERM_MENTION) {
                                        continue;
                                }
-                               $profile = self::fetchprofile($term['url']);
+                               $profile = self::fetchprofile($term['url'], false);
                                if (!empty($profile) && empty($contacts[$profile['url']])) {
                                        $data['cc'][] = $profile['url'];
                                        $contacts[$profile['url']] = $profile['url'];
@@ -218,9 +346,11 @@ class ActivityPub
                        }
                }
 
+// It is to decide whether we should include all profiles in a thread to the list of receivers
+/*
                $parents = Item::select(['author-link', 'owner-link', 'gravity'], ['parent' => $item['parent']]);
                while ($parent = Item::fetch($parents)) {
-                       $profile = self::fetchprofile($parent['author-link']);
+                       $profile = self::fetchprofile($parent['author-link'], false);
                        if (!empty($profile) && empty($contacts[$profile['url']])) {
                                $data['cc'][] = $profile['url'];
                                $contacts[$profile['url']] = $profile['url'];
@@ -230,14 +360,14 @@ class ActivityPub
                                continue;
                        }
 
-                       $profile = self::fetchprofile($parent['owner-link']);
+                       $profile = self::fetchprofile($parent['owner-link'], false);
                        if (!empty($profile) && empty($contacts[$profile['url']])) {
                                $data['cc'][] = $profile['url'];
                                $contacts[$profile['url']] = $profile['url'];
                        }
                }
                DBA::close($parents);
-
+*/
                if (empty($data['to'])) {
                        $data['to'] = $data['cc'];
                        $data['cc'] = [];
@@ -334,11 +464,7 @@ class ActivityPub
                $type = self::getTypeOfItem($item);
 
                if (!$object_mode) {
-                       $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-                               ['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
-                               'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
-                               'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
-                               'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
+                       $data = ['@context' => self::CONTEXT];
 
                        if ($item['deleted'] && ($item['gravity'] == GRAVITY_ACTIVITY)) {
                                $type = 'Undo';
@@ -388,15 +514,9 @@ class ActivityPub
                        return false;
                }
 
-               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
-                       ['ostatus' => 'http://ostatus.org#', 'uuid' => 'http://schema.org/identifier',
-                       'sensitive' => 'as:sensitive', 'Hashtag' => 'as:Hashtag',
-                       'atomUri' => 'ostatus:atomUri', 'conversation' => 'ostatus:conversation',
-                       'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
-
+               $data = ['@context' => self::CONTEXT];
                $data = array_merge($data, self::CreateNote($item));
 
-
                return $data;
        }
 
@@ -579,7 +699,6 @@ class ActivityPub
                if (!$ret['success'] || empty($ret['body'])) {
                        return;
                }
-
                return json_decode($ret['body'], true);
        }
 
@@ -622,13 +741,20 @@ class ActivityPub
                return false;
        }
 
-       public static function fetchprofile($url, $update = false)
+       /**
+        * Fetches a profile form a given url
+        *
+        * @param string  $url    profile url
+        * @param boolean $update true = always update, false = never update, null = update when not found
+        * @return array profile array
+        */
+       public static function fetchprofile($url, $update = null)
        {
                if (empty($url)) {
                        return false;
                }
 
-               if (!$update) {
+               if (empty($update)) {
                        $apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
                        if (DBA::isResult($apcontact)) {
                                return $apcontact;
@@ -643,6 +769,10 @@ class ActivityPub
                        if (DBA::isResult($apcontact)) {
                                return $apcontact;
                        }
+
+                       if (!is_null($update)) {
+                               return false;
+                       }
                }
 
                if (empty(parse_url($url, PHP_URL_SCHEME))) {
@@ -1354,6 +1484,10 @@ class ActivityPub
 
        private static function fetchMissingActivity($url, $child)
        {
+               if (Config::get('system', 'ostatus_full_threads')) {
+                       return;
+               }
+
                $object = ActivityPub::fetchContent($url);
                if (empty($object)) {
                        logger('Activity ' . $url . ' was not fetchable, aborting.');