]> git.mxchange.org Git - friendica.git/commitdiff
Merge remote-tracking branch 'upstream/2018.08-rc' into ap1
authorMichael <heluecht@pirati.ca>
Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
committerMichael <heluecht@pirati.ca>
Sat, 22 Sep 2018 15:18:53 +0000 (15:18 +0000)
31 files changed:
composer.json
composer.lock
config/dbstructure.json
include/conversation.php
index.php
mod/contacts.php
mod/dfrn_confirm.php
mod/dirfind.php
mod/display.php
mod/follow.php
mod/profile.php
mod/xrd.php
src/Content/ContactSelector.php
src/Content/Widget.php
src/Model/Contact.php
src/Model/Conversation.php
src/Model/Item.php
src/Model/Term.php
src/Module/Inbox.php [new file with mode: 0644]
src/Module/Magic.php
src/Module/Owa.php
src/Network/Probe.php
src/Protocol/ActivityPub.php [new file with mode: 0644]
src/Protocol/Diaspora.php
src/Protocol/PortableContact.php
src/Util/HTTPSignature.php
src/Util/JsonLD.php [new file with mode: 0644]
src/Util/LDSignature.php [new file with mode: 0644]
src/Worker/APDelivery.php [new file with mode: 0644]
src/Worker/Notifier.php
src/Worker/UpdateGContact.php

index c717775506f74ca26e145e6f8332d77c03195963..b1fde04eb910080fe1dcf48cc90a5ee514b64957 100644 (file)
@@ -37,7 +37,8 @@
                "npm-asset/jgrowl": "^1.4",
                "npm-asset/fullcalendar": "^3.0.1",
                "npm-asset/cropperjs": "1.2.2",
-               "npm-asset/imagesloaded": "4.1.4"
+               "npm-asset/imagesloaded": "4.1.4",
+               "digitalbazaar/json-ld": "^0.4.7"
        },
        "repositories": [
                {
index b0ff745c681f2eaf75187c29fdda973dc68959ad..42e6c3661bf9e4810809a29dd26e40f418edb9e7 100644 (file)
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "content-hash": "5f6a43237dc52758484cd21cd76e8ce6",
+    "content-hash": "7bfbddde186f6599a2f2012bb13cbbd8",
     "packages": [
         {
             "name": "asika/simple-console",
             },
             "type": "bower-asset-library"
         },
+        {
+            "name": "digitalbazaar/json-ld",
+            "version": "0.4.7",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/digitalbazaar/php-json-ld.git",
+                "reference": "dc1bd23f0ee2efd27ccf636d32d2738dabcee182"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/digitalbazaar/php-json-ld/zipball/dc1bd23f0ee2efd27ccf636d32d2738dabcee182",
+                "reference": "dc1bd23f0ee2efd27ccf636d32d2738dabcee182",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": ">=5.3.0"
+            },
+            "type": "library",
+            "autoload": {
+                "files": [
+                    "jsonld.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "authors": [
+                {
+                    "name": "Digital Bazaar, Inc.",
+                    "email": "support@digitalbazaar.com"
+                }
+            ],
+            "description": "A JSON-LD Processor and API implementation in PHP.",
+            "homepage": "https://github.com/digitalbazaar/php-json-ld",
+            "keywords": [
+                "JSON-LD",
+                "Linked Data",
+                "RDF",
+                "Semantic Web",
+                "json",
+                "jsonld"
+            ],
+            "time": "2016-04-25T04:17:52+00:00"
+        },
         {
             "name": "divineomega/password_exposed",
             "version": "v2.5.1",
index c467ba6bc7644a062c896289a806362b584df9ac..8f676861569d3fd89e67c8b851fc31b28227d26c 100644 (file)
                        "name": ["UNIQUE", "name"]
                }
        },
+       "apcontact": {
+               "comment": "ActivityPub compatible contacts - used in the ActivityPub implementation",
+               "fields": {
+                       "url": {"type": "varbinary(255)", "not null": "1", "primary": "1", "comment": "URL of the contact"},
+                       "uuid": {"type": "varchar(255)", "comment": ""},
+                       "type": {"type": "varchar(20)", "not null": "1", "comment": ""},
+                       "following": {"type": "varchar(255)", "comment": ""},
+                       "followers": {"type": "varchar(255)", "comment": ""},
+                       "inbox": {"type": "varchar(255)", "not null": "1", "comment": ""},
+                       "outbox": {"type": "varchar(255)", "comment": ""},
+                       "sharedinbox": {"type": "varchar(255)", "comment": ""},
+                       "nick": {"type": "varchar(255)", "not null": "1", "default": "", "comment": ""},
+                       "name": {"type": "varchar(255)", "comment": ""},
+                       "about": {"type": "text", "comment": ""},
+                       "photo": {"type": "varchar(255)", "comment": ""},
+                       "addr": {"type": "varchar(255)", "comment": ""},
+                       "alias": {"type": "varchar(255)", "comment": ""},
+                       "pubkey": {"type": "text", "comment": ""},
+                       "baseurl": {"type": "varchar(255)", "comment": "baseurl of the ap contact"},
+                       "updated": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": ""}
+
+               },
+               "indexes": {
+                       "PRIMARY": ["url"],
+                       "addr": ["addr(32)"],
+                       "url": ["followers(190)"]
+               }
+       },
        "attach": {
                "comment": "file attachments",
                "fields": {
                        "reply-to-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "URI to which this item is a reply"},
                        "conversation-uri": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation URI"},
                        "conversation-href": {"type": "varbinary(255)", "not null": "1", "default": "", "comment": "GNU Social conversation link"},
-                       "protocol": {"type": "tinyint unsigned", "not null": "1", "default": "0", "comment": "The protocol of the item"},
+                       "protocol": {"type": "tinyint unsigned", "not null": "1", "default": "255", "comment": "The protocol of the item"},
                        "source": {"type": "mediumtext", "comment": "Original source"},
                        "received": {"type": "datetime", "not null": "1", "default": "0001-01-01 00:00:00", "comment": "Receiving date"}
                },
index e41b697b547824d869ad487107b05503bb80e956..dc563af4098170e56dad0eee537fe7e9121b049d 100644 (file)
@@ -556,7 +556,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
                if (in_array($mode, ['community', 'contacts'])) {
                        $writable = true;
                } else {
-                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+                       $writable = ($items[0]['uid'] == 0) && in_array($items[0]['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
                }
 
                if (!local_user()) {
@@ -807,7 +807,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
 
        foreach ($items as $index => $item) {
                if ($item['uid'] == 0) {
-                       $items[$index]['writable'] = in_array($item['network'], [Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
+                       $items[$index]['writable'] = in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::DFRN]);
                }
        }
 
@@ -877,7 +877,7 @@ function item_photo_menu($item) {
                }
 
                if ((($cid == 0) || ($rel == Contact::FOLLOWER)) &&
-                       in_array($item['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+                       in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
                        $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
                }
        } else {
index 8b0bd472513fd9c5a1ca9bbd457a60ce963682d3..a62b7a2ea1ff2e5cc52390857ee1294408ebf541 100644 (file)
--- a/index.php
+++ b/index.php
@@ -215,6 +215,10 @@ if (strlen($a->module)) {
         * First see if we have an addon which is masquerading as a module.
         */
 
+       if ($a->module == 'object') {
+               $a->module = 'display';
+       }
+
        // Compatibility with the Android Diaspora client
        if ($a->module == 'stream') {
                goaway('network?f=&order=post');
index 1604f0b6605ec43d6f0e936972ad2394a45c11f2..a7c67cb910aa2964e456d967448a9040731eb34c 100644 (file)
@@ -542,7 +542,7 @@ function contacts_content(App $a, $update = 0)
                        $relation_text = '';
                }
 
-               if (!in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
+               if (!in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA])) {
                        $relation_text = "";
                }
 
@@ -564,7 +564,7 @@ function contacts_content(App $a, $update = 0)
                }
                $lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : '');
 
-               $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
+               $poll_enabled = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
 
                $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"]));
 
@@ -975,7 +975,7 @@ function contact_conversations(App $a, $contact_id, $update)
                $profiledata = Contact::getDetailsByURL($contact["url"]);
 
                if (local_user()) {
-                       if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+                       if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                                $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
                        }
                }
@@ -999,7 +999,7 @@ function contact_posts(App $a, $contact_id)
                $profiledata = Contact::getDetailsByURL($contact["url"]);
 
                if (local_user()) {
-                       if (in_array($profiledata["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+                       if (in_array($profiledata["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                                $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
                        }
                }
@@ -1080,7 +1080,7 @@ function _contact_detail_for_template(array $rr)
  */
 function contact_actions($contact)
 {
-       $poll_enabled = in_array($contact['network'], [Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
+       $poll_enabled = in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::FEED, Protocol::MAIL]);
        $contact_actions = [];
 
        // Provide friend suggestion only for Friendica contacts
index 41b5e0ef54f16587dae6e2935ad40916b801e519..90d3d8990c87873658bd81d077015ba855871072 100644 (file)
@@ -28,6 +28,7 @@ use Friendica\Model\Group;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
 use Friendica\Protocol\Diaspora;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -335,10 +336,17 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                                intval($contact_id)
                        );
                } else {
+                       if ($network == Protocol::ACTIVITYPUB) {
+                               ActivityPub::transmitContactAccept($contact['url'], $contact['hub-verify'], $uid);
+                               $pending = true;
+                       } else {
+                               $pending = false;
+                       }
+
                        // $network !== Protocol::DFRN
                        $network = defaults($contact, 'network', Protocol::OSTATUS);
 
-                       $arr = Probe::uri($contact['url']);
+                       $arr = Probe::uri($contact['url'], $network);
 
                        $notify  = defaults($contact, 'notify' , $arr['notify']);
                        $poll    = defaults($contact, 'poll'   , $arr['poll']);
@@ -348,7 +356,7 @@ function dfrn_confirm_post(App $a, $handsfree = null)
                        $new_relation = $contact['rel'];
                        $writable = $contact['writable'];
 
-                       if ($network === Protocol::DIASPORA) {
+                       if (in_array($network, [Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
                                if ($duplex) {
                                        $new_relation = Contact::FRIEND;
                                } else {
@@ -362,30 +370,12 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
                        DBA::delete('intro', ['id' => $intro_id]);
 
-                       $r = q("UPDATE `contact` SET `name-date` = '%s',
-                               `uri-date` = '%s',
-                               `addr` = '%s',
-                               `notify` = '%s',
-                               `poll` = '%s',
-                               `blocked` = 0,
-                               `pending` = 0,
-                               `network` = '%s',
-                               `writable` = %d,
-                               `hidden` = %d,
-                               `rel` = %d
-                               WHERE `id` = %d
-                       ",
-                               DBA::escape(DateTimeFormat::utcNow()),
-                               DBA::escape(DateTimeFormat::utcNow()),
-                               DBA::escape($addr),
-                               DBA::escape($notify),
-                               DBA::escape($poll),
-                               DBA::escape($network),
-                               intval($writable),
-                               intval($hidden),
-                               intval($new_relation),
-                               intval($contact_id)
-                       );
+                       $fields = ['name-date' => DateTimeFormat::utcNow(),
+                               'uri-date' => DateTimeFormat::utcNow(), 'addr' => $addr,
+                               'notify' => $notify, 'poll' => $poll, 'blocked' => false,
+                               'pending' => $pending, 'network' => $network,
+                               'writable' => $writable, 'hidden' => $hidden, 'rel' => $new_relation];
+                       DBA::update('contact', $fields, ['id' => $contact_id]);
                }
 
                if (!DBA::isResult($r)) {
@@ -403,6 +393,10 @@ function dfrn_confirm_post(App $a, $handsfree = null)
 
                Group::addMember(User::getDefaultGroup($uid, $contact["network"]), $contact['id']);
 
+               if ($network == Protocol::ACTIVITYPUB && $duplex) {
+                       ActivityPub::transmitActivity('Follow', $contact['url'], $uid);
+               }
+
                // Let's send our user to the contact editor in case they want to
                // do anything special with this new friend.
                if ($handsfree === null) {
index 332fe90f6c48cf5af9b0a170fb8e6783b2b2581a..4223bb6ecd34bb3e196f9c1a62acbee7ab536810 100644 (file)
@@ -54,7 +54,7 @@ function dirfind_content(App $a, $prefix = "") {
                if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
                        (substr(normalise_link($search), 0, 7) == "http://")) {
                        $user_data = Probe::uri($search);
-                       $discover_user = (in_array($user_data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
+                       $discover_user = (in_array($user_data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA]));
                }
        }
 
index 907bf8ebba50d16b54ff34e341fe56c9e3da9408..1b4508c18d96982251d01e9f4c939edcc3052bbe 100644 (file)
@@ -17,6 +17,7 @@ use Friendica\Model\Group;
 use Friendica\Model\Item;
 use Friendica\Model\Profile;
 use Friendica\Protocol\DFRN;
+use Friendica\Protocol\ActivityPub;
 
 function display_init(App $a)
 {
@@ -43,7 +44,7 @@ function display_init(App $a)
 
        $item = null;
 
-       $fields = ['id', 'parent', 'author-id', 'body', 'uid'];
+       $fields = ['id', 'parent', 'author-id', 'body', 'uid', 'guid'];
 
        // If there is only one parameter, then check if this parameter could be a guid
        if ($a->argc == 2) {
@@ -76,6 +77,14 @@ function display_init(App $a)
                displayShowFeed($item["id"], false);
        }
 
+       if (ActivityPub::isRequest()) {
+               $wall_item = Item::selectFirst(['id', 'uid'], ['guid' => $item['guid'], 'wall' => true]);
+               if ($wall_item['uid'] == 180) {
+                       $data = ActivityPub::createObjectFromItemID($wall_item['id']);
+                       echo json_encode($data);
+                       exit();
+               }
+       }
        if ($item["id"] != $item["parent"]) {
                $item = Item::selectFirstForUser(local_user(), $fields, ['id' => $item["parent"]]);
        }
index 627ab52033049065a9d737fdf8c725068215c121..65028a70e007fb1d7f4c2e61c74cc921aa7e2840 100644 (file)
@@ -31,7 +31,8 @@ function follow_post(App $a)
        // This is just a precaution if maybe this page is called somewhere directly via POST
        $_SESSION['fastlane'] = $url;
 
-       $result = Contact::createFromProbe($uid, $url, true);
+       $result = Contact::createFromProbe($uid, $url, true, Protocol::ACTIVITYPUB);
+//     $result = Contact::createFromProbe($uid, $url, true);
 
        if ($result['success'] == false) {
                if ($result['message']) {
index 2e3ccd28c52a8769f57c36df7160c841f96c5e45..a284e10f2d6ee69f401e6b47ba5b380b1f921981 100644 (file)
@@ -20,6 +20,7 @@ use Friendica\Model\Profile;
 use Friendica\Module\Login;
 use Friendica\Protocol\DFRN;
 use Friendica\Util\DateTimeFormat;
+use Friendica\Protocol\ActivityPub;
 
 function profile_init(App $a)
 {
@@ -49,6 +50,15 @@ function profile_init(App $a)
                DFRN::autoRedir($a, $which);
        }
 
+       if (ActivityPub::isRequest()) {
+               $user = DBA::selectFirst('user', ['uid'], ['nickname' => $which]);
+               if ($user['uid'] == 180) {
+                       $data = ActivityPub::profile($user['uid']);
+                       echo json_encode($data);
+                       exit();
+               }
+       }
+
        Profile::load($a, $which, $profile);
 
        $blocked   = !local_user() && !remote_user() && Config::get('system', 'block_public');
index 61505f29966e99d2ea4f66f27d2cb091a8bf16cc..87766ca26e5890d7d33605c82c29d70e517181be 100644 (file)
@@ -92,6 +92,10 @@ function xrd_json($a, $uri, $alias, $profile_url, $r)
                        ['rel' => 'http://purl.org/openwebauth/v1', 'type' => 'application/x-dfrn+json', 'href' => System::baseUrl().'/owa']
                ]
        ];
+       if ($r['uid'] == 180) {
+               $json['links'][] = ['rel' => 'self', 'type' => 'application/activity+json', 'href' => $profile_url];
+       }
+
        echo json_encode($json);
        killme();
 }
index d5efecb8060d420564ea2020417fd70cb5432ed8..6a701f25f355d11b87db1afe07f5222cb3584236 100644 (file)
@@ -75,21 +75,22 @@ class ContactSelector
        public static function networkToName($s, $profile = "")
        {
                $nets = [
-                       Protocol::DFRN      => L10n::t('Friendica'),
-                       Protocol::OSTATUS   => L10n::t('OStatus'),
-                       Protocol::FEED      => L10n::t('RSS/Atom'),
-                       Protocol::MAIL      => L10n::t('Email'),
-                       Protocol::DIASPORA  => L10n::t('Diaspora'),
-                       Protocol::ZOT       => L10n::t('Zot!'),
-                       Protocol::LINKEDIN  => L10n::t('LinkedIn'),
-                       Protocol::XMPP      => L10n::t('XMPP/IM'),
-                       Protocol::MYSPACE   => L10n::t('MySpace'),
-                       Protocol::GPLUS     => L10n::t('Google+'),
-                       Protocol::PUMPIO    => L10n::t('pump.io'),
-                       Protocol::TWITTER   => L10n::t('Twitter'),
-                       Protocol::DIASPORA2 => L10n::t('Diaspora Connector'),
-                       Protocol::STATUSNET => L10n::t('GNU Social Connector'),
-                       Protocol::PNUT      => L10n::t('pnut'),
+                       Protocol::DFRN      =>   L10n::t('Friendica'),
+                       Protocol::OSTATUS   =>   L10n::t('OStatus'),
+                       Protocol::FEED      =>   L10n::t('RSS/Atom'),
+                       Protocol::MAIL      =>   L10n::t('Email'),
+                       Protocol::DIASPORA  =>   L10n::t('Diaspora'),
+                       Protocol::ZOT       =>   L10n::t('Zot!'),
+                       Protocol::LINKEDIN  =>   L10n::t('LinkedIn'),
+                       Protocol::XMPP      =>   L10n::t('XMPP/IM'),
+                       Protocol::MYSPACE   =>   L10n::t('MySpace'),
+                       Protocol::GPLUS     =>   L10n::t('Google+'),
+                       Protocol::PUMPIO    =>   L10n::t('pump.io'),
+                       Protocol::TWITTER   =>   L10n::t('Twitter'),
+                       Protocol::DIASPORA2 =>   L10n::t('Diaspora Connector'),
+                       Protocol::STATUSNET =>   L10n::t('GNU Social Connector'),
+                       Protocol::ACTIVITYPUB => L10n::t('ActivityPub'),
+                       Protocol::PNUT      =>   L10n::t('pnut'),
                ];
 
                Addon::callHooks('network_to_name', $nets);
@@ -99,13 +100,17 @@ class ContactSelector
 
                $networkname = str_replace($search, $replace, $s);
 
-               if ((in_array($s, [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
+               if ((in_array($s, [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) && ($profile != "")) {
                        $r = DBA::fetchFirst("SELECT `gserver`.`platform` FROM `gcontact`
                                        INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
                                        WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));
 
                        if (DBA::isResult($r)) {
                                $networkname = $r['platform'];
+
+                               if ($s == Protocol::ACTIVITYPUB) {
+                                       $networkname .= ' (AP)';
+                               }
                        }
                }
 
index f245f0d95e064819b1b6d4ae4a37cc4540f07a72..faba55b7a860b483e28022e98909d85eaa2cb899 100644 (file)
@@ -142,10 +142,7 @@ class Widget
 
                $nets = array();
                while ($rr = DBA::fetch($r)) {
-                       /// @TODO If 'network' is not there, this triggers an E_NOTICE
-                       if ($rr['network']) {
-                               $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
-                       }
+                       $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
                }
                DBA::close($r);
 
index 1bbc0228a806a46dc7729ef1a852e7d12d53cb81..b6b708162621b0cfa7d3e51ebd1e79204f7233b6 100644 (file)
@@ -16,6 +16,7 @@ use Friendica\Database\DBA;
 use Friendica\Model\Profile;
 use Friendica\Network\Probe;
 use Friendica\Object\Image;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\DFRN;
 use Friendica\Protocol\OStatus;
@@ -555,6 +556,12 @@ class Contact extends BaseObject
                        }
                } elseif ($contact['network'] == Protocol::DIASPORA) {
                        Diaspora::sendUnshare($user, $contact);
+               } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+                       ActivityPub::transmitContactUndo($contact['url'], $user['uid']);
+
+                       if ($dissolve) {
+                               ActivityPub::transmitContactReject($contact['url'], $contact['hub-verify'], $user['uid']);
+                       }
                }
        }
 
@@ -775,7 +782,7 @@ class Contact extends BaseObject
                }
 
                if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0)
-                       && in_array($profile["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
+                       && in_array($profile["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])
                ) {
                        Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
                }
@@ -1054,7 +1061,6 @@ class Contact extends BaseObject
                        if (!x($contact, 'avatar')) {
                                $update_contact = true;
                        }
-
                        if (!$update_contact || $no_update) {
                                return $contact_id;
                        }
@@ -1088,7 +1094,7 @@ class Contact extends BaseObject
                }
 
                // Last try in gcontact for unsupported networks
-               if (!in_array($data["network"], [Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
+               if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::OSTATUS, Protocol::DIASPORA, Protocol::PUMPIO, Protocol::MAIL, Protocol::FEED])) {
                        if ($uid != 0) {
                                return 0;
                        }
@@ -1316,33 +1322,27 @@ class Contact extends BaseObject
 
                require_once 'include/conversation.php';
 
-               // There are no posts with "uid = 0" with connector networks
-               // This speeds up the query a lot
-               $r = q("SELECT `network`, `id` AS `author-id`, `contact-type` FROM `contact`
-                       WHERE `contact`.`nurl` = '%s' AND `contact`.`uid` = 0",
-                       DBA::escape(normalise_link($contact_url))
-               );
+               $cid = Self::getIdForURL($contact_url);
 
-               if (!DBA::isResult($r)) {
+               $contact = DBA::selectFirst('contact', ['contact-type', 'network'], ['id' => $cid]);
+               if (!DBA::isResult($contact)) {
                        return '';
                }
 
-               if (in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+               if (in_array($contact["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
                        $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
                } else {
                        $sql = "`item`.`uid` = ?";
                }
 
-               $author_id = intval($r[0]["author-id"]);
-
-               $contact = ($r[0]["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
+               $contact_field = ($contact["contact-type"] == self::ACCOUNT_TYPE_COMMUNITY ? 'owner-id' : 'author-id');
 
                if ($thread_mode) {
-                       $condition = ["`$contact` = ? AND `gravity` = ? AND " . $sql,
-                               $author_id, GRAVITY_PARENT, local_user()];
+                       $condition = ["`$contact_field` = ? AND `gravity` = ? AND " . $sql,
+                               $cid, GRAVITY_PARENT, local_user()];
                } else {
-                       $condition = ["`$contact` = ? AND `gravity` IN (?, ?) AND " . $sql,
-                               $author_id, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
+                       $condition = ["`$contact_field` = ? AND `gravity` IN (?, ?) AND " . $sql,
+                               $cid, GRAVITY_PARENT, GRAVITY_COMMENT, local_user()];
                }
 
                $params = ['order' => ['created' => true],
@@ -1495,10 +1495,11 @@ class Contact extends BaseObject
        }
 
        /**
-        * @param integer $id contact id
+        * @param integer $id      contact id
+        * @param string  $network Optional network we are probing for
         * @return boolean
         */
-       public static function updateFromProbe($id)
+       public static function updateFromProbe($id, $network = '')
        {
                /*
                  Warning: Never ever fetch the public key via Probe::uri and write it into the contacts.
@@ -1511,10 +1512,10 @@ class Contact extends BaseObject
                        return false;
                }
 
-               $ret = Probe::uri($contact["url"]);
+               $ret = Probe::uri($contact["url"], $network);
 
                // If Probe::uri fails the network code will be different
-               if ($ret["network"] != $contact["network"]) {
+               if (($ret["network"] != $contact["network"]) && ($ret["network"] != $network)) {
                        return false;
                }
 
@@ -1537,14 +1538,15 @@ class Contact extends BaseObject
 
                DBA::update(
                        'contact', [
-                               'url'    => $ret['url'],
-                               'nurl'   => normalise_link($ret['url']),
-                               'addr'   => $ret['addr'],
-                               'alias'  => $ret['alias'],
-                               'batch'  => $ret['batch'],
-                               'notify' => $ret['notify'],
-                               'poll'   => $ret['poll'],
-                               'poco'   => $ret['poco']
+                               'url'     => $ret['url'],
+                               'nurl'    => normalise_link($ret['url']),
+                               'network' => $ret['network'],
+                               'addr'    => $ret['addr'],
+                               'alias'   => $ret['alias'],
+                               'batch'   => $ret['batch'],
+                               'notify'  => $ret['notify'],
+                               'poll'    => $ret['poll'],
+                               'poco'    => $ret['poco']
                        ],
                        ['id' => $id]
                );
@@ -1686,7 +1688,7 @@ class Contact extends BaseObject
 
                $hidden = (($ret['network'] === Protocol::MAIL) ? 1 : 0);
 
-               if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA])) {
+               if (in_array($ret['network'], [Protocol::MAIL, Protocol::DIASPORA, Protocol::ACTIVITYPUB])) {
                        $writeable = 1;
                }
 
@@ -1766,6 +1768,9 @@ class Contact extends BaseObject
                        } elseif ($contact['network'] == Protocol::DIASPORA) {
                                $ret = Diaspora::sendShare($a->user, $contact);
                                logger('share returns: ' . $ret);
+                       } elseif ($contact['network'] == Protocol::ACTIVITYPUB) {
+                               $ret = ActivityPub::transmitActivity('Follow', $contact['url'], $uid);
+                               logger('Follow returns: ' . $ret);
                        }
                }
 
@@ -1814,7 +1819,7 @@ class Contact extends BaseObject
                return $contact;
        }
 
-       public static function addRelationship($importer, $contact, $datarray, $item, $sharing = false) {
+       public static function addRelationship($importer, $contact, $datarray, $item = '', $sharing = false) {
                // Should always be set
                if (empty($datarray['author-id'])) {
                        return;
@@ -1827,7 +1832,7 @@ class Contact extends BaseObject
                        return;
                }
 
-               $url = $pub_contact['url'];
+               $url = defaults($datarray, 'author-link', $pub_contact['url']);
                $name = $pub_contact['name'];
                $photo = $pub_contact['photo'];
                $nick = $pub_contact['nick'];
@@ -1839,13 +1844,17 @@ class Contact extends BaseObject
                                DBA::update('contact', ['rel' => self::FRIEND, 'writable' => true],
                                                ['id' => $contact['id'], 'uid' => $importer['uid']]);
                        }
+
+                       if ($contact['network'] == Protocol::ACTIVITYPUB) {
+                               ActivityPub::transmitContactAccept($contact['url'], $contact['hub-verify'], $importer['uid']);
+                       }
+
                        // send email notification to owner?
                } else {
                        if (DBA::exists('contact', ['nurl' => normalise_link($url), 'uid' => $importer['uid'], 'pending' => true])) {
                                logger('ignoring duplicated connection request from pending contact ' . $url);
                                return;
                        }
-
                        // create contact record
                        q("INSERT INTO `contact` (`uid`, `created`, `url`, `nurl`, `name`, `nick`, `photo`, `network`, `rel`,
                                `blocked`, `readonly`, `pending`, `writable`)
index 0692a7341234f66f81530474270af6e4a64f85e8..be1eaf2295582a7e1bb1e0777cd7410a63e56f83 100644 (file)
@@ -17,13 +17,14 @@ class Conversation
         * These constants represent the parcel format used to transport a conversation independently of the message protocol.
         * It currently is stored in the "protocol" field for legacy reasons.
         */
-       const PARCEL_UNKNOWN            = 0;
+       const PARCEL_ACTIVITYPUB        = 0;
        const PARCEL_DFRN               = 1;
        const PARCEL_DIASPORA           = 2;
        const PARCEL_SALMON             = 3;
        const PARCEL_FEED               = 4; // Deprecated
        const PARCEL_SPLIT_CONVERSATION = 6;
        const PARCEL_TWITTER            = 67;
+       const PARCEL_UNKNOWN            = 255;
 
        /**
         * @brief Store the conversation data
@@ -34,7 +35,7 @@ class Conversation
        public static function insert(array $arr)
        {
                if (in_array(defaults($arr, 'network', Protocol::PHANTOM),
-                               [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
+                       [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, Protocol::TWITTER]) && !empty($arr['uri'])) {
                        $conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
 
                        if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
@@ -70,7 +71,8 @@ class Conversation
                                        unset($old_conv['source']);
                                }
                                // Update structure data all the time but the source only when its from a better protocol.
-                               if (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol']) && ($old_conv['protocol'] != 0)) {
+                               if (empty($conversation['source']) || (!empty($old_conv['source']) &&
+                                       ($old_conv['protocol'] < defaults($conversation, 'protocol', PARCEL_UNKNOWN)))) {
                                        unset($conversation['protocol']);
                                        unset($conversation['source']);
                                }
index d10a211a59511d98b579583d748c2ff004471a4f..e590c0c5c56ed3aaefd2b2412da7e42127a2ee68 100644 (file)
@@ -176,7 +176,7 @@ class Item extends BaseObject
 
                // We can always comment on posts from these networks
                if (array_key_exists('writable', $row) &&
-                       in_array($row['internal-network'], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+                       in_array($row['internal-network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                        $row['writable'] = true;
                }
 
@@ -1352,7 +1352,7 @@ class Item extends BaseObject
                 * We have to check several networks since Friendica posts could be repeated
                 * via OStatus (maybe Diasporsa as well)
                 */
-               if (in_array($item['network'], [Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
+               if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS, ""])) {
                        $condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
                                trim($item['uri']), $item['uid'],
                                Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS];
@@ -2053,7 +2053,7 @@ class Item extends BaseObject
 
                // Only distribute public items from native networks
                $condition = ['id' => $itemid, 'uid' => 0,
-                       'network' => [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
+                       'network' => [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""],
                        'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
                $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
                if (!DBA::isResult($item)) {
@@ -2071,14 +2071,46 @@ class Item extends BaseObject
 
                $users = [];
 
-               $condition = ["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `id` = ?) AND `uid` != 0 AND NOT `blocked` AND `rel` IN (?, ?)",
-                       $parent['owner-id'], Contact::SHARING,  Contact::FRIEND];
+               /// @todo add a field "pcid" in the contact table that referrs to the public contact id.
+               $owner = DBA::selectFirst('contact', ['url', 'nurl', 'alias'], ['id' => $parent['owner-id']]);
+               if (!DBA::isResult($owner)) {
+                       return;
+               }
 
+               $condition = ['nurl' => $owner['nurl'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
                $contacts = DBA::select('contact', ['uid'], $condition);
+               while ($contact = DBA::fetch($contacts)) {
+                       if ($contact['uid'] == 0) {
+                               continue;
+                       }
 
+                       $users[$contact['uid']] = $contact['uid'];
+               }
+               DBA::close($contacts);
+
+               $condition = ['alias' => $owner['url'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+               $contacts = DBA::select('contact', ['uid'], $condition);
                while ($contact = DBA::fetch($contacts)) {
+                       if ($contact['uid'] == 0) {
+                               continue;
+                       }
+
                        $users[$contact['uid']] = $contact['uid'];
                }
+               DBA::close($contacts);
+
+               if (!empty($owner['alias'])) {
+                       $condition = ['url' => $owner['alias'], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+                       $contacts = DBA::select('contact', ['uid'], $condition);
+                       while ($contact = DBA::fetch($contacts)) {
+                               if ($contact['uid'] == 0) {
+                                       continue;
+                               }
+
+                               $users[$contact['uid']] = $contact['uid'];
+                       }
+                       DBA::close($contacts);
+               }
 
                $origin_uid = 0;
 
@@ -2175,7 +2207,7 @@ class Item extends BaseObject
                }
 
                // is it an entry from a connector? Only add an entry for natively connected networks
-               if (!in_array($item["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
+               if (!in_array($item["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS, ""])) {
                        return;
                }
 
@@ -2329,13 +2361,7 @@ class Item extends BaseObject
                        $guid = System::createGUID(32);
                }
 
-               $hostname = self::getApp()->get_hostname();
-
-               $user = DBA::selectFirst('user', ['nickname'], ['uid' => $uid]);
-
-               $uri = "urn:X-dfrn:" . $hostname . ':' . $user['nickname'] . ':' . $guid;
-
-               return $uri;
+               return self::getApp()->get_baseurl() . '/object/' . $guid;
        }
 
        /**
@@ -2825,7 +2851,7 @@ class Item extends BaseObject
        }
 
        // returns an array of contact-ids that are allowed to see this object
-       private static function enumeratePermissions($obj)
+       public static function enumeratePermissions($obj)
        {
                $allow_people = expand_acl($obj['allow_cid']);
                $allow_groups = Group::expand(expand_acl($obj['allow_gid']));
index a81241cb42af31298fe95bea2d64753d3d04c79f..262312532995c1b1b2753fc0c5dcc311e7ef0a20 100644 (file)
@@ -33,6 +33,17 @@ class Term
                return $tag_text;
        }
 
+       public static function tagArrayFromItemId($itemid)
+       {
+               $condition = ['otype' => TERM_OBJ_POST, 'oid' => $itemid, 'type' => [TERM_HASHTAG, TERM_MENTION]];
+               $tags = DBA::select('term', ['type', 'term', 'url'], $condition);
+               if (!DBA::isResult($tags)) {
+                       return [];
+               }
+
+               return DBA::toArray($tags);
+       }
+
        public static function fileTextFromItemId($itemid)
        {
                $file_text = '';
diff --git a/src/Module/Inbox.php b/src/Module/Inbox.php
new file mode 100644 (file)
index 0000000..8912111
--- /dev/null
@@ -0,0 +1,53 @@
+<?php
+/**
+ * @file src/Module/Inbox.php
+ */
+namespace Friendica\Module;
+
+use Friendica\BaseModule;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Util\HTTPSignature;
+
+/**
+ * ActivityPub Inbox
+ */
+class Inbox extends BaseModule
+{
+       public static function init()
+       {
+               $a = self::getApp();
+
+               $postdata = file_get_contents('php://input');
+
+               if (empty($postdata)) {
+                       System::httpExit(400);
+               }
+
+               if (HTTPSignature::getSigner($postdata, $_SERVER)) {
+                       $filename = 'signed-activitypub';
+               } else {
+                       $filename = 'failed-activitypub';
+               }
+
+               $tempfile = tempnam(get_temppath(), $filename);
+               file_put_contents($tempfile, json_encode(['argv' => $a->argv, 'header' => $_SERVER, 'body' => $postdata], JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+
+               logger('Incoming message stored under ' . $tempfile);
+
+               if (!empty($a->argv[1])) {
+                       $user = DBA::selectFirst('user', ['uid'], ['nickname' => $a->argv[1]]);
+                       if (!DBA::isResult($user)) {
+                               System::httpExit(404);
+                       }
+                       $uid = $user['uid'];
+               } else {
+                       $uid = 0;
+               }
+
+               ActivityPub::processInbox($postdata, $_SERVER, $uid);
+
+               System::httpExit(202);
+       }
+}
index cf77482e5a8eec13d719bade0afdf9ada4bc2064..0b4126e0e965528fba0c9170a725c2b2dec262c9 100644 (file)
@@ -76,13 +76,9 @@ class Magic extends BaseModule
 
                                // Create a header that is signed with the local users private key.
                                $headers = HTTPSignature::createSig(
-                                       '',
                                        $headers,
                                        $user['prvkey'],
-                                       'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : ''),
-                                       false,
-                                       true,
-                                       'sha512'
+                                       'acct:' . $user['nickname'] . '@' . $a->get_hostname() . ($a->urlpath ? '/' . $a->urlpath : '')
                                );
 
                                // Try to get an authentication token from the other instance.
index 1d6b1332dcec81bdcf8ff5bd8aba3111343338c4..68f31c59de23aab272d19b7a17b1254c259affeb 100644 (file)
@@ -54,7 +54,7 @@ class Owa extends BaseModule
                                                if (DBA::isResult($contact)) {
                                                        // Try to verify the signed header with the public key of the contact record
                                                        // we have found.
-                                                       $verified = HTTPSignature::verify('', $contact['pubkey']);
+                                                       $verified = HTTPSignature:verifyMagic($contact['pubkey']);
 
                                                        if ($verified && $verified['header_signed'] && $verified['header_valid']) {
                                                                logger('OWA header: ' . print_r($verified, true), LOGGER_DATA);
index 75231f44ff0bc9e2e1061704cdcbdecc1df1783a..c0c627bfe911e01d07b32b585402a27132f9ed46 100644 (file)
@@ -19,6 +19,7 @@ use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
@@ -328,7 +329,18 @@ class Probe
                        $uid = local_user();
                }
 
-               $data = self::detect($uri, $network, $uid);
+               if ($network != Protocol::ACTIVITYPUB) {
+                       $data = self::detect($uri, $network, $uid);
+               } else {
+                       $data = null;
+               }
+
+               if (in_array(defaults($data, 'network', ''), ['', Protocol::PHANTOM])) {
+                       $ap_profile = ActivityPub::probeProfile($uri);
+                       if (!empty($ap_profile) && ($ap_profile['network'] == Protocol::ACTIVITYPUB)) {
+                               $data = $ap_profile;
+                       }
+               }
 
                if (!isset($data["url"])) {
                        $data["url"] = $uri;
diff --git a/src/Protocol/ActivityPub.php b/src/Protocol/ActivityPub.php
new file mode 100644 (file)
index 0000000..95542ba
--- /dev/null
@@ -0,0 +1,1403 @@
+<?php
+/**
+ * @file src/Protocol/ActivityPub.php
+ */
+namespace Friendica\Protocol;
+
+use Friendica\Database\DBA;
+use Friendica\Core\System;
+use Friendica\BaseObject;
+use Friendica\Util\Network;
+use Friendica\Util\HTTPSignature;
+use Friendica\Core\Protocol;
+use Friendica\Model\Conversation;
+use Friendica\Model\Contact;
+use Friendica\Model\Item;
+use Friendica\Model\Term;
+use Friendica\Model\User;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Crypto;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\HTML;
+use Friendica\Util\JsonLD;
+use Friendica\Util\LDSignature;
+
+/**
+ * @brief ActivityPub Protocol class
+ * The ActivityPub Protocol is a message exchange protocol defined by the W3C.
+ * https://www.w3.org/TR/activitypub/
+ * https://www.w3.org/TR/activitystreams-core/
+ * https://www.w3.org/TR/activitystreams-vocabulary/
+ *
+ * https://blog.joinmastodon.org/2018/06/how-to-implement-a-basic-activitypub-server/
+ * https://blog.joinmastodon.org/2018/07/how-to-make-friends-and-verify-requests/
+ *
+ * Digest: https://tools.ietf.org/html/rfc5843
+ * https://tools.ietf.org/html/draft-cavage-http-signatures-10#ref-15
+ * https://github.com/digitalbazaar/php-json-ld
+ *
+ * Part of the code for HTTP signing is taken from the Osada project.
+ * https://framagit.org/macgirvin/osada
+ *
+ * To-do:
+ *
+ * Receiver:
+ * - Activities: Dislike, Update, Delete
+ * - Object Types: Person, Tombstome
+ *
+ * Transmitter:
+ * - Activities: Like, Dislike, Update, Delete, Announce
+ * - Object Tyoes: Article, Person, Tombstone
+ *
+ * General:
+ * - Endpoints: Outbox, Follower, Following
+ * - General cleanup
+ * - Queueing unsucessful deliveries
+ */
+class ActivityPub
+{
+       const PUBLIC = 'https://www.w3.org/ns/activitystreams#Public';
+
+       public static function isRequest()
+       {
+               return stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/activity+json') ||
+                       stristr(defaults($_SERVER, 'HTTP_ACCEPT', ''), 'application/ld+json');
+       }
+
+       /**
+        * Return the ActivityPub profile of the given user
+        *
+        * @param integer $uid User ID
+        * @return array
+        */
+       public static function profile($uid)
+       {
+               $accounttype = ['Person', 'Organization', 'Service', 'Group', 'Application'];
+               $condition = ['uid' => $uid, 'blocked' => false, 'account_expired' => false,
+                       'account_removed' => false, 'verified' => true];
+               $fields = ['guid', 'nickname', 'pubkey', 'account-type', 'page-flags'];
+               $user = DBA::selectFirst('user', $fields, $condition);
+               if (!DBA::isResult($user)) {
+                       return [];
+               }
+
+               $fields = ['locality', 'region', 'country-name'];
+               $profile = DBA::selectFirst('profile', $fields, ['uid' => $uid, 'is-default' => true]);
+               if (!DBA::isResult($profile)) {
+                       return [];
+               }
+
+               $fields = ['name', 'url', 'location', 'about', 'avatar'];
+               $contact = DBA::selectFirst('contact', $fields, ['uid' => $uid, 'self' => true]);
+               if (!DBA::isResult($contact)) {
+                       return [];
+               }
+
+               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+                       ['vcard' => 'http://www.w3.org/2006/vcard/ns#', 'uuid' => 'http://schema.org/identifier',
+                       'sensitive' => 'as:sensitive', 'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers']]];
+
+               $data['id'] = $contact['url'];
+               $data['uuid'] = $user['guid'];
+               $data['type'] = $accounttype[$user['account-type']];
+               $data['following'] = System::baseUrl() . '/following/' . $user['nickname'];
+               $data['followers'] = System::baseUrl() . '/followers/' . $user['nickname'];
+               $data['inbox'] = System::baseUrl() . '/inbox/' . $user['nickname'];
+               $data['outbox'] = System::baseUrl() . '/outbox/' . $user['nickname'];
+               $data['preferredUsername'] = $user['nickname'];
+               $data['name'] = $contact['name'];
+               $data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
+                       'vcard:region' => $profile['region'], 'vcard:locality' => $profile['locality']];
+               $data['summary'] = $contact['about'];
+               $data['url'] = $contact['url'];
+               $data['manuallyApprovesFollowers'] = in_array($user['page-flags'], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP]);
+               $data['publicKey'] = ['id' => $contact['url'] . '#main-key',
+                       'owner' => $contact['url'],
+                       'publicKeyPem' => $user['pubkey']];
+               $data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
+               $data['icon'] = ['type' => 'Image',
+                       'url' => $contact['avatar']];
+
+               // tags: https://kitty.town/@inmysocks/100656097926961126.json
+               return $data;
+       }
+
+       private static function fetchPermissionBlockFromConversation($item)
+       {
+               if (empty($item['thr-parent'])) {
+                       return [];
+               }
+
+               $condition = ['item-uri' => $item['thr-parent'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+               $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+               if (!DBA::isResult($conversation)) {
+                       return [];
+               }
+
+               $activity = json_decode($conversation['source'], true);
+
+               $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+               $profile = ActivityPub::fetchprofile($actor);
+
+               $item_profile = ActivityPub::fetchprofile($item['owner-link']);
+
+               $permissions = [];
+
+               $elements = ['to', 'cc', 'bto', 'bcc'];
+               foreach ($elements as $element) {
+                       if (empty($activity[$element])) {
+                               continue;
+                       }
+                       if (is_string($activity[$element])) {
+                               $activity[$element] = [$activity[$element]];
+                       }
+                       foreach ($activity[$element] as $receiver) {
+                               if ($receiver == $profile['followers'] && !empty($item_profile['followers'])) {
+                                       $receiver = $item_profile['followers'];
+                               }
+                               if ($receiver != $item['owner-link']) {
+                                       $permissions[$element][] = $receiver;
+                               }
+                       }
+               }
+               return $permissions;
+       }
+
+       public static function createPermissionBlockForItem($item)
+       {
+               $data = ['to' => [], 'cc' => []];
+
+               $data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
+
+               $actor_profile = ActivityPub::fetchprofile($item['author-link']);
+
+               $terms = Term::tagArrayFromItemId($item['id']);
+
+               $contacts[$item['author-link']] = $item['author-link'];
+
+               if (!$item['private']) {
+                       $data['to'][] = self::PUBLIC;
+                       if (!empty($actor_profile['followers'])) {
+                               $data['cc'][] = $actor_profile['followers'];
+                       }
+
+                       foreach ($terms as $term) {
+                               if ($term['type'] != TERM_MENTION) {
+                                       continue;
+                               }
+                               $profile = self::fetchprofile($term['url']);
+                               if (!empty($profile) && empty($contacts[$profile['url']])) {
+                                       $data['cc'][] = $profile['url'];
+                                       $contacts[$profile['url']] = $profile['url'];
+                               }
+                       }
+               } else {
+                       $receiver_list = Item::enumeratePermissions($item);
+
+                       $mentioned = [];
+
+                       foreach ($terms as $term) {
+                               if ($term['type'] != TERM_MENTION) {
+                                       continue;
+                               }
+                               $cid = Contact::getIdForURL($term['url'], $item['uid']);
+                               if (!empty($cid) && in_array($cid, $receiver_list)) {
+                                       $contact = DBA::selectFirst('contact', ['url'], ['id' => $cid, 'network' => Protocol::ACTIVITYPUB]);
+                                       $data['to'][] = $contact['url'];
+                                       $contacts[$contact['url']] = $contact['url'];
+                               }
+                       }
+
+                       foreach ($receiver_list as $receiver) {
+                               $contact = DBA::selectFirst('contact', ['url'], ['id' => $receiver, 'network' => Protocol::ACTIVITYPUB]);
+                               if (empty($contacts[$contact['url']])) {
+                                       $data['cc'][] = $contact['url'];
+                                       $contacts[$contact['url']] = $contact['url'];
+                               }
+                       }
+               }
+
+               $parents = Item::select(['author-link', 'owner-link'], ['parent' => $item['parent']]);
+               while ($parent = Item::fetch($parents)) {
+                       $profile = self::fetchprofile($parent['author-link']);
+                       if (!empty($profile) && empty($contacts[$profile['url']])) {
+                               $data['cc'][] = $profile['url'];
+                               $contacts[$profile['url']] = $profile['url'];
+                       }
+
+                       $profile = self::fetchprofile($parent['owner-link']);
+                       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'] = [];
+               }
+
+               return $data;
+       }
+
+       public static function fetchTargetInboxes($item, $uid)
+       {
+               $permissions = self::createPermissionBlockForItem($item);
+               if (empty($permissions)) {
+                       return [];
+               }
+
+               $inboxes = [];
+
+               $item_profile = ActivityPub::fetchprofile($item['owner-link']);
+
+               $elements = ['to', 'cc', 'bto', 'bcc'];
+               foreach ($elements as $element) {
+                       if (empty($permissions[$element])) {
+                               continue;
+                       }
+                       foreach ($permissions[$element] as $receiver) {
+                               if ($receiver == $item_profile['followers']) {
+                                       $contacts = DBA::select('contact', ['notify', 'batch'], ['uid' => $uid,
+                                               'rel' => [Contact::FOLLOWER, Contact::FRIEND], 'network' => Protocol::ACTIVITYPUB]);
+                                       while ($contact = DBA::fetch($contacts)) {
+                                               $contact = defaults($contact, 'batch', $contact['notify']);
+                                               $inboxes[$contact] = $contact;
+                                       }
+                                       DBA::close($contacts);
+                               } else {
+                                       $profile = self::fetchprofile($receiver);
+                                       if (!empty($profile)) {
+                                               $target = defaults($profile, 'sharedinbox', $profile['inbox']);
+                                               $inboxes[$target] = $target;
+                                       }
+                               }
+                       }
+               }
+
+               if (!empty($item_profile['sharedinbox'])) {
+                       unset($inboxes[$item_profile['sharedinbox']]);
+               }
+
+               if (!empty($item_profile['inbox'])) {
+                       unset($inboxes[$item_profile['inbox']]);
+               }
+
+               return $inboxes;
+       }
+
+       public static function createActivityFromItem($item_id)
+       {
+               $item = Item::selectFirst([], ['id' => $item_id]);
+
+               if (!DBA::isResult($item)) {
+                       return false;
+               }
+
+               $condition = ['item-uri' => $item['uri'], 'protocol' => Conversation::PARCEL_ACTIVITYPUB];
+               $conversation = DBA::selectFirst('conversation', ['source'], $condition);
+               if (DBA::isResult($conversation)) {
+                       $data = json_decode($conversation['source']);
+                       if (!empty($data)) {
+                               return $data;
+                       }
+               }
+
+               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+                       ['ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
+                       'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
+                       'conversation' => 'ostatus:conversation',
+                       'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
+
+               $data['id'] = $item['uri'] . '#activity';
+               $data['type'] = 'Create';
+               $data['actor'] = $item['author-link'];
+
+               $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+
+               if ($item["created"] != $item["edited"]) {
+                       $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
+               }
+
+               $data['context_id'] = $item['parent'];
+               $data['context'] = self::createConversationURLFromItem($item);
+
+               $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
+
+               $data['object'] = self::createObjectTypeFromItem($item);
+
+               $owner = User::getOwnerDataById($item['uid']);
+
+               return LDSignature::sign($data, $owner);
+       }
+
+       public static function createObjectFromItemID($item_id)
+       {
+               $item = Item::selectFirst([], ['id' => $item_id]);
+
+               if (!DBA::isResult($item)) {
+                       return false;
+               }
+
+               $data = ['@context' => ['https://www.w3.org/ns/activitystreams', 'https://w3id.org/security/v1',
+                       ['ostatus' => 'http://ostatus.org#', 'sensitive' => 'as:sensitive',
+                       'Hashtag' => 'as:Hashtag', 'atomUri' => 'ostatus:atomUri',
+                       'conversation' => 'ostatus:conversation',
+                       'inReplyToAtomUri' => 'ostatus:inReplyToAtomUri']]];
+
+               $data = array_merge($data, self::createObjectTypeFromItem($item));
+
+
+               return $data;
+       }
+
+       private static function createTagList($item)
+       {
+               $tags = [];
+
+               $terms = Term::tagArrayFromItemId($item['id']);
+               foreach ($terms as $term) {
+                       if ($term['type'] == TERM_MENTION) {
+                               $contact = Contact::getDetailsByURL($term['url']);
+                               if (!empty($contact['addr'])) {
+                                       $mention = '@' . $contact['addr'];
+                               } else {
+                                       $mention = '@' . $term['url'];
+                               }
+
+                               $tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
+                       }
+               }
+               return $tags;
+       }
+
+       private static function createConversationURLFromItem($item)
+       {
+               $conversation = DBA::selectFirst('conversation', ['conversation-uri'], ['item-uri' => $item['parent-uri']]);
+               if (DBA::isResult($conversation) && !empty($conversation['conversation-uri'])) {
+                       $conversation_uri = $conversation['conversation-uri'];
+               } else {
+                       $conversation_uri = $item['parent-uri'];
+               }
+               return $conversation_uri;
+       }
+
+       private static function createObjectTypeFromItem($item)
+       {
+               if (!empty($item['title'])) {
+                       $type = 'Article';
+               } else {
+                       $type = 'Note';
+               }
+
+               $data = [];
+               $data['id'] = $item['uri'];
+               $data['type'] = $type;
+               $data['summary'] = null; // Ignore by now
+
+               if ($item['uri'] != $item['thr-parent']) {
+                       $data['inReplyTo'] = $item['thr-parent'];
+               } else {
+                       $data['inReplyTo'] = null;
+               }
+
+               $data['published'] = DateTimeFormat::utc($item["created"]."+00:00", DateTimeFormat::ATOM);
+
+               if ($item["created"] != $item["edited"]) {
+                       $data['updated'] = DateTimeFormat::utc($item["edited"]."+00:00", DateTimeFormat::ATOM);
+               }
+
+               $data['url'] = $item['plink'];
+               $data['attributedTo'] = $item['author-link'];
+               $data['actor'] = $item['author-link'];
+               $data['sensitive'] = false; // - Query NSFW
+               $data['context_id'] = $item['parent'];
+               $data['conversation'] = $data['context'] = self::createConversationURLFromItem($item);
+
+               if (!empty($item['title'])) {
+                       $data['name'] = BBCode::convert($item['title'], false, 7);
+               }
+
+               $data['content'] = BBCode::convert($item['body'], false, 7);
+               $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
+               $data['attachment'] = []; // @ToDo
+               $data['tag'] = self::createTagList($item);
+               $data = array_merge($data, ActivityPub::createPermissionBlockForItem($item));
+
+               //$data['emoji'] = []; // Ignore by now
+               return $data;
+       }
+
+       public static function transmitActivity($activity, $target, $uid)
+       {
+               $profile = self::fetchprofile($target);
+
+               $owner = User::getOwnerDataById($uid);
+
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => $activity,
+                       'actor' => $owner['url'],
+                       'object' => $profile['url'],
+                       'to' => $profile['url']];
+
+               logger('Sending activity ' . $activity . ' to ' . $target . ' for user ' . $uid, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       public static function transmitContactAccept($target, $id, $uid)
+       {
+               $profile = self::fetchprofile($target);
+
+               $owner = User::getOwnerDataById($uid);
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Accept',
+                       'actor' => $owner['url'],
+                       'object' => ['id' => $id, 'type' => 'Follow',
+                               'actor' => $profile['url'],
+                               'object' => $owner['url']],
+                       'to' => $profile['url']];
+
+               logger('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       public static function transmitContactReject($target, $id, $uid)
+       {
+               $profile = self::fetchprofile($target);
+
+               $owner = User::getOwnerDataById($uid);
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+                       'type' => 'Reject',
+                       'actor' => $owner['url'],
+                       'object' => ['id' => $id, 'type' => 'Follow',
+                               'actor' => $profile['url'],
+                               'object' => $owner['url']],
+                       'to' => $profile['url']];
+
+               logger('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       public static function transmitContactUndo($target, $uid)
+       {
+               $profile = self::fetchprofile($target);
+
+               $id = System::baseUrl() . '/activity/' . System::createGUID();
+
+               $owner = User::getOwnerDataById($uid);
+               $data = ['@context' => 'https://www.w3.org/ns/activitystreams',
+                       'id' => $id,
+                       'type' => 'Undo',
+                       'actor' => $owner['url'],
+                       'object' => ['id' => $id, 'type' => 'Follow',
+                               'actor' => $owner['url'],
+                               'object' => $profile['url']],
+                       'to' => $profile['url']];
+
+               logger('Sending undo to ' . $target . ' for user ' . $uid . ' with id ' . $id, LOGGER_DEBUG);
+
+               $signed = LDSignature::sign($data, $owner);
+               return HTTPSignature::transmit($signed, $profile['inbox'], $uid);
+       }
+
+       /**
+        * Fetches ActivityPub content from the given url
+        *
+        * @param string $url content url
+        * @return array
+        */
+       public static function fetchContent($url)
+       {
+               $ret = Network::curl($url, false, $redirects, ['accept_content' => 'application/activity+json, application/ld+json']);
+               if (!$ret['success'] || empty($ret['body'])) {
+                       return;
+               }
+
+               return json_decode($ret['body'], true);
+       }
+
+       /**
+        * Resolves the profile url from the address by using webfinger
+        *
+        * @param string $addr profile address (user@domain.tld)
+        * @return string url
+        */
+       private static function addrToUrl($addr)
+       {
+               $addr_parts = explode('@', $addr);
+               if (count($addr_parts) != 2) {
+                       return false;
+               }
+
+               $webfinger = 'https://' . $addr_parts[1] . '/.well-known/webfinger?resource=acct:' . urlencode($addr);
+
+               $ret = Network::curl($webfinger, false, $redirects, ['accept_content' => 'application/jrd+json,application/json']);
+               if (!$ret['success'] || empty($ret['body'])) {
+                       return false;
+               }
+
+               $data = json_decode($ret['body'], true);
+
+               if (empty($data['links'])) {
+                       return false;
+               }
+
+               foreach ($data['links'] as $link) {
+                       if (empty($link['href']) || empty($link['rel']) || empty($link['type'])) {
+                               continue;
+                       }
+
+                       if (($link['rel'] == 'self') && ($link['type'] == 'application/activity+json')) {
+                               return $link['href'];
+                       }
+               }
+
+               return false;
+       }
+
+       public static function fetchprofile($url, $update = false)
+       {
+               if (empty($url)) {
+                       return false;
+               }
+
+               if (!$update) {
+                       $apcontact = DBA::selectFirst('apcontact', [], ['url' => $url]);
+                       if (DBA::isResult($apcontact)) {
+                               return $apcontact;
+                       }
+
+                       $apcontact = DBA::selectFirst('apcontact', [], ['alias' => $url]);
+                       if (DBA::isResult($apcontact)) {
+                               return $apcontact;
+                       }
+
+                       $apcontact = DBA::selectFirst('apcontact', [], ['addr' => $url]);
+                       if (DBA::isResult($apcontact)) {
+                               return $apcontact;
+                       }
+               }
+
+               if (empty(parse_url($url, PHP_URL_SCHEME))) {
+                       $url = self::addrToUrl($url);
+                       if (empty($url)) {
+                               return false;
+                       }
+               }
+
+               $data = self::fetchContent($url);
+
+               if (empty($data) || empty($data['id']) || empty($data['inbox'])) {
+                       return false;
+               }
+
+               $apcontact = [];
+               $apcontact['url'] = $data['id'];
+               $apcontact['uuid'] = defaults($data, 'uuid', null);
+               $apcontact['type'] = defaults($data, 'type', null);
+               $apcontact['following'] = defaults($data, 'following', null);
+               $apcontact['followers'] = defaults($data, 'followers', null);
+               $apcontact['inbox'] = defaults($data, 'inbox', null);
+               $apcontact['outbox'] = defaults($data, 'outbox', null);
+               $apcontact['sharedinbox'] = JsonLD::fetchElement($data, 'endpoints', 'sharedInbox');
+               $apcontact['nick'] = defaults($data, 'preferredUsername', null);
+               $apcontact['name'] = defaults($data, 'name', $apcontact['nick']);
+               $apcontact['about'] = defaults($data, 'summary', '');
+               $apcontact['photo'] = JsonLD::fetchElement($data, 'icon', 'url');
+               $apcontact['alias'] = JsonLD::fetchElement($data, 'url', 'href');
+
+               $parts = parse_url($apcontact['url']);
+               unset($parts['scheme']);
+               unset($parts['path']);
+               $apcontact['addr'] = $apcontact['nick'] . '@' . str_replace('//', '', Network::unparseURL($parts));
+
+               $apcontact['pubkey'] = trim(JsonLD::fetchElement($data, 'publicKey', 'publicKeyPem'));
+
+               // To-Do
+               // manuallyApprovesFollowers
+
+               // Unhandled
+               // @context, tag, attachment, image, nomadicLocations, signature, following, followers, featured, movedTo, liked
+
+               // Unhandled from Misskey
+               // sharedInbox, isCat
+
+               // Unhandled from Kroeg
+               // kroeg:blocks, updated
+
+               // Check if the address is resolvable
+               if (self::addrToUrl($apcontact['addr']) == $apcontact['url']) {
+                       $parts = parse_url($apcontact['url']);
+                       unset($parts['path']);
+                       $apcontact['baseurl'] = Network::unparseURL($parts);
+               } else {
+                       $apcontact['addr'] = null;
+               }
+
+               if ($apcontact['url'] == $apcontact['alias']) {
+                       $apcontact['alias'] = null;
+               }
+
+               $apcontact['updated'] = DateTimeFormat::utcNow();
+
+               DBA::update('apcontact', $apcontact, ['url' => $url], true);
+
+               return $apcontact;
+       }
+
+       /**
+        * Fetches a profile from the given url into an array that is compatible to Probe::uri
+        *
+        * @param string $url profile url
+        * @return array
+        */
+       public static function probeProfile($url)
+       {
+               $apcontact = self::fetchprofile($url, true);
+               if (empty($apcontact)) {
+                       return false;
+               }
+
+               $profile = ['network' => Protocol::ACTIVITYPUB];
+               $profile['nick'] = $apcontact['nick'];
+               $profile['name'] = $apcontact['name'];
+               $profile['guid'] = $apcontact['uuid'];
+               $profile['url'] = $apcontact['url'];
+               $profile['addr'] = $apcontact['addr'];
+               $profile['alias'] = $apcontact['alias'];
+               $profile['photo'] = $apcontact['photo'];
+               // $profile['community']
+               // $profile['keywords']
+               // $profile['location']
+               $profile['about'] = $apcontact['about'];
+               $profile['batch'] = $apcontact['sharedinbox'];
+               $profile['notify'] = $apcontact['inbox'];
+               $profile['poll'] = $apcontact['outbox'];
+               $profile['pubkey'] = $apcontact['pubkey'];
+               $profile['baseurl'] = $apcontact['baseurl'];
+
+               // Remove all "null" fields
+               foreach ($profile as $field => $content) {
+                       if (is_null($content)) {
+                               unset($profile[$field]);
+                       }
+               }
+
+               return $profile;
+       }
+
+       public static function processInbox($body, $header, $uid)
+       {
+               $http_signer = HTTPSignature::getSigner($body, $header);
+               if (empty($http_signer)) {
+                       logger('Invalid HTTP signature, message will be discarded.', LOGGER_DEBUG);
+                       return;
+               } else {
+                       logger('HTTP signature is signed by ' . $http_signer, LOGGER_DEBUG);
+               }
+
+               $activity = json_decode($body, true);
+
+               $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+               logger('Message for user ' . $uid . ' is from actor ' . $actor, LOGGER_DEBUG);
+
+               if (empty($activity)) {
+                       logger('Invalid body.', LOGGER_DEBUG);
+                       return;
+               }
+
+               if (LDSignature::isSigned($activity)) {
+                       $ld_signer = LDSignature::getSigner($activity);
+                       if (!empty($ld_signer && ($actor == $http_signer))) {
+                               logger('The HTTP and the JSON-LD signature belong to ' . $ld_signer, LOGGER_DEBUG);
+                               $trust_source = true;
+                       } elseif (!empty($ld_signer)) {
+                               logger('JSON-LD signature is signed by ' . $ld_signer, LOGGER_DEBUG);
+                               $trust_source = true;
+                       } elseif ($actor == $http_signer) {
+                               logger('Bad JSON-LD signature, but HTTP signer fits the actor.', LOGGER_DEBUG);
+                               $trust_source = true;
+                       } else {
+                               logger('Invalid JSON-LD signature and the HTTP signer is different.', LOGGER_DEBUG);
+                               $trust_source = false;
+                       }
+               } elseif ($actor == $http_signer) {
+                       logger('Trusting post without JSON-LD signature, The actor fits the HTTP signer.', LOGGER_DEBUG);
+                       $trust_source = true;
+               } else {
+                       logger('No JSON-LD signature, different actor.', LOGGER_DEBUG);
+                       $trust_source = false;
+               }
+
+               self::processActivity($activity, $body, $uid, $trust_source);
+       }
+
+       public static function fetchOutbox($url, $uid)
+       {
+               $data = self::fetchContent($url);
+               if (empty($data)) {
+                       return;
+               }
+
+               if (!empty($data['orderedItems'])) {
+                       $items = $data['orderedItems'];
+               } elseif (!empty($data['first']['orderedItems'])) {
+                       $items = $data['first']['orderedItems'];
+               } elseif (!empty($data['first'])) {
+                       self::fetchOutbox($data['first'], $uid);
+                       return;
+               } else {
+                       $items = [];
+               }
+
+               foreach ($items as $activity) {
+                       self::processActivity($activity, '', $uid, true);
+               }
+       }
+
+       private static function prepareObjectData($activity, $uid, $trust_source)
+       {
+               $actor = JsonLD::fetchElement($activity, 'actor', 'id');
+               if (empty($actor)) {
+                       logger('Empty actor', LOGGER_DEBUG);
+                       return [];
+               }
+
+               // Fetch all receivers from to, cc, bto and bcc
+               $receivers = self::getReceivers($activity, $actor);
+
+               // When it is a delivery to a personal inbox we add that user to the receivers
+               if (!empty($uid)) {
+                       $owner = User::getOwnerDataById($uid);
+                       $additional = ['uid:' . $uid => $uid];
+                       $receivers = array_merge($receivers, $additional);
+               }
+
+               logger('Receivers: ' . json_encode($receivers), LOGGER_DEBUG);
+
+               if (is_string($activity['object'])) {
+                       $object_url = $activity['object'];
+               } elseif (!empty($activity['object']['id'])) {
+                       $object_url = $activity['object']['id'];
+               } else {
+                       logger('No object found', LOGGER_DEBUG);
+                       return [];
+               }
+
+               // Fetch the content only on activities where this matters
+               if (in_array($activity['type'], ['Create', 'Update', 'Announce'])) {
+                       $object_data = self::fetchObject($object_url, $activity['object'], $trust_source);
+                       if (empty($object_data)) {
+                               logger("Object data couldn't be processed", LOGGER_DEBUG);
+                               return [];
+                       }
+               } elseif ($activity['type'] == 'Accept') {
+                       $object_data = [];
+                       $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+                       $object_data['object'] = JsonLD::fetchElement($activity, 'object', 'actor');
+               } elseif ($activity['type'] == 'Undo') {
+                       $object_data = [];
+                       $object_data['object_type'] = JsonLD::fetchElement($activity, 'object', 'type');
+                       $object_data['object'] = JsonLD::fetchElement($activity, 'object', 'object');
+               } elseif (in_array($activity['type'], ['Like', 'Dislike'])) {
+                       // Create a mostly empty array out of the activity data (instead of the object).
+                       // This way we later don't have to check for the existence of ech individual array element.
+                       $object_data = self::processCommonData($activity);
+                       $object_data['name'] = $activity['type'];
+                       $object_data['author'] = $activity['actor'];
+                       $object_data['object'] = $object_url;
+               } elseif ($activity['type'] == 'Follow') {
+                       $object_data['id'] = $activity['id'];
+                       $object_data['object'] = $object_url;
+               } else {
+                       $object_data = [];
+               }
+
+               $object_data = self::addActivityFields($object_data, $activity);
+
+               $object_data['type'] = $activity['type'];
+               $object_data['owner'] = $actor;
+               $object_data['receiver'] = array_merge(defaults($object_data, 'receiver', []), $receivers);
+
+               return $object_data;
+       }
+
+       private static function processActivity($activity, $body = '', $uid = null, $trust_source = false)
+       {
+               if (empty($activity['type'])) {
+                       logger('Empty type', LOGGER_DEBUG);
+                       return;
+               }
+
+               if (empty($activity['object'])) {
+                       logger('Empty object', LOGGER_DEBUG);
+                       return;
+               }
+
+               if (empty($activity['actor'])) {
+                       logger('Empty actor', LOGGER_DEBUG);
+                       return;
+
+               }
+
+               // Non standard
+               // title, atomUri, context_id, statusnetConversationId
+
+               // To-Do?
+               // context, location, signature;
+
+               logger('Processing activity: ' . $activity['type'], LOGGER_DEBUG);
+
+               $object_data = self::prepareObjectData($activity, $uid, $trust_source);
+               if (empty($object_data)) {
+                       logger('No object data found', LOGGER_DEBUG);
+                       return;
+               }
+
+               switch ($activity['type']) {
+                       case 'Create':
+                       case 'Announce':
+                               self::createItem($object_data, $body);
+                               break;
+
+                       case 'Like':
+                               self::likeItem($object_data, $body);
+                               break;
+
+                       case 'Dislike':
+                               break;
+
+                       case 'Update':
+                               break;
+
+                       case 'Delete':
+                               break;
+
+                       case 'Follow':
+                               self::followUser($object_data);
+                               break;
+
+                       case 'Accept':
+                               if ($object_data['object_type'] == 'Follow') {
+                                       self::acceptFollowUser($object_data);
+                               }
+                               break;
+
+                       case 'Undo':
+                               if ($object_data['object_type'] == 'Follow') {
+                                       self::undoFollowUser($object_data);
+                               }
+                               break;
+
+                       default:
+                               logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
+                               break;
+               }
+       }
+
+       private static function getReceivers($activity, $actor)
+       {
+               $receivers = [];
+
+               // When it is an answer, we inherite the receivers from the parent
+               $replyto = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+               if (!empty($replyto)) {
+                       $parents = Item::select(['uid'], ['uri' => $replyto]);
+                       while ($parent = Item::fetch($parents)) {
+                               $receivers['uid:' . $parent['uid']] = $parent['uid'];
+                       }
+               }
+
+               if (!empty($actor)) {
+                       $profile = self::fetchprofile($actor);
+                       $followers = defaults($profile, 'followers', '');
+
+                       logger('Actor: ' . $actor . ' - Followers: ' . $followers, LOGGER_DEBUG);
+               } else {
+                       logger('Empty actor', LOGGER_DEBUG);
+                       $followers = '';
+               }
+
+               $elements = ['to', 'cc', 'bto', 'bcc'];
+               foreach ($elements as $element) {
+                       if (empty($activity[$element])) {
+                               continue;
+                       }
+
+                       // The receiver can be an arror or a string
+                       if (is_string($activity[$element])) {
+                               $activity[$element] = [$activity[$element]];
+                       }
+
+                       foreach ($activity[$element] as $receiver) {
+                               if ($receiver == self::PUBLIC) {
+                                       $receivers['uid:0'] = 0;
+                               }
+
+                               if (($receiver == self::PUBLIC) && !empty($actor)) {
+                                       // This will most likely catch all OStatus connections to Mastodon
+                                       $condition = ['alias' => [$actor, normalise_link($actor)], 'rel' => [Contact::SHARING, Contact::FRIEND]];
+                                       $contacts = DBA::select('contact', ['uid'], $condition);
+                                       while ($contact = DBA::fetch($contacts)) {
+                                               if ($contact['uid'] != 0) {
+                                                       $receivers['uid:' . $contact['uid']] = $contact['uid'];
+                                               }
+                                       }
+                                       DBA::close($contacts);
+                               }
+
+                               if (in_array($receiver, [$followers, self::PUBLIC]) && !empty($actor)) {
+                                       $condition = ['nurl' => normalise_link($actor), 'rel' => [Contact::SHARING, Contact::FRIEND],
+                                               'network' => Protocol::ACTIVITYPUB];
+                                       $contacts = DBA::select('contact', ['uid'], $condition);
+                                       while ($contact = DBA::fetch($contacts)) {
+                                               if ($contact['uid'] != 0) {
+                                                       $receivers['uid:' . $contact['uid']] = $contact['uid'];
+                                               }
+                                       }
+                                       DBA::close($contacts);
+                                       continue;
+                               }
+
+                               $condition = ['self' => true, 'nurl' => normalise_link($receiver)];
+                               $contact = DBA::selectFirst('contact', ['uid'], $condition);
+                               if (!DBA::isResult($contact)) {
+                                       continue;
+                               }
+                               $receivers['uid:' . $contact['uid']] = $contact['uid'];
+                       }
+               }
+               return $receivers;
+       }
+
+       private static function addActivityFields($object_data, $activity)
+       {
+               if (!empty($activity['published']) && empty($object_data['published'])) {
+                       $object_data['published'] = $activity['published'];
+               }
+
+               if (!empty($activity['updated']) && empty($object_data['updated'])) {
+                       $object_data['updated'] = $activity['updated'];
+               }
+
+               if (!empty($activity['inReplyTo']) && empty($object_data['parent-uri'])) {
+                       $object_data['parent-uri'] = JsonLD::fetchElement($activity, 'inReplyTo', 'id');
+               }
+
+               if (!empty($activity['instrument'])) {
+                       $object_data['service'] = JsonLD::fetchElement($activity, 'instrument', 'name', 'type', 'Service');
+               }
+               return $object_data;
+       }
+
+       private static function fetchObject($object_url, $object = [], $trust_source = false)
+       {
+               if (!$trust_source || is_string($object)) {
+                       $data = self::fetchContent($object_url);
+                       if (empty($data)) {
+                               logger('Empty content for ' . $object_url . ', check if content is available locally.', LOGGER_DEBUG);
+                               $data = $object_url;
+                       } else {
+                               logger('Fetched content for ' . $object_url, LOGGER_DEBUG);
+                       }
+               } else {
+                       logger('Using original object for url ' . $object_url, LOGGER_DEBUG);
+                       $data = $object;
+               }
+
+               if (is_string($data)) {
+                       $item = Item::selectFirst([], ['uri' => $data]);
+                       if (!DBA::isResult($item)) {
+                               logger('Object with url ' . $data . ' was not found locally.', LOGGER_DEBUG);
+                               return false;
+                       }
+                       logger('Using already stored item for url ' . $object_url, LOGGER_DEBUG);
+                       $data = self::createObjectTypeFromItem($item);
+               }
+
+               if (empty($data['type'])) {
+                       logger('Empty type', LOGGER_DEBUG);
+                       return false;
+               } else {
+                       $type = $data['type'];
+                       logger('Type ' . $type, LOGGER_DEBUG);
+               }
+
+               if (in_array($type, ['Note', 'Article', 'Video'])) {
+                       $common = self::processCommonData($data);
+               }
+
+               switch ($type) {
+                       case 'Note':
+                               return array_merge($common, self::processNote($data));
+                       case 'Article':
+                               return array_merge($common, self::processArticle($data));
+                       case 'Video':
+                               return array_merge($common, self::processVideo($data));
+
+                       case 'Announce':
+                               if (empty($data['object'])) {
+                                       return false;
+                               }
+                               return self::fetchObject($data['object']);
+
+                       case 'Person':
+                       case 'Tombstone':
+                               break;
+
+                       default:
+                               logger('Unknown object type: ' . $data['type'], LOGGER_DEBUG);
+                               break;
+               }
+       }
+
+       private static function processCommonData(&$object)
+       {
+               if (empty($object['id'])) {
+                       return false;
+               }
+
+               $object_data = [];
+               $object_data['type'] = $object['type'];
+               $object_data['uri'] = $object['id'];
+
+               if (!empty($object['inReplyTo'])) {
+                       $object_data['reply-to-uri'] = JsonLD::fetchElement($object, 'inReplyTo', 'id');
+               } else {
+                       $object_data['reply-to-uri'] = $object_data['uri'];
+               }
+
+               $object_data['published'] = defaults($object, 'published', null);
+               $object_data['updated'] = defaults($object, 'updated', $object_data['published']);
+
+               if (empty($object_data['published']) && !empty($object_data['updated'])) {
+                       $object_data['published'] = $object_data['updated'];
+               }
+
+               $object_data['uuid'] = defaults($object, 'uuid', null);
+               $object_data['owner'] = $object_data['author'] = JsonLD::fetchElement($object, 'attributedTo', 'id');
+               $object_data['context'] = defaults($object, 'context', null);
+               $object_data['conversation'] = defaults($object, 'conversation', null);
+               $object_data['sensitive'] = defaults($object, 'sensitive', null);
+               $object_data['name'] = defaults($object, 'title', null);
+               $object_data['name'] = defaults($object, 'name', $object_data['name']);
+               $object_data['summary'] = defaults($object, 'summary', null);
+               $object_data['content'] = defaults($object, 'content', null);
+               $object_data['source'] = defaults($object, 'source', null);
+               $object_data['location'] = JsonLD::fetchElement($object, 'location', 'name', 'type', 'Place');
+               $object_data['attachments'] = defaults($object, 'attachment', null);
+               $object_data['tags'] = defaults($object, 'tag', null);
+               $object_data['service'] = JsonLD::fetchElement($object, 'instrument', 'name', 'type', 'Service');
+               $object_data['alternate-url'] = JsonLD::fetchElement($object, 'url', 'href');
+               $object_data['receiver'] = self::getReceivers($object, $object_data['owner']);
+
+               // Unhandled
+               // @context, type, actor, signature, mediaType, duration, replies, icon
+
+               // Also missing: (Defined in the standard, but currently unused)
+               // audience, preview, endTime, startTime, generator, image
+
+               return $object_data;
+       }
+
+       private static function processNote($object)
+       {
+               $object_data = [];
+
+               // To-Do?
+               // emoji, atomUri, inReplyToAtomUri
+
+               // Unhandled
+               // contentMap, announcement_count, announcements, context_id, likes, like_count
+               // inReplyToStatusId, shares, quoteUrl, statusnetConversationId
+
+               return $object_data;
+       }
+
+       private static function processArticle($object)
+       {
+               $object_data = [];
+
+               return $object_data;
+       }
+
+       private static function processVideo($object)
+       {
+               $object_data = [];
+
+               // To-Do?
+               // category, licence, language, commentsEnabled
+
+               // Unhandled
+               // views, waitTranscoding, state, support, subtitleLanguage
+               // likes, dislikes, shares, comments
+
+               return $object_data;
+       }
+
+       private static function convertMentions($body)
+       {
+               $URLSearchString = "^\[\]";
+               $body = preg_replace("/\[url\=([$URLSearchString]*)\]([#@!])(.*?)\[\/url\]/ism", '$2[url=$1]$3[/url]', $body);
+
+               return $body;
+       }
+
+       private static function constructTagList($tags, $sensitive)
+       {
+               if (empty($tags)) {
+                       return '';
+               }
+
+               $tag_text = '';
+               foreach ($tags as $tag) {
+                       if (in_array($tag['type'], ['Mention', 'Hashtag'])) {
+                               if (!empty($tag_text)) {
+                                       $tag_text .= ',';
+                               }
+
+                               if (empty($tag['href'])) {
+                                       //$tag['href']
+                                       logger('Blubb!');
+                               }
+
+                               $tag_text .= substr($tag['name'], 0, 1) . '[url=' . $tag['href'] . ']' . substr($tag['name'], 1) . '[/url]';
+                       }
+               }
+
+               /// @todo add nsfw for $sensitive
+
+               return $tag_text;
+       }
+
+       private static function constructAttachList($attachments, $item)
+       {
+               if (empty($attachments)) {
+                       return $item;
+               }
+
+               foreach ($attachments as $attach) {
+                       $filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
+                       if ($filetype == 'image') {
+                               $item['body'] .= "\n[img]".$attach['url'].'[/img]';
+                       } else {
+                               if (!empty($item["attach"])) {
+                                       $item["attach"] .= ',';
+                               } else {
+                                       $item["attach"] = '';
+                               }
+                               if (!isset($attach['length'])) {
+                                       $attach['length'] = "0";
+                               }
+                               $item["attach"] .= '[attach]href="'.$attach['url'].'" length="'.$attach['length'].'" type="'.$attach['mediaType'].'" title="'.defaults($attach, 'name', '').'"[/attach]';
+                       }
+               }
+
+               return $item;
+       }
+
+       private static function createItem($activity, $body)
+       {
+               $item = [];
+               $item['verb'] = ACTIVITY_POST;
+               $item['parent-uri'] = $activity['reply-to-uri'];
+
+               if ($activity['reply-to-uri'] == $activity['uri']) {
+                       $item['gravity'] = GRAVITY_PARENT;
+                       $item['object-type'] = ACTIVITY_OBJ_NOTE;
+               } else {
+                       $item['gravity'] = GRAVITY_COMMENT;
+                       $item['object-type'] = ACTIVITY_OBJ_COMMENT;
+               }
+
+               if (($activity['uri'] != $activity['reply-to-uri']) && !Item::exists(['uri' => $activity['reply-to-uri']])) {
+                       logger('Parent ' . $activity['reply-to-uri'] . ' not found. Try to refetch it.');
+                       self::fetchMissingActivity($activity['reply-to-uri'], $activity);
+               }
+
+               self::postItem($activity, $item, $body);
+       }
+
+       private static function likeItem($activity, $body)
+       {
+               $item = [];
+               $item['verb'] = ACTIVITY_LIKE;
+               $item['parent-uri'] = $activity['object'];
+               $item['gravity'] = GRAVITY_ACTIVITY;
+               $item['object-type'] = ACTIVITY_OBJ_NOTE;
+
+               self::postItem($activity, $item, $body);
+       }
+
+       private static function postItem($activity, $item, $body)
+       {
+               /// @todo What to do with $activity['context']?
+
+               $item['network'] = Protocol::ACTIVITYPUB;
+               $item['private'] = !in_array(0, $activity['receiver']);
+               $item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
+               $item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
+               $item['uri'] = $activity['uri'];
+               $item['created'] = $activity['published'];
+               $item['edited'] = $activity['updated'];
+               $item['guid'] = $activity['uuid'];
+               $item['title'] = HTML::toBBCode($activity['name']);
+               $item['content-warning'] = HTML::toBBCode($activity['summary']);
+               $item['body'] = self::convertMentions(HTML::toBBCode($activity['content']));
+               $item['location'] = $activity['location'];
+               $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
+               $item['app'] = $activity['service'];
+               $item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
+
+               $item = self::constructAttachList($activity['attachments'], $item);
+
+               $source = JsonLD::fetchElement($activity, 'source', 'content', 'mediaType', 'text/bbcode');
+               if (!empty($source)) {
+                       $item['body'] = $source;
+               }
+
+               $item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
+               $item['source'] = $body;
+               $item['conversation-uri'] = $activity['conversation'];
+
+               foreach ($activity['receiver'] as $receiver) {
+                       $item['uid'] = $receiver;
+                       $item['contact-id'] = Contact::getIdForURL($activity['author'], $receiver, true);
+
+                       if (($receiver != 0) && empty($item['contact-id'])) {
+                               $item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
+                       }
+
+                       $item_id = Item::insert($item);
+                       logger('Storing for user ' . $item['uid'] . ': ' . $item_id);
+               }
+       }
+
+       private static function fetchMissingActivity($url, $child)
+       {
+               $object = ActivityPub::fetchContent($url);
+               if (empty($object)) {
+                       logger('Activity ' . $url . ' was not fetchable, aborting.');
+                       return;
+               }
+
+               $activity = [];
+               $activity['@context'] = $object['@context'];
+               unset($object['@context']);
+               $activity['id'] = $object['id'];
+               $activity['to'] = defaults($object, 'to', []);
+               $activity['cc'] = defaults($object, 'cc', []);
+               $activity['actor'] = $child['author'];
+               $activity['object'] = $object;
+               $activity['published'] = $object['published'];
+               $activity['type'] = 'Create';
+
+               self::processActivity($activity);
+               logger('Activity ' . $url . ' had been fetched and processed.');
+       }
+
+       private static function getUserOfObject($object)
+       {
+               $self = DBA::selectFirst('contact', ['uid'], ['nurl' => normalise_link($object), 'self' => true]);
+               if (!DBA::isResult($self)) {
+                       return false;
+               } else {
+                       return $self['uid'];
+               }
+       }
+
+       private static function followUser($activity)
+       {
+               $uid = self::getUserOfObject($activity['object']);
+               if (empty($uid)) {
+                       return;
+               }
+
+               $owner = User::getOwnerDataById($uid);
+
+               $cid = Contact::getIdForURL($activity['owner'], $uid);
+               if (!empty($cid)) {
+                       $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+               } else {
+                       $contact = false;
+               }
+
+               $item = ['author-id' => Contact::getIdForURL($activity['owner']),
+                       'author-link' => $activity['owner']];
+
+               Contact::addRelationship($owner, $contact, $item);
+               $cid = Contact::getIdForURL($activity['owner'], $uid);
+               if (empty($cid)) {
+                       return;
+               }
+
+               $contact = DBA::selectFirst('contact', ['network'], ['id' => $cid]);
+               if ($contact['network'] != Protocol::ACTIVITYPUB) {
+                       Contact::updateFromProbe($cid, Protocol::ACTIVITYPUB);
+               }
+
+               DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
+               logger('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
+       }
+
+       private static function acceptFollowUser($activity)
+       {
+               $uid = self::getUserOfObject($activity['object']);
+               if (empty($uid)) {
+                       return;
+               }
+
+               $owner = User::getOwnerDataById($uid);
+
+               $cid = Contact::getIdForURL($activity['owner'], $uid);
+               if (empty($cid)) {
+                       logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+                       return;
+               }
+
+               $fields = ['pending' => false];
+
+               $contact = DBA::selectFirst('contact', ['rel'], ['id' => $cid]);
+               if ($contact['rel'] == Contact::FOLLOWER) {
+                       $fields['rel'] = Contact::FRIEND;
+               }
+
+               $condition = ['id' => $cid];
+               DBA::update('contact', $fields, $condition);
+               logger('Accept contact request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
+       }
+
+       private static function undoFollowUser($activity)
+       {
+               $uid = self::getUserOfObject($activity['object']);
+               if (empty($uid)) {
+                       return;
+               }
+
+               $owner = User::getOwnerDataById($uid);
+
+               $cid = Contact::getIdForURL($activity['owner'], $uid);
+               if (empty($cid)) {
+                       logger('No contact found for ' . $activity['owner'], LOGGER_DEBUG);
+                       return;
+               }
+
+               $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
+               if (!DBA::isResult($contact)) {
+                       return;
+               }
+
+               Contact::removeFollower($owner, $contact);
+               logger('Undo following request from contact ' . $cid . ' for user ' . $uid, LOGGER_DEBUG);
+       }
+}
index 27cfdccd853af83b89d026ddaf6fb5e741e25605..e7edcdc490a9363d693d502bec5d29df73006af1 100644 (file)
@@ -1592,17 +1592,13 @@ class Diaspora
                if (DBA::isResult($item)) {
                        return $item["uri"];
                } elseif (!$onlyfound) {
-                       $contact = Contact::getDetailsByAddr($author, 0);
-                       if (!empty($contact['network'])) {
-                               $prefix = 'urn:X-' . $contact['network'] . ':';
-                       } else {
-                               // This fallback should happen most unlikely
-                               $prefix = 'urn:X-dspr:';
-                       }
+                       $person = self::personByHandle($author);
 
-                       $author_parts = explode('@', $author);
+                       $parts = parse_url($person['url']);
+                       unset($parts['path']);
+                       $host_url = Network::unparseURL($parts);
 
-                       return $prefix . $author_parts[1] . ':' . $author_parts[0] . ':'. $guid;
+                       return $host_url . '/object/' . $guid;
                }
 
                return "";
index 2939f69e55c2cbe42727cd76e7b41952df811bda..280dbe72c2a2afe151b5c5d47dd8e11a561fc182 100644 (file)
@@ -333,7 +333,7 @@ class PortableContact
                        $server_url = normalise_link(self::detectServer($profile));
                }
 
-               if (!in_array($gcontacts[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
+               if (!in_array($gcontacts[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::FEED, Protocol::OSTATUS, ""])) {
                        logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
                        return false;
                }
index 911de4308e5f7eb0b371f6c277f48d88386232e8..8fa8566af378b30bba135efcfefca8b89fffeb5d 100644 (file)
@@ -5,8 +5,11 @@
  */
 namespace Friendica\Util;
 
+use Friendica\BaseObject;
 use Friendica\Core\Config;
 use Friendica\Database\DBA;
+use Friendica\Model\User;
+use Friendica\Protocol\ActivityPub;
 
 /**
  * @brief Implements HTTP Signatures per draft-cavage-http-signatures-07.
@@ -18,81 +21,37 @@ use Friendica\Database\DBA;
 
 class HTTPSignature
 {
-       /**
-        * @brief RFC5843
-        *
-        * Disabled until Friendica's ActivityPub implementation
-        * is ready.
-        *
-        * @see https://tools.ietf.org/html/rfc5843
-        *
-        * @param string  $body The value to create the digest for
-        * @param boolean $set  (optional, default true)
-        *   If set send a Digest HTTP header
-        *
-        * @return string The generated digest of $body
-        */
-//     public static function generateDigest($body, $set = true)
-//     {
-//             $digest = base64_encode(hash('sha256', $body, true));
-//
-//             if($set) {
-//                     header('Digest: SHA-256=' . $digest);
-//             }
-//             return $digest;
-//     }
-
        // See draft-cavage-http-signatures-08
-       public static function verify($data, $key = '')
+       public static function verifyMagic($key)
        {
-               $body      = $data;
                $headers   = null;
                $spoofable = false;
                $result = [
                        'signer'         => '',
                        'header_signed'  => false,
-                       'header_valid'   => false,
-                       'content_signed' => false,
-                       'content_valid'  => false
+                       'header_valid'   => false
                ];
 
                // Decide if $data arrived via controller submission or curl.
-               if (is_array($data) && $data['header']) {
-                       if (!$data['success']) {
-                               return $result;
-                       }
+               $headers = [];
+               $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
 
-                       $h = new HTTPHeaders($data['header']);
-                       $headers = $h->fetch();
-                       $body = $data['body'];
-               } else {
-                       $headers = [];
-                       $headers['(request-target)'] = strtolower($_SERVER['REQUEST_METHOD']).' '.$_SERVER['REQUEST_URI'];
-
-                       foreach ($_SERVER as $k => $v) {
-                               if (strpos($k, 'HTTP_') === 0) {
-                                       $field = str_replace('_', '-', strtolower(substr($k, 5)));
-                                       $headers[$field] = $v;
-                               }
+               foreach ($_SERVER as $k => $v) {
+                       if (strpos($k, 'HTTP_') === 0) {
+                               $field = str_replace('_', '-', strtolower(substr($k, 5)));
+                               $headers[$field] = $v;
                        }
                }
 
                $sig_block = null;
 
-               if (array_key_exists('signature', $headers)) {
-                       $sig_block = self::parseSigheader($headers['signature']);
-               } elseif (array_key_exists('authorization', $headers)) {
-                       $sig_block = self::parseSigheader($headers['authorization']);
-               }
+               $sig_block = self::parseSigheader($headers['authorization']);
 
                if (!$sig_block) {
                        logger('no signature provided.');
                        return $result;
                }
 
-               // Warning: This log statement includes binary data
-               // logger('sig_block: ' . print_r($sig_block,true), LOGGER_DATA);
-
                $result['header_signed'] = true;
 
                $signed_headers = $sig_block['headers'];
@@ -112,13 +71,7 @@ class HTTPSignature
 
                $signed_data = rtrim($signed_data, "\n");
 
-               $algorithm = null;
-               if ($sig_block['algorithm'] === 'rsa-sha256') {
-                       $algorithm = 'sha256';
-               }
-               if ($sig_block['algorithm'] === 'rsa-sha512') {
-                       $algorithm = 'sha512';
-               }
+               $algorithm = 'sha512';
 
                if ($key && function_exists($key)) {
                        $result['signer'] = $sig_block['keyId'];
@@ -127,12 +80,6 @@ class HTTPSignature
 
                logger('Got keyID ' . $sig_block['keyId']);
 
-               // We don't use Activity Pub at the moment.
-//             if (!$key) {
-//                     $result['signer'] = $sig_block['keyId'];
-//                     $key = self::getActivitypubKey($sig_block['keyId']);
-//             }
-
                if (!$key) {
                        return $result;
                }
@@ -149,130 +96,39 @@ class HTTPSignature
                        $result['header_valid'] = true;
                }
 
-               if (in_array('digest', $signed_headers)) {
-                       $result['content_signed'] = true;
-                       $digest = explode('=', $headers['digest']);
-
-                       if ($digest[0] === 'SHA-256') {
-                               $hashalg = 'sha256';
-                       }
-                       if ($digest[0] === 'SHA-512') {
-                               $hashalg = 'sha512';
-                       }
-
-                       // The explode operation will have stripped the '=' padding, so compare against unpadded base64.
-                       if (rtrim(base64_encode(hash($hashalg, $body, true)), '=') === $digest[1]) {
-                               $result['content_valid'] = true;
-                       }
-               }
-
-               logger('Content_Valid: ' . $result['content_valid']);
-
                return $result;
        }
 
-       /**
-        * Fetch the public key for Activity Pub contact.
-        *
-        * @param string|int The identifier (contact addr or contact ID).
-        * @return string|boolean The public key or false on failure.
-        */
-       private static function getActivitypubKey($id)
-       {
-               if (strpos($id, 'acct:') === 0) {
-                       $contact = DBA::selectFirst('contact', ['pubkey'], ['uid' => 0, 'addr' => str_replace('acct:', '', $id)]);
-               } else {
-                       $contact = DBA::selectFirst('contact', ['pubkey'], ['id' => $id, 'network' => 'activitypub']);
-               }
-
-               if (DBA::isResult($contact)) {
-                       return $contact['pubkey'];
-               }
-
-               if(function_exists('as_fetch')) {
-                       $r = as_fetch($id);
-               }
-
-               if ($r) {
-                       $j = json_decode($r, true);
-
-                       if (array_key_exists('publicKey', $j) && array_key_exists('publicKeyPem', $j['publicKey'])) {
-                               if ((array_key_exists('id', $j['publicKey']) && $j['publicKey']['id'] !== $id) && $j['id'] !== $id) {
-                                       return false;
-                               }
-
-                               return $j['publicKey']['publicKeyPem'];
-                       }
-               }
-
-               return false;
-       }
-
        /**
         * @brief
         *
-        * @param string  $request
         * @param array   $head
         * @param string  $prvkey
         * @param string  $keyid (optional, default 'Key')
-        * @param boolean $send_headers (optional, default false)
-        *   If set send a HTTP header
-        * @param boolean $auth (optional, default false)
-        * @param string  $alg (optional, default 'sha256')
-        * @param string  $crypt_key (optional, default null)
-        * @param string  $crypt_algo (optional, default 'aes256ctr')
         *
         * @return array
         */
-       public static function createSig($request, $head, $prvkey, $keyid = 'Key', $send_headers = false, $auth = false, $alg = 'sha256', $crypt_key = null, $crypt_algo = 'aes256ctr')
+       public static function createSig($head, $prvkey, $keyid = 'Key')
        {
                $return_headers = [];
 
-               if ($alg === 'sha256') {
-                       $algorithm = 'rsa-sha256';
-               }
+               $alg = 'sha512';
+               $algorithm = 'rsa-sha512';
 
-               if ($alg === 'sha512') {
-                       $algorithm = 'rsa-sha512';
-               }
-
-               $x = self::sign($request, $head, $prvkey, $alg);
+               $x = self::sign($head, $prvkey, $alg);
 
                $headerval = 'keyId="' . $keyid . '",algorithm="' . $algorithm
                        . '",headers="' . $x['headers'] . '",signature="' . $x['signature'] . '"';
 
-               if ($crypt_key) {
-                       $x = Crypto::encapsulate($headerval, $crypt_key, $crypt_algo);
-                       $headerval = 'iv="' . $x['iv'] . '",key="' . $x['key'] . '",alg="' . $x['alg'] . '",data="' . $x['data'] . '"';
-               }
-
-               if ($auth) {
-                       $sighead = 'Authorization: Signature ' . $headerval;
-               } else {
-                       $sighead = 'Signature: ' . $headerval;
-               }
+               $sighead = 'Authorization: Signature ' . $headerval;
 
                if ($head) {
                        foreach ($head as $k => $v) {
-                               if ($send_headers) {
-                                       // This is for ActivityPub implementation.
-                                       // Since the Activity Pub implementation isn't
-                                       // ready at the moment, we comment it out.
-                                       // header($k . ': ' . $v);
-                               } else {
-                                       $return_headers[] = $k . ': ' . $v;
-                               }
+                               $return_headers[] = $k . ': ' . $v;
                        }
                }
 
-               if ($send_headers) {
-                       // This is for ActivityPub implementation.
-                       // Since the Activity Pub implementation isn't
-                       // ready at the moment, we comment it out.
-                       // header($sighead);
-               } else {
-                       $return_headers[] = $sighead;
-               }
+               $return_headers[] = $sighead;
 
                return $return_headers;
        }
@@ -280,35 +136,27 @@ class HTTPSignature
        /**
         * @brief
         *
-        * @param string $request
         * @param array  $head
         * @param string $prvkey
         * @param string $alg (optional) default 'sha256'
         *
         * @return array
         */
-       private static function sign($request, $head, $prvkey, $alg = 'sha256')
+       private static function sign($head, $prvkey, $alg = 'sha256')
        {
                $ret = [];
                $headers = '';
                $fields  = '';
 
-               if ($request) {
-                       $headers = '(request-target)' . ': ' . trim($request) . "\n";
-                       $fields = '(request-target)';
-               }
-
-               if ($head) {
-                       foreach ($head as $k => $v) {
-                               $headers .= strtolower($k) . ': ' . trim($v) . "\n";
-                               if ($fields) {
-                                       $fields .= ' ';
-                               }
-                               $fields .= strtolower($k);
+               foreach ($head as $k => $v) {
+                       $headers .= strtolower($k) . ': ' . trim($v) . "\n";
+                       if ($fields) {
+                               $fields .= ' ';
                        }
-                       // strip the trailing linefeed
-                       $headers = rtrim($headers, "\n");
+                       $fields .= strtolower($k);
                }
+               // strip the trailing linefeed
+               $headers = rtrim($headers, "\n");
 
                $sig = base64_encode(Crypto::rsaSign($headers, $prvkey, $alg));
 
@@ -405,4 +253,155 @@ class HTTPSignature
 
                return '';
        }
+
+       /**
+        * Functions for ActivityPub
+        */
+
+       public static function transmit($data, $target, $uid)
+       {
+               $owner = User::getOwnerDataById($uid);
+
+               if (!$owner) {
+                       return;
+               }
+
+               $content = json_encode($data, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+
+               // Header data that is about to be signed.
+               $host = parse_url($target, PHP_URL_HOST);
+               $path = parse_url($target, PHP_URL_PATH);
+               $digest = 'SHA-256=' . base64_encode(hash('sha256', $content, true));
+               $content_length = strlen($content);
+
+               $headers = ['Content-Length: ' . $content_length, 'Digest: ' . $digest, 'Host: ' . $host];
+
+               $signed_data = "(request-target): post " . $path . "\ncontent-length: " . $content_length . "\ndigest: " . $digest . "\nhost: " . $host;
+
+               $signature = base64_encode(Crypto::rsaSign($signed_data, $owner['uprvkey'], 'sha256'));
+
+               $headers[] = 'Signature: keyId="' . $owner['url'] . '#main-key' . '",algorithm="rsa-sha256",headers="(request-target) content-length digest host",signature="' . $signature . '"';
+
+               $headers[] = 'Content-Type: application/activity+json';
+
+               Network::post($target, $content, $headers);
+               $return_code = BaseObject::getApp()->get_curl_code();
+
+               logger('Transmit to ' . $target . ' returned ' . $return_code);
+       }
+
+       public static function getSigner($content, $http_headers)
+       {
+               $object = json_decode($content, true);
+
+               if (empty($object)) {
+                       return false;
+               }
+
+               $actor = JsonLD::fetchElement($object, 'actor', 'id');
+
+               $headers = [];
+               $headers['(request-target)'] = strtolower($http_headers['REQUEST_METHOD']) . ' ' . $http_headers['REQUEST_URI'];
+
+               // First take every header
+               foreach ($http_headers as $k => $v) {
+                       $field = str_replace('_', '-', strtolower($k));
+                       $headers[$field] = $v;
+               }
+
+               // Now add every http header
+               foreach ($http_headers as $k => $v) {
+                       if (strpos($k, 'HTTP_') === 0) {
+                               $field = str_replace('_', '-', strtolower(substr($k, 5)));
+                               $headers[$field] = $v;
+                       }
+               }
+
+               $sig_block = self::parseSigHeader($http_headers['HTTP_SIGNATURE']);
+
+               if (empty($sig_block) || empty($sig_block['headers']) || empty($sig_block['keyId'])) {
+                       return false;
+               }
+
+               $signed_data = '';
+               foreach ($sig_block['headers'] as $h) {
+                       if (array_key_exists($h, $headers)) {
+                               $signed_data .= $h . ': ' . $headers[$h] . "\n";
+                       }
+               }
+               $signed_data = rtrim($signed_data, "\n");
+
+               if (empty($signed_data)) {
+                       return false;
+               }
+
+               $algorithm = null;
+
+               if ($sig_block['algorithm'] === 'rsa-sha256') {
+                       $algorithm = 'sha256';
+               }
+
+               if ($sig_block['algorithm'] === 'rsa-sha512') {
+                       $algorithm = 'sha512';
+               }
+
+               if (empty($algorithm)) {
+                       return false;
+               }
+
+               $key = self::fetchKey($sig_block['keyId'], $actor);
+
+               if (empty($key)) {
+                       return false;
+               }
+
+               if (!Crypto::rsaVerify($signed_data, $sig_block['signature'], $key['pubkey'], $algorithm)) {
+                       return false;
+               }
+
+               // Check the digest when it is part of the signed data
+               if (in_array('digest', $sig_block['headers'])) {
+                       $digest = explode('=', $headers['digest'], 2);
+                       if ($digest[0] === 'SHA-256') {
+                               $hashalg = 'sha256';
+                       }
+                       if ($digest[0] === 'SHA-512') {
+                               $hashalg = 'sha512';
+                       }
+
+                       /// @todo add all hashes from the rfc
+
+                       if (!empty($hashalg) && base64_encode(hash($hashalg, $content, true)) != $digest[1]) {
+                               return false;
+                       }
+               }
+
+               // Check the content-length when it is part of the signed data
+               if (in_array('content-length', $sig_block['headers'])) {
+                       if (strlen($content) != $headers['content-length']) {
+                               return false;
+                       }
+               }
+
+               return $key['url'];
+       }
+
+       private static function fetchKey($id, $actor)
+       {
+               $url = (strpos($id, '#') ? substr($id, 0, strpos($id, '#')) : $id);
+
+               $profile = ActivityPub::fetchprofile($url);
+               if (!empty($profile)) {
+                       logger('Taking key from id ' . $id, LOGGER_DEBUG);
+                       return ['url' => $url, 'pubkey' => $profile['pubkey']];
+               } elseif ($url != $actor) {
+                       $profile = ActivityPub::fetchprofile($actor);
+                       if (!empty($profile)) {
+                               logger('Taking key from actor ' . $actor, LOGGER_DEBUG);
+                               return ['url' => $actor, 'pubkey' => $profile['pubkey']];
+                       }
+               }
+
+               return false;
+       }
 }
diff --git a/src/Util/JsonLD.php b/src/Util/JsonLD.php
new file mode 100644 (file)
index 0000000..6008967
--- /dev/null
@@ -0,0 +1,118 @@
+<?php
+/**
+ * @file src/Util/JsonLD.php
+ */
+namespace Friendica\Util;
+
+use Friendica\Core\Cache;
+use digitalbazaar\jsonld as DBJsonLD;
+
+/**
+ * @brief This class contain methods to work with JsonLD data
+ */
+class JsonLD
+{
+       public static function documentLoader($url)
+       {
+               $recursion = 0;
+
+               $x = debug_backtrace();
+               if ($x) {
+                       foreach ($x as $n) {
+                               if ($n['function'] === __FUNCTION__)  {
+                                       $recursion ++;
+                               }
+                       }
+               }
+
+               if ($recursion > 5) {
+                       logger('jsonld bomb detected at: ' . $url);
+                       exit();
+               }
+
+               $result = Cache::get('documentLoader:' . $url);
+               if (!is_null($result)) {
+                       return $result;
+               }
+
+               $data = jsonld_default_document_loader($url);
+               Cache::set('documentLoader:' . $url, $data, CACHE_DAY);
+               return $data;
+       }
+
+       private static function objectify($element)
+       {
+               if (is_array($element)) {
+                       $keys = array_keys($element);
+                       if (is_int(array_pop($keys))) {
+                               return array_map('objectify', $element);
+                       } else {
+                               return (object)array_map('objectify', $element);
+                       }
+               } else {
+                       return $element;
+               }
+       }
+
+       public static function normalize($json)
+       {
+               jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
+
+//             $jsonobj = array_map('Friendica\Util\JsonLD::objectify', $json);
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+
+               return jsonld_normalize($jsonobj, array('algorithm' => 'URDNA2015', 'format' => 'application/nquads'));
+       }
+
+       public static function compact($json)
+       {
+               jsonld_set_document_loader('Friendica\Util\JsonLD::documentLoader');
+
+               $context = (object)['as' => 'https://www.w3.org/ns/activitystreams',
+                       'w3sec' => 'https://w3id.org/security',
+                       'ostatus' => (object)['@id' => 'http://ostatus.org#', '@type' => '@id'],
+                       'vcard' => (object)['@id' => 'http://www.w3.org/2006/vcard/ns#', '@type' => '@id'],
+                       'uuid' => (object)['@id' => 'http://schema.org/identifier', '@type' => '@id']];
+
+               $jsonobj = json_decode(json_encode($json, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE));
+
+               $compacted = jsonld_compact($jsonobj, $context);
+
+               return json_decode(json_encode($compacted, JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE), true);
+       }
+
+       public static function fetchElement($array, $element, $key, $type = null, $type_value = null)
+       {
+               if (empty($array)) {
+                       return false;
+               }
+
+               if (empty($array[$element])) {
+                       return false;
+               }
+
+               if (is_string($array[$element])) {
+                       return $array[$element];
+               }
+
+               if (is_null($type_value)) {
+                       if (!empty($array[$element][$key])) {
+                               return $array[$element][$key];
+                       }
+
+                       if (!empty($array[$element][0][$key])) {
+                               return $array[$element][0][$key];
+                       }
+
+                       return false;
+               }
+
+               if (!empty($array[$element][$key]) && !empty($array[$element][$type]) && ($array[$element][$type] == $type_value)) {
+                       return $array[$element][$key];
+               }
+
+               /// @todo Add array search
+
+               return false;
+       }
+}
diff --git a/src/Util/LDSignature.php b/src/Util/LDSignature.php
new file mode 100644 (file)
index 0000000..6db66a5
--- /dev/null
@@ -0,0 +1,105 @@
+<?php
+
+namespace Friendica\Util;
+
+use Friendica\Util\JsonLD;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Protocol\ActivityPub;
+
+class LDSignature
+{
+       public static function isSigned($data)
+       {
+               return !empty($data['signature']);
+       }
+
+       public static function getSigner($data)
+       {
+               if (!self::isSigned($data)) {
+                       return false;
+               }
+
+/*
+               $creator = $data['signature']['creator'];
+               $actor = JsonLD::fetchElement($data, 'actor', 'id');
+
+               $url = (strpos($creator, '#') ? substr($creator, 0, strpos($creator, '#')) : $creator);
+
+               $profile = ActivityPub::fetchprofile($url);
+               if (!empty($profile)) {
+                       logger('Taking key from creator ' . $creator, LOGGER_DEBUG);
+               } elseif ($url != $actor) {
+                       $profile = ActivityPub::fetchprofile($actor);
+                       if (empty($profile)) {
+                               return false;
+                       }
+                       logger('Taking key from actor ' . $actor, LOGGER_DEBUG);
+               }
+
+*/
+               $actor = JsonLD::fetchElement($data, 'actor', 'id');
+               if (empty($actor)) {
+                       return false;
+               }
+
+               $profile = ActivityPub::fetchprofile($actor);
+               if (empty($profile['pubkey'])) {
+                       return false;
+               }
+               $pubkey = $profile['pubkey'];
+
+               $ohash = self::hash(self::signable_options($data['signature']));
+               $dhash = self::hash(self::signable_data($data));
+
+               $x = Crypto::rsaVerify($ohash . $dhash, base64_decode($data['signature']['signatureValue']), $pubkey);
+               logger('LD-verify: ' . intval($x));
+
+               if (empty($x)) {
+                       return false;
+               } else {
+                       return $actor;
+               }
+       }
+
+       public static function sign($data, $owner)
+       {
+               $options = [
+                       'type' => 'RsaSignature2017',
+                       'nonce' => random_string(64),
+                       'creator' => $owner['url'] . '#main-key',
+                       'created' => DateTimeFormat::utcNow(DateTimeFormat::ATOM)
+               ];
+
+               $ohash = self::hash(self::signable_options($options));
+               $dhash = self::hash(self::signable_data($data));
+               $options['signatureValue'] = base64_encode(Crypto::rsaSign($ohash . $dhash, $owner['uprvkey']));
+
+               return array_merge($data, ['signature' => $options]);
+       }
+
+
+       private static function signable_data($data)
+       {
+               unset($data['signature']);
+               return $data;
+       }
+
+
+       private static function signable_options($options)
+       {
+               $newopts = ['@context' => 'https://w3id.org/identity/v1'];
+               if (!empty($options)) {
+                       foreach ($options as $k => $v) {
+                               if (!in_array($k, ['type', 'id', 'signatureValue'])) {
+                                       $newopts[$k] = $v;
+                               }
+                       }
+               }
+               return $newopts;
+       }
+
+       private static function hash($obj)
+       {
+               return hash('sha256', JsonLD::normalize($obj));
+       }
+}
diff --git a/src/Worker/APDelivery.php b/src/Worker/APDelivery.php
new file mode 100644 (file)
index 0000000..493bb5f
--- /dev/null
@@ -0,0 +1,28 @@
+<?php
+/**
+ * @file src/Worker/APDelivery.php
+ */
+namespace Friendica\Worker;
+
+use Friendica\BaseObject;
+use Friendica\Protocol\ActivityPub;
+use Friendica\Model\Item;
+use Friendica\Util\HTTPSignature;
+
+class APDelivery extends BaseObject
+{
+       public static function execute($cmd, $item_id, $inbox, $uid)
+       {
+               logger('Invoked: ' . $cmd . ': ' . $item_id . ' to ' . $inbox, LOGGER_DEBUG);
+
+               if ($cmd == Delivery::MAIL) {
+               } elseif ($cmd == Delivery::SUGGESTION) {
+               } elseif ($cmd == Delivery::RELOCATION) {
+               } else {
+                       $data = ActivityPub::createActivityFromItem($item_id);
+                       HTTPSignature::transmit($data, $inbox, $uid);
+               }
+
+               return;
+       }
+}
index 61eaba388b2d365a58829bcf4abddcb1bda54874..b457b7800851177c4254f505e4ef515c5c290992 100644 (file)
@@ -16,6 +16,7 @@ use Friendica\Model\Item;
 use Friendica\Model\PushSubscriber;
 use Friendica\Model\User;
 use Friendica\Network\Probe;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Protocol\Diaspora;
 use Friendica\Protocol\OStatus;
 use Friendica\Protocol\Salmon;
@@ -413,6 +414,24 @@ class Notifier
                        }
                }
 
+               $inboxes = [];
+
+               if ($target_item['origin']) {
+                       $inboxes = ActivityPub::fetchTargetInboxes($target_item, $uid);
+               }
+
+               if ($parent['origin']) {
+                       $parent_inboxes = ActivityPub::fetchTargetInboxes($parent, $uid);
+                       $inboxes = array_merge($inboxes, $parent_inboxes);
+               }
+
+               foreach ($inboxes as $inbox) {
+                       logger('Deliver ' . $item_id .' to ' . $inbox .' via ActivityPub', LOGGER_DEBUG);
+
+                       Worker::add(['priority' => $a->queue['priority'], 'created' => $a->queue['created'], 'dont_fork' => true],
+                                       'APDelivery', $cmd, $item_id, $inbox, $uid);
+               }
+
                // send salmon slaps to mentioned remote tags (@foo@example.com) in OStatus posts
                // They are especially used for notifications to OStatus users that don't follow us.
                if (!Config::get('system', 'dfrn_only') && count($url_recipients) && ($public_message || $push_notify) && $normal_mode) {
index f2919e4a750e148e0e8531171d9b786e8a1dc3c5..67362917c379418ed2d98652e332e99b351ffd58 100644 (file)
@@ -29,13 +29,13 @@ class UpdateGContact
                        return;
                }
 
-               if (!in_array($r[0]["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+               if (!in_array($r[0]["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                        return;
                }
 
                $data = Probe::uri($r[0]["url"]);
 
-               if (!in_array($data["network"], [Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
+               if (!in_array($data["network"], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS])) {
                        if ($r[0]["server_url"] != "") {
                                PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
                        }