bitPickups/friendica_2020-09-1_sharedHosting
1
0
Fork 0
Code Pull requests Activity

Added AP to many network conditions / enabling inbox processing

Browse source
This commit is contained in:
Michael 2018-09-14 16:51:32 +00:00
parent 7b45bdea17
commit 61e2c7d20d
14 changed files with 178 additions and 79 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/conversation.php
View file

@ -556,7 +556,7 @@ function conversation(App $a, array $items, $mode, $update, $preview = false, $o
if (in_array($mode, ['community', 'contacts'])) { if (in_array($mode, ['community', 'contacts'])) {
$writable = true; $writable = true;
} else { } 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()) { if (!local_user()) {
@ -807,7 +807,7 @@ function conversation_add_children(array $parents, $block_authors, $order, $uid)
foreach ($items as $index => $item) { foreach ($items as $index => $item) {
if ($item['uid'] == 0) { 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)) && 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']); $menu[L10n::t('Connect/Follow')] = 'follow?url=' . urlencode($item['author-link']);
} }
} else { } else {

10
mod/contacts.php
View file

@ -537,7 +537,7 @@ function contacts_content(App $a, $update = 0)
$relation_text = ''; $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 = ""; $relation_text = "";
} }
@ -559,7 +559,7 @@ function contacts_content(App $a, $update = 0)
} }
$lblsuggest = (($contact['network'] === Protocol::DFRN) ? L10n::t('Suggest friends') : ''); $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"])); $nettype = L10n::t('Network type: %s', ContactSelector::networkToName($contact['network'], $contact["url"]));
@ -968,7 +968,7 @@ function contact_conversations(App $a, $contact_id, $update)
$profiledata = Contact::getDetailsByURL($contact["url"]); $profiledata = Contact::getDetailsByURL($contact["url"]);
if (local_user()) { 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"]); $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
} }
} }
@ -992,7 +992,7 @@ function contact_posts(App $a, $contact_id)
$profiledata = Contact::getDetailsByURL($contact["url"]); $profiledata = Contact::getDetailsByURL($contact["url"]);
if (local_user()) { 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"]); $profiledata["remoteconnect"] = System::baseUrl()."/follow?url=".urlencode($profiledata["url"]);
} }
} }
@ -1073,7 +1073,7 @@ function _contact_detail_for_template(array $rr)
*/ */
function contact_actions($contact) 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 = []; $contact_actions = [];
// Provide friend suggestion only for Friendica contacts // Provide friend suggestion only for Friendica contacts

2
mod/dirfind.php
View file

@ -54,7 +54,7 @@ function dirfind_content(App $a, $prefix = "") {
if ((valid_email($search) && Network::isEmailDomainValid($search)) || if ((valid_email($search) && Network::isEmailDomainValid($search)) ||
(substr(normalise_link($search), 0, 7) == "http://")) { (substr(normalise_link($search), 0, 7) == "http://")) {
$user_data = Probe::uri($search); $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]));
} }
} }

33
src/Content/ContactSelector.php
View file

@ -75,21 +75,22 @@ class ContactSelector
public static function networkToName($s, $profile = "") public static function networkToName($s, $profile = "")
{ {
$nets = [ $nets = [
Protocol::DFRN => L10n::t('Friendica'), Protocol::DFRN => L10n::t('Friendica'),
Protocol::OSTATUS => L10n::t('OStatus'), Protocol::OSTATUS => L10n::t('OStatus'),
Protocol::FEED => L10n::t('RSS/Atom'), Protocol::FEED => L10n::t('RSS/Atom'),
Protocol::MAIL => L10n::t('Email'), Protocol::MAIL => L10n::t('Email'),
Protocol::DIASPORA => L10n::t('Diaspora'), Protocol::DIASPORA => L10n::t('Diaspora'),
Protocol::ZOT => L10n::t('Zot!'), Protocol::ZOT => L10n::t('Zot!'),
Protocol::LINKEDIN => L10n::t('LinkedIn'), Protocol::LINKEDIN => L10n::t('LinkedIn'),
Protocol::XMPP => L10n::t('XMPP/IM'), Protocol::XMPP => L10n::t('XMPP/IM'),
Protocol::MYSPACE => L10n::t('MySpace'), Protocol::MYSPACE => L10n::t('MySpace'),
Protocol::GPLUS => L10n::t('Google+'), Protocol::GPLUS => L10n::t('Google+'),
Protocol::PUMPIO => L10n::t('pump.io'), Protocol::PUMPIO => L10n::t('pump.io'),
Protocol::TWITTER => L10n::t('Twitter'), Protocol::TWITTER => L10n::t('Twitter'),
Protocol::DIASPORA2 => L10n::t('Diaspora Connector'), Protocol::DIASPORA2 => L10n::t('Diaspora Connector'),
Protocol::STATUSNET => L10n::t('GNU Social Connector'), Protocol::STATUSNET => L10n::t('GNU Social Connector'),
Protocol::PNUT => L10n::t('pnut'), Protocol::ACTIVITYPUB => L10n::t('ActivityPub'),
Protocol::PNUT => L10n::t('pnut'),
]; ];
Addon::callHooks('network_to_name', $nets); Addon::callHooks('network_to_name', $nets);
@ -99,7 +100,7 @@ class ContactSelector
$networkname = str_replace($search, $replace, $s); $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` $r = DBA::fetchFirst("SELECT `gserver`.`platform` FROM `gcontact`
INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url` INNER JOIN `gserver` ON `gserver`.`nurl` = `gcontact`.`server_url`
WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile)); WHERE `gcontact`.`nurl` = ? AND `platform` != ''", normalise_link($profile));

5
src/Content/Widget.php
View file

@ -142,10 +142,7 @@ class Widget
$nets = array(); $nets = array();
while ($rr = DBA::fetch($r)) { while ($rr = DBA::fetch($r)) {
/// @TODO If 'network' is not there, this triggers an E_NOTICE $nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
if ($rr['network']) {
$nets[] = array('ref' => $rr['network'], 'name' => ContactSelector::networkToName($rr['network']), 'selected' => (($selected == $rr['network']) ? 'selected' : '' ));
}
} }
DBA::close($r); DBA::close($r);

6
src/Model/Contact.php
View file

@ -775,7 +775,7 @@ class Contact extends BaseObject
} }
if ((empty($profile["addr"]) || empty($profile["name"])) && (defaults($profile, "gid", 0) != 0) 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"]); Worker::add(PRIORITY_LOW, "UpdateGContact", $profile["gid"]);
} }
@ -1088,7 +1088,7 @@ class Contact extends BaseObject
} }
// Last try in gcontact for unsupported networks // 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) { if ($uid != 0) {
return 0; return 0;
} }
@ -1327,7 +1327,7 @@ class Contact extends BaseObject
return ''; 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, ""])) {
$sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))"; $sql = "(`item`.`uid` = 0 OR (`item`.`uid` = ? AND NOT `item`.`global`))";
} else { } else {
$sql = "`item`.`uid` = ?"; $sql = "`item`.`uid` = ?";

6
src/Model/Conversation.php
View file

@ -22,6 +22,7 @@ class Conversation
const PARCEL_DIASPORA = 2; const PARCEL_DIASPORA = 2;
const PARCEL_SALMON = 3; const PARCEL_SALMON = 3;
const PARCEL_FEED = 4; // Deprecated const PARCEL_FEED = 4; // Deprecated
const PARCEL_ACTIVITYPUB = 5;
const PARCEL_SPLIT_CONVERSATION = 6; const PARCEL_SPLIT_CONVERSATION = 6;
const PARCEL_TWITTER = 67; const PARCEL_TWITTER = 67;
@ -34,7 +35,7 @@ class Conversation
public static function insert(array $arr) public static function insert(array $arr)
{ {
if (in_array(defaults($arr, 'network', Protocol::PHANTOM), 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()]; $conversation = ['item-uri' => $arr['uri'], 'received' => DateTimeFormat::utcNow()];
if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) { if (isset($arr['parent-uri']) && ($arr['parent-uri'] != $arr['uri'])) {
@ -70,7 +71,8 @@ class Conversation
unset($old_conv['source']); unset($old_conv['source']);
} }
// Update structure data all the time but the source only when its from a better protocol. // 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 (isset($conversation['protocol']) && isset($conversation['source']) && ($old_conv['protocol'] < $conversation['protocol'])
&& ($old_conv['protocol'] != 0) && ($old_conv['protocol'] != self::PARCEL_ACTIVITYPUB)) {
unset($conversation['protocol']); unset($conversation['protocol']);
unset($conversation['source']); unset($conversation['source']);
} }

8
src/Model/Item.php
View file

@ -176,7 +176,7 @@ class Item extends BaseObject
// We can always comment on posts from these networks // We can always comment on posts from these networks
if (array_key_exists('writable', $row) && 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; $row['writable'] = true;
} }
@ -1352,7 +1352,7 @@ class Item extends BaseObject
* We have to check several networks since Friendica posts could be repeated * We have to check several networks since Friendica posts could be repeated
* via OStatus (maybe Diasporsa as well) * 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 (?, ?, ?)", $condition = ["`uri` = ? AND `uid` = ? AND `network` IN (?, ?, ?)",
trim($item['uri']), $item['uid'], trim($item['uri']), $item['uid'],
Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS]; Protocol::DIASPORA, Protocol::DFRN, Protocol::OSTATUS];
@ -2053,7 +2053,7 @@ class Item extends BaseObject
// Only distribute public items from native networks // Only distribute public items from native networks
$condition = ['id' => $itemid, 'uid' => 0, $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]; 'visible' => true, 'deleted' => false, 'moderated' => false, 'private' => false];
$item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]); $item = self::selectFirst(self::ITEM_FIELDLIST, ['id' => $itemid]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
@ -2175,7 +2175,7 @@ class Item extends BaseObject
} }
// is it an entry from a connector? Only add an entry for natively connected networks // 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; return;
} }

6
src/Module/Inbox.php
View file

@ -32,6 +32,10 @@ class Inbox extends BaseModule
$tempfile = tempnam(get_temppath(), $filename); $tempfile = tempnam(get_temppath(), $filename);
file_put_contents($tempfile, json_encode(['header' => $_SERVER, 'body' => $postdata])); file_put_contents($tempfile, json_encode(['header' => $_SERVER, 'body' => $postdata]));
System::httpExit(200); logger('Incoming message stored under ' . $tempfile);
ActivityPub::processInbox($postdata, $_SERVER);
System::httpExit(202);
} }
} }

2
src/Network/Probe.php
View file

@ -331,6 +331,8 @@ class Probe
if ($network != Protocol::ACTIVITYPUB) { if ($network != Protocol::ACTIVITYPUB) {
$data = self::detect($uri, $network, $uid); $data = self::detect($uri, $network, $uid);
} else {
$data = null;
} }
if (in_array(defaults($data, 'network', ''), ['', Protocol::PHANTOM])) { if (in_array(defaults($data, 'network', ''), ['', Protocol::PHANTOM])) {

163
src/Protocol/ActivityPub.php
View file

@ -10,11 +10,14 @@ use Friendica\BaseObject;
use Friendica\Util\Network; use Friendica\Util\Network;
use Friendica\Util\HTTPSignature; use Friendica\Util\HTTPSignature;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Model\Conversation;
use Friendica\Model\Contact;
use Friendica\Model\Item; use Friendica\Model\Item;
use Friendica\Model\User; use Friendica\Model\User;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Friendica\Util\Crypto; use Friendica\Util\Crypto;
use Friendica\Content\Text\BBCode; use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Network\Probe; use Friendica\Network\Probe;
/** /**
@ -474,6 +477,25 @@ class ActivityPub
return $profile; return $profile;
} }
public static function processInbox($body, $header)
{
logger('Incoming message', LOGGER_DEBUG);
if (!self::verifySignature($body, $header)) {
logger('Invalid signature, message will be discarded.', LOGGER_DEBUG);
return;
}
$activity = json_decode($body, true);
if (!is_array($activity)) {
logger('Invalid body.', LOGGER_DEBUG);
return;
}
self::processActivity($activity, $body);
}
public static function fetchOutbox($url) public static function fetchOutbox($url)
{ {
$data = self::fetchContent($url); $data = self::fetchContent($url);
@ -493,26 +515,31 @@ class ActivityPub
} }
foreach ($items as $activity) { foreach ($items as $activity) {
self::processActivity($activity, $url); self::processActivity($activity);
} }
} }
function processActivity($activity, $url) function processActivity($activity, $body = '')
{ {
if (empty($activity['type'])) { if (empty($activity['type'])) {
logger('Empty type', LOGGER_DEBUG);
return; return;
} }
if (empty($activity['object'])) { if (empty($activity['object'])) {
logger('Empty object', LOGGER_DEBUG);
return; return;
} }
if (empty($activity['actor'])) { if (empty($activity['actor'])) {
logger('Empty actor', LOGGER_DEBUG);
return; return;
} }
$actor = self::processElement($activity, 'actor', 'id'); $actor = self::processElement($activity, 'actor', 'id');
if (empty($actor)) { if (empty($actor)) {
logger('Empty actor - 2', LOGGER_DEBUG);
return; return;
} }
@ -521,11 +548,13 @@ class ActivityPub
} elseif (!empty($activity['object']['id'])) { } elseif (!empty($activity['object']['id'])) {
$object_url = $activity['object']['id']; $object_url = $activity['object']['id'];
} else { } else {
logger('No object found', LOGGER_DEBUG);
return; return;
} }
$receivers = self::getReceivers($activity); $receivers = self::getReceivers($activity);
if (empty($receivers)) { if (empty($receivers)) {
logger('No receivers found', LOGGER_DEBUG);
return; return;
} }
@ -545,6 +574,7 @@ class ActivityPub
// To-Do? // To-Do?
unset($activity['context']); unset($activity['context']);
unset($activity['location']); unset($activity['location']);
unset($activity['signature']);
// handled // handled
unset($activity['to']); unset($activity['to']);
@ -559,17 +589,19 @@ class ActivityPub
unset($activity['instrument']); unset($activity['instrument']);
unset($activity['inReplyTo']); unset($activity['inReplyTo']);
/*
if (!empty($activity)) { if (!empty($activity)) {
echo "Activity\n"; echo "Activity\n";
print_r($activity); print_r($activity);
die($url."\n"); die($url."\n");
} }
*/
$activity = $structure; $activity = $structure;
// ---------------------------------- // ----------------------------------
$item = self::fetchObject($object_url, $url); $item = self::fetchObject($object_url, $activity['object']);
if (empty($item)) { if (empty($item)) {
logger("Object data couldn't be processed", LOGGER_DEBUG);
return; return;
} }
@ -579,28 +611,32 @@ class ActivityPub
$item['receiver'] = array_merge($item['receiver'], $receivers); $item['receiver'] = array_merge($item['receiver'], $receivers);
logger('Processing activity: ' . $activity['type'], LOGGER_DEBUG);
switch ($activity['type']) { switch ($activity['type']) {
case 'Create': case 'Create':
case 'Update': case 'Update':
self::createItem($item); self::createItem($item, $body);
break; break;
case 'Announce': case 'Announce':
self::announceItem($item); self::announceItem($item, $body);
break; break;
case 'Like': case 'Like':
case 'Dislike': case 'Dislike':
self::activityItem($item); self::activityItem($item, $body);
break; break;
case 'Follow': case 'Follow':
break; break;
default: default:
echo "Unknown activity: ".$activity['type']."\n"; logger('Unknown activity: ' . $activity['type'], LOGGER_DEBUG);
/* echo "Unknown activity: ".$activity['type']."\n";
print_r($item); print_r($item);
die(); die();
*/
break; break;
} }
} }
@ -626,11 +662,11 @@ class ActivityPub
} }
$condition = ['self' => true, 'nurl' => normalise_link($receiver)]; $condition = ['self' => true, 'nurl' => normalise_link($receiver)];
$contact = DBA::selectFirst('contact', ['id'], $condition); $contact = DBA::selectFirst('contact', ['uid'], $condition);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
continue; continue;
} }
$receivers[$receiver] = $contact['id']; $receivers[$receiver] = $contact['uid'];
} }
} }
return $receivers; return $receivers;
@ -653,67 +689,78 @@ class ActivityPub
if (!empty($activity['instrument'])) { if (!empty($activity['instrument'])) {
$item['service'] = self::processElement($activity, 'instrument', 'name', 'Service'); $item['service'] = self::processElement($activity, 'instrument', 'name', 'Service');
} }
/*
// Remove all "null" fields // Remove all "null" fields
foreach ($item as $field => $content) { foreach ($item as $field => $content) {
if (is_null($content)) { if (is_null($content)) {
unset($item[$field]); unset($item[$field]);
} }
} }
*/
return $item; return $item;
} }
private static function fetchObject($object_url, $url) private static function fetchObject($object_url, $object = [])
{ {
$data = self::fetchContent($object_url); $data = self::fetchContent($object_url);
if (empty($data)) { if (empty($data)) {
return false; $data = $object;
if (empty($data)) {
logger('Empty content');
return false;
} else {
logger('Using provided object');
}
} }
if (empty($data['type'])) { if (empty($data['type'])) {
logger('Empty type');
return false; return false;
} else { } else {
$type = $data['type']; $type = $data['type'];
logger('Type ' . $type);
} }
if (in_array($type, ['Note', 'Article', 'Video'])) { if (in_array($type, ['Note', 'Article', 'Video'])) {
$common = self::processCommonData($data, $url); $common = self::processCommonData($data);
} }
switch ($type) { switch ($type) {
case 'Note': case 'Note':
return array_merge($common, self::processNote($data, $url)); return array_merge($common, self::processNote($data));
case 'Article': case 'Article':
return array_merge($common, self::processArticle($data, $url)); return array_merge($common, self::processArticle($data));
case 'Video': case 'Video':
return array_merge($common, self::processVideo($data, $url)); return array_merge($common, self::processVideo($data));
case 'Announce': case 'Announce':
if (empty($data['object'])) { if (empty($data['object'])) {
return false; return false;
} }
return self::fetchObject($data['object'], $url); return self::fetchObject($data['object']);
case 'Person': case 'Person':
case 'Tombstone': case 'Tombstone':
break; break;
default: default:
echo "Unknown object type: ".$data['type']."\n"; logger('Unknown object type: ' . $data['type'], LOGGER_DEBUG);
/* echo "Unknown object type: ".$data['type']."\n";
print_r($data); print_r($data);
die($url."\n"); die($url."\n");
*/
break; break;
} }
} }
private static function processCommonData(&$object, $url) private static function processCommonData(&$object)
{ {
if (empty($object['id']) || empty($object['attributedTo'])) { if (empty($object['id']) || empty($object['attributedTo'])) {
return false; return false;
} }
$item = []; $item = [];
$item['type'] = $object['type'];
$item['uri'] = $object['id']; $item['uri'] = $object['id'];
if (!empty($object['inReplyTo'])) { if (!empty($object['inReplyTo'])) {
@ -789,7 +836,7 @@ class ActivityPub
return $item; return $item;
} }
private static function processNote($object, $url) private static function processNote($object)
{ {
$item = []; $item = [];
@ -810,33 +857,33 @@ class ActivityPub
unset($object['quoteUrl']); unset($object['quoteUrl']);
unset($object['statusnetConversationId']); unset($object['statusnetConversationId']);
if (empty($object)) // if (empty($object))
return $item; return $item;
/*
echo "Unknown Note\n"; echo "Unknown Note\n";
print_r($object); print_r($object);
print_r($item); print_r($item);
die($url."\n"); die($url."\n");
*/
return []; return [];
} }
private static function processArticle($object, $url) private static function processArticle($object)
{ {
$item = []; $item = [];
if (empty($object)) // if (empty($object))
return $item; return $item;
/*
echo "Unknown Article\n"; echo "Unknown Article\n";
print_r($object); print_r($object);
print_r($item); print_r($item);
die($url."\n"); die($url."\n");
*/
return []; return [];
} }
private static function processVideo($object, $url) private static function processVideo($object)
{ {
$item = []; $item = [];
@ -857,14 +904,14 @@ class ActivityPub
unset($object['shares']); unset($object['shares']);
unset($object['comments']); unset($object['comments']);
if (empty($object)) // if (empty($object))
return $item; return $item;
/*
echo "Unknown Video\n"; echo "Unknown Video\n";
print_r($object); print_r($object);
print_r($item); print_r($item);
die($url."\n"); die($url."\n");
*/
return []; return [];
} }
@ -903,9 +950,55 @@ class ActivityPub
return false; return false;
} }
private static function createItem($item) private static function createItem($activity, $body)
{ {
// print_r($item); // print_r($activity);
$item = [];
$item['network'] = Protocol::ACTIVITYPUB;
$item['wall'] = 0;
$item['origin'] = 0;
// $item['private'] = 0;
$item['gravity'] = GRAVITY_COMMENT;
$item['author-id'] = Contact::getIdForURL($activity['author'], 0, true);
$item['owner-id'] = Contact::getIdForURL($activity['owner'], 0, true);
$item['uri'] = $activity['uri'];
$item['parent-uri'] = $activity['reply-to-uri'];
$item['verb'] = ACTIVITY_POST; // Todo
$item['object-type'] = ACTIVITY_OBJ_NOTE; // Todo
$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'] = HTML::toBBCode($activity['content']);
$item['location'] = $activity['location'];
// $item['attach'] = $activity['attachments'];
// $item['tag'] = self::constructTagList($activity['tags'], $activity['sensitive']);
$item['app'] = $activity['service'];
$item['plink'] = $activity['alternate-url'];
$item['protocol'] = Conversation::PARCEL_ACTIVITYPUB;
$item['source'] = $body;
// $item[''] = $activity['context'];
$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);
if (!empty($item_id) && ($item['uid'] == 0)) {
Item::distribute($item_id);
}
//print_r($item);
}
// $item[''] = $activity['receiver'];
} }
private static function announceItem($item) private static function announceItem($item)

2
src/Protocol/PortableContact.php
View file

@ -333,7 +333,7 @@ class PortableContact
$server_url = normalise_link(self::detectServer($profile)); $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); logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
return false; return false;
} }

4
src/Worker/Notifier.php
View file

@ -363,9 +363,9 @@ class Notifier
} }
// It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora // It only makes sense to distribute answers to OStatus messages to Friendica and OStatus - but not Diaspora
$networks = [Protocol::OSTATUS, Protocol::DFRN]; $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DFRN];
} else { } else {
$networks = [Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL]; $networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS, Protocol::DFRN, Protocol::DIASPORA, Protocol::MAIL];
} }
} else { } else {
$public_message = false; $public_message = false;

4
src/Worker/UpdateGContact.php
View file

@ -29,13 +29,13 @@ class UpdateGContact
return; 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; return;
} }
$data = Probe::uri($r[0]["url"]); $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"] != "") { if ($r[0]["server_url"] != "") {
PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]); PortableContact::checkServer($r[0]["server_url"], $r[0]["network"]);
} }