use Friendica\BaseObject;
use Friendica\Content\Feature;
-use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
+use Friendica\Content\Text\Plaintext;
+use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
-use Friendica\Core\System;
-use Friendica\Util\HTTPSignature;
use Friendica\Core\Protocol;
-use Friendica\Model\Conversation;
-use Friendica\Model\Contact;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
use Friendica\Model\APContact;
+use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
use Friendica\Model\Item;
+use Friendica\Model\Profile;
+use Friendica\Model\Photo;
use Friendica\Model\Term;
use Friendica\Model\User;
+use Friendica\Protocol\Activity;
+use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
-use Friendica\Content\Text\BBCode;
-use Friendica\Content\Text\Plaintext;
+use Friendica\Util\HTTPSignature;
+use Friendica\Util\Images;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
-use Friendica\Model\Profile;
-use Friendica\Object\Image;
-use Friendica\Protocol\ActivityPub;
-use Friendica\Core\Cache;
use Friendica\Util\Map;
use Friendica\Util\Network;
+use Friendica\Util\XML;
require_once 'include/api.php';
require_once 'mod/share.php';
if (empty($page)) {
$data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
} else {
+ $data['type'] = 'OrderedCollectionPage';
$list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
if (empty($page)) {
$data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
} else {
+ $data['type'] = 'OrderedCollectionPage';
$list = [];
$contacts = DBA::select('contact', ['url'], $condition, ['limit' => [($page - 1) * 100, 100]]);
if (empty($page)) {
$data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
} else {
+ $data['type'] = 'OrderedCollectionPage';
$list = [];
$condition['parent-network'] = Protocol::NATIVE_SUPPORT;
$items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
while ($item = Item::fetch($items)) {
- $object = self::createObjectFromItemID($item['id']);
- unset($object['@context']);
- $list[] = $object;
+ $activity = self::createActivityFromItem($item['id'], true);
+ // Only list "Create" activity objects here, no reshares
+ if (is_array($activity['object']) && ($activity['type'] == 'Create')) {
+ $list[] = $activity['object'];
+ }
}
if (!empty($list)) {
return [];
}
- // On old installations and never changed contacts this might not be filled
- if (empty($contact['avatar'])) {
- $contact['avatar'] = $contact['photo'];
- }
-
$data = ['@context' => ActivityPub::CONTEXT];
$data['id'] = $contact['url'];
$data['diaspora:guid'] = $user['guid'];
'publicKeyPem' => $user['pubkey']];
$data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
$data['icon'] = ['type' => 'Image',
- 'url' => $contact['avatar']];
+ 'url' => $contact['photo']];
$data['generator'] = self::getService();
if (Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
- $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+ $networks = Protocol::FEDERATED;
} else {
// For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
$terms = Term::tagArrayFromItemId($item['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
+ // Directly mention the original author upon a quoted reshare.
+ // Else just ensure that the original author receives the reshare.
+ $announce = self::getAnnounceObject($item);
+ if (!empty($announce['comment'])) {
+ $data['to'][] = $announce['actor']['url'];
+ } elseif (!empty($announce)) {
+ $data['cc'][] = $announce['actor']['url'];
+ }
+
if (!$item['private']) {
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
}
}
} else {
- $receiver_list = Item::enumeratePermissions($item);
+ $receiver_list = Item::enumeratePermissions($item, true);
foreach ($terms as $term) {
$cid = Contact::getIdForURL($term['url'], $item['uid']);
}
}
- $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
- while ($parent = Item::fetch($parents)) {
- if ($parent['gravity'] == GRAVITY_PARENT) {
- $profile = APContact::getByURL($parent['owner-link'], false);
- if (!empty($profile)) {
- if ($item['gravity'] != GRAVITY_PARENT) {
- // Comments to forums are directed to the forum
- // But comments to forums aren't directed to the followers collection
- if ($profile['type'] == 'Group') {
- $data['to'][] = $profile['url'];
+ if (!empty($item['parent'])) {
+ $parents = Item::select(['id', 'author-link', 'owner-link', 'gravity', 'uri'], ['parent' => $item['parent']]);
+ while ($parent = Item::fetch($parents)) {
+ if ($parent['gravity'] == GRAVITY_PARENT) {
+ $profile = APContact::getByURL($parent['owner-link'], false);
+ if (!empty($profile)) {
+ if ($item['gravity'] != GRAVITY_PARENT) {
+ // Comments to forums are directed to the forum
+ // But comments to forums aren't directed to the followers collection
+ if ($profile['type'] == 'Group') {
+ $data['to'][] = $profile['url'];
+ } else {
+ $data['cc'][] = $profile['url'];
+ if (!$item['private'] && !empty($actor_profile['followers'])) {
+ $data['cc'][] = $actor_profile['followers'];
+ }
+ }
} else {
- $data['cc'][] = $profile['url'];
- if (!$item['private']) {
+ // Public thread parent post always are directed to the followers
+ if (!$item['private'] && !$forum_mode) {
$data['cc'][] = $actor_profile['followers'];
}
}
- } else {
- // Public thread parent post always are directed to the followes
- if (!$item['private'] && !$forum_mode) {
- $data['cc'][] = $actor_profile['followers'];
- }
}
}
- }
- // Don't include data from future posts
- if ($parent['id'] >= $last_id) {
- continue;
- }
+ // Don't include data from future posts
+ if ($parent['id'] >= $last_id) {
+ continue;
+ }
- $profile = APContact::getByURL($parent['author-link'], false);
- if (!empty($profile)) {
- if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) {
- $data['to'][] = $profile['url'];
- } else {
- $data['cc'][] = $profile['url'];
+ $profile = APContact::getByURL($parent['author-link'], false);
+ if (!empty($profile)) {
+ if (($profile['type'] == 'Group') || ($parent['uri'] == $item['thr-parent'])) {
+ $data['to'][] = $profile['url'];
+ } else {
+ $data['cc'][] = $profile['url'];
+ }
}
}
+ DBA::close($parents);
}
- DBA::close($parents);
$data['to'] = array_unique($data['to']);
$data['cc'] = array_unique($data['cc']);
if (Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
- $networks = [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::DIASPORA, Protocol::OSTATUS];
+ $networks = Protocol::FEDERATED;
} else {
// For now only send to these contacts:
$networks = [Protocol::ACTIVITYPUB, Protocol::OSTATUS];
$contacts = DBA::select('contact', ['url', 'network', 'protocol'], $condition);
while ($contact = DBA::fetch($contacts)) {
+ if (Contact::isLocal($contact['url'])) {
+ continue;
+ }
+
if (!in_array($contact['network'], $networks) && ($contact['protocol'] != Protocol::ACTIVITYPUB)) {
continue;
}
if ($receiver == $item_profile['followers']) {
$inboxes = array_merge($inboxes, self::fetchTargetInboxesforUser($uid, $personal));
} else {
+ if (Contact::isLocal($receiver)) {
+ continue;
+ }
+
$profile = APContact::getByURL($receiver, false);
if (!empty($profile)) {
if (empty($profile['sharedinbox']) || $personal || $blindcopy) {
public static function ItemArrayFromMail($mail_id)
{
$mail = DBA::selectFirst('mail', [], ['id' => $mail_id]);
+ if (!DBA::isResult($mail)) {
+ return [];
+ }
$reply = DBA::selectFirst('mail', ['uri'], ['parent-uri' => $mail['parent-uri'], 'reply' => false]);
$mail = self::ItemArrayFromMail($mail_id);
$object = self::createNote($mail);
- $object['to'] = $object['cc'];
- unset($object['cc']);
-
- $object['tag'] = [['type' => 'Mention', 'href' => $object['to'][0], 'name' => 'test']];
-
if (!$object_mode) {
$data = ['@context' => ActivityPub::CONTEXT];
} else {
unset($data['bcc']);
$object['to'] = $data['to'];
+ $object['tag'] = [['type' => 'Mention', 'href' => $object['to'][0], 'name' => '']];
+
unset($object['cc']);
unset($object['bcc']);
// Only check for a reshare, if it is a real reshare and no quoted reshare
if (strpos($item['body'], "[share") === 0) {
- $announce = api_share_as_retweet($item);
- $reshared = !empty($announce['plink']);
+ $announce = self::getAnnounceObject($item);
+ $reshared = !empty($announce);
}
if ($reshared) {
$type = 'Announce';
- } elseif ($item['verb'] == ACTIVITY_POST) {
+ } elseif ($item['verb'] == Activity::POST) {
if ($item['created'] == $item['edited']) {
$type = 'Create';
} else {
$type = 'Update';
}
- } elseif ($item['verb'] == ACTIVITY_LIKE) {
+ } elseif ($item['verb'] == Activity::LIKE) {
$type = 'Like';
- } elseif ($item['verb'] == ACTIVITY_DISLIKE) {
+ } elseif ($item['verb'] == Activity::DISLIKE) {
$type = 'Dislike';
- } elseif ($item['verb'] == ACTIVITY_ATTEND) {
+ } elseif ($item['verb'] == Activity::ATTEND) {
$type = 'Accept';
- } elseif ($item['verb'] == ACTIVITY_ATTENDNO) {
+ } elseif ($item['verb'] == Activity::ATTENDNO) {
$type = 'Reject';
- } elseif ($item['verb'] == ACTIVITY_ATTENDMAYBE) {
+ } elseif ($item['verb'] == Activity::ATTENDMAYBE) {
$type = 'TentativeAccept';
- } elseif ($item['verb'] == ACTIVITY_FOLLOW) {
+ } elseif ($item['verb'] == Activity::FOLLOW) {
$type = 'Follow';
+ } elseif ($item['verb'] == Activity::TAG) {
+ $type = 'Add';
} else {
$type = '';
}
if (in_array($data['type'], ['Create', 'Update', 'Delete'])) {
$data['object'] = self::createNote($item);
+ } elseif ($data['type'] == 'Add') {
+ $data = self::createAddTag($item, $data);
} elseif ($data['type'] == 'Announce') {
$data = self::createAnnounce($item, $data);
} elseif ($data['type'] == 'Follow') {
$tags[] = ['type' => 'Mention', 'href' => $term['url'], 'name' => $mention];
}
}
+
+ $announce = self::getAnnounceObject($item);
+ // Mention the original author upon commented reshares
+ if (!empty($announce['comment'])) {
+ $tags[] = ['type' => 'Mention', 'href' => $announce['actor']['url'], 'name' => '@' . $announce['actor']['addr']];
+ }
+
return $tags;
}
{
$attachments = [];
+ // Currently deactivated, since it creates side effects on Mastodon and Pleroma.
+ // It will be reactivated, once this cleared.
+ /*
+ $attach_data = BBCode::getAttachmentData($item['body']);
+ if (!empty($attach_data['url'])) {
+ $attachment = ['type' => 'Page',
+ 'mediaType' => 'text/html',
+ 'url' => $attach_data['url']];
+
+ if (!empty($attach_data['title'])) {
+ $attachment['name'] = $attach_data['title'];
+ }
+
+ if (!empty($attach_data['description'])) {
+ $attachment['summary'] = $attach_data['description'];
+ }
+
+ if (!empty($attach_data['image'])) {
+ $imgdata = Images::getInfoFromURLCached($attach_data['image']);
+ if ($imgdata) {
+ $attachment['icon'] = ['type' => 'Image',
+ 'mediaType' => $imgdata['mime'],
+ 'width' => $imgdata[0],
+ 'height' => $imgdata[1],
+ 'url' => $attach_data['image']];
+ }
+ }
+
+ $attachments[] = $attachment;
+ }
+ */
$arr = explode('[/attach],', $item['attach']);
if (count($arr)) {
foreach ($arr as $r) {
// Simplify image codes
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $item['body']);
- // Grab all pictures and create attachments out of them
+ // Grab all pictures without alternative descriptions and create attachments out of them
if (preg_match_all("/\[img\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures)) {
foreach ($pictures[1] as $picture) {
- $imgdata = Image::getInfoFromURL($picture);
+ $imgdata = Images::getInfoFromURLCached($picture);
if ($imgdata) {
$attachments[] = ['type' => 'Document',
'mediaType' => $imgdata['mime'],
}
}
+ // Grab all pictures with alternative description and create attachments out of them
+ if (preg_match_all("/\[img=([^\[\]]*)\]([^\[\]]*)\[\/img\]/Usi", $body, $pictures, PREG_SET_ORDER)) {
+ foreach ($pictures as $picture) {
+ $imgdata = Images::getInfoFromURLCached($picture[1]);
+ if ($imgdata) {
+ $attachments[] = ['type' => 'Document',
+ 'mediaType' => $imgdata['mime'],
+ 'url' => $picture[1],
+ 'name' => $picture[2]];
+ }
+ }
+ }
+
return $attachments;
}
}
/**
- * Remove image elements and replaces them with links to the image
+ * Remove image elements since they are added as attachment
*
* @param string $body
*
- * @return string with replaced elements
+ * @return string with removed images
*/
private static function removePictures($body)
{
// Simplify image codes
$body = preg_replace("/\[img\=([0-9]*)x([0-9]*)\](.*?)\[\/img\]/ism", '[img]$3[/img]', $body);
+ $body = preg_replace("/\[img\=(.*?)\](.*?)\[\/img\]/ism", '[img]$1[/img]', $body);
+
+ // Now remove local links
+ $body = preg_replace_callback(
+ '/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi',
+ function ($match) {
+ // We remove the link when it is a link to a local photo page
+ if (Photo::isLocalPage($match[1])) {
+ return '';
+ }
+ // otherwise we just return the link
+ return '[url]' . $match[1] . '[/url]';
+ },
+ $body
+ );
- $body = preg_replace("/\[url=([^\[\]]*)\]\[img\](.*)\[\/img\]\[\/url\]/Usi", '[url]$1[/url]', $body);
- $body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '[url]$1[/url]', $body);
+ // Remove all pictures
+ $body = preg_replace("/\[img\]([^\[\]]*)\[\/img\]/Usi", '', $body);
return $body;
}
{
$event = [];
$event['name'] = $item['event-summary'];
- $event['content'] = BBCode::convert($item['event-desc'], false, 7);
+ $event['content'] = BBCode::convert($item['event-desc'], false, 9);
$event['startTime'] = DateTimeFormat::utc($item['event-start'] . '+00:00', DateTimeFormat::ATOM);
if (!$item['event-nofinish']) {
*/
public static function createNote($item)
{
+ if (empty($item)) {
+ return [];
+ }
+
if ($item['event-type'] == 'event') {
$type = 'Event';
} elseif (!empty($item['title'])) {
$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
$body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
- $data['content'] = BBCode::convert($body, false, 7);
+ $data['content'] = BBCode::convert($body, false, 9);
}
+ $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
+ $richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
+ $richbody = BBCode::removeAttachment($richbody);
+
+ $data['contentMap']['text/html'] = BBCode::convert($richbody, false);
+ $data['contentMap']['text/markdown'] = BBCode::toMarkdown($item["body"]);
+
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
if (!empty($item['signed_text']) && ($item['uri'] != $item['thr-parent'])) {
return $data;
}
+ /**
+ * Creates an an "add tag" entry
+ *
+ * @param array $item
+ * @param array $data activity data
+ *
+ * @return array with activity data for adding tags
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ private static function createAddTag($item, $data)
+ {
+ $object = XML::parseString($item['object'], false);
+ $target = XML::parseString($item["target"], false);
+
+ $data['diaspora:guid'] = $item['guid'];
+ $data['actor'] = $item['author-link'];
+ $data['target'] = (string)$target->id;
+ $data['summary'] = BBCode::toPlaintext($item['body']);
+ $data['object'] = ['id' => (string)$object->id, 'type' => 'tag', 'name' => (string)$object->title, 'content' => (string)$object->content];
+
+ return $data;
+ }
+
/**
* Creates an announce object entry
*
*/
private static function createAnnounce($item, $data)
{
- $announce = api_share_as_retweet($item);
- if (empty($announce['plink'])) {
+ $orig_body = $item['body'];
+ $announce = self::getAnnounceObject($item);
+ if (empty($announce)) {
$data['type'] = 'Create';
$data['object'] = self::createNote($item);
return $data;
}
// Fetch the original id of the object
- $activity = ActivityPub::fetchContent($announce['plink'], $item['uid']);
+ $activity = ActivityPub::fetchContent($announce['id'], $item['uid']);
if (!empty($activity)) {
$ldactivity = JsonLD::compact($activity);
$id = JsonLD::fetchElement($ldactivity, '@id');
+ $type = str_replace('as:', '', JsonLD::fetchElement($ldactivity, '@type'));
if (!empty($id)) {
- $data['object'] = $id;
+ if (empty($announce['comment'])) {
+ // Pure announce, without a quote
+ $data['type'] = 'Announce';
+ $data['object'] = $id;
+ return $data;
+ }
+
+ // Quote
+ $data['type'] = 'Create';
+ $item['body'] = $announce['comment'] . "\n" . $id;
+ $data['object'] = self::createNote($item);
+
+ /// @todo Finally descide how to implement this in AP. This is a possible way:
+ $data['object']['attachment'][] = ['type' => $type, 'id' => $id];
+
+ $data['object']['source']['content'] = $orig_body;
return $data;
}
}
+ $item['body'] = $orig_body;
$data['type'] = 'Create';
$data['object'] = self::createNote($item);
return $data;
}
+ /**
+ * Return announce related data if the item is an annunce
+ *
+ * @param array $item
+ *
+ * @return array
+ */
+ public static function getAnnounceObject($item)
+ {
+ $announce = api_share_as_retweet($item);
+ if (empty($announce['plink'])) {
+ return [];
+ }
+
+ /// @ToDo Check if the announced item is an AP object
+
+ $profile = APContact::getByURL($announce['author-link'], false);
+ if (empty($profile)) {
+ return [];
+ }
+
+ return ['id' => $announce['plink'], 'actor' => $profile, 'comment' => trim($announce['share-pre-body'])];
+ }
+
/**
* Creates an activity id for a given contact id
*
public static function sendActivity($activity, $target, $uid, $id = '')
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$owner = User::getOwnerDataById($uid);
public static function sendFollowObject($object, $target, $uid = 0)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
if (empty($uid)) {
// Fetch the list of administrators
$uid = $first_user['uid'];
}
- $condition = ['verb' => ACTIVITY_FOLLOW, 'uid' => 0, 'parent-uri' => $object,
+ $condition = ['verb' => Activity::FOLLOW, 'uid' => 0, 'parent-uri' => $object,
'author-id' => Contact::getPublicIdByUserId($uid)];
if (Item::exists($condition)) {
Logger::log('Follow for ' . $object . ' for user ' . $uid . ' does already exist.', Logger::DEBUG);
public static function sendContactAccept($target, $id, $uid)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Accept',
'actor' => $owner['url'],
- 'object' => ['id' => $id, 'type' => 'Follow',
+ 'object' => [
+ 'id' => (string)$id,
+ 'type' => 'Follow',
'actor' => $profile['url'],
- 'object' => $owner['url']],
+ 'object' => $owner['url']
+ ],
'instrument' => self::getService(),
'to' => [$profile['url']]];
- Logger::log('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
+ Logger::debug('Sending accept to ' . $target . ' for user ' . $uid . ' with id ' . $id);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
public static function sendContactReject($target, $id, $uid)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
'id' => System::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Reject',
'actor' => $owner['url'],
- 'object' => ['id' => $id, 'type' => 'Follow',
+ 'object' => [
+ 'id' => (string)$id,
+ 'type' => 'Follow',
'actor' => $profile['url'],
- 'object' => $owner['url']],
+ 'object' => $owner['url']
+ ],
'instrument' => self::getService(),
'to' => [$profile['url']]];
- Logger::log('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id, Logger::DEBUG);
+ Logger::debug('Sending reject to ' . $target . ' for user ' . $uid . ' with id ' . $id);
$signed = LDSignature::sign($data, $owner);
HTTPSignature::transmit($signed, $profile['inbox'], $uid);
public static function sendContactUndo($target, $cid, $uid)
{
$profile = APContact::getByURL($target);
+ if (empty($profile['inbox'])) {
+ Logger::warning('No inbox found for target', ['target' => $target, 'profile' => $profile]);
+ return;
+ }
$object_id = self::activityIDFromContact($cid);
if (empty($object_id)) {
projects / friendica.git / blobdiff