use Friendica\Util\DateTimeFormat;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Plaintext;
+use Friendica\Util\XML;
use Friendica\Util\JsonLD;
use Friendica\Util\LDSignature;
use Friendica\Model\Profile;
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];
}
}
} else {
- $receiver_list = Item::enumeratePermissions($item);
+ $receiver_list = Item::enumeratePermissions($item, true);
foreach ($terms as $term) {
$cid = Contact::getIdForURL($term['url'], $item['uid']);
$data['to'][] = $profile['url'];
} else {
$data['cc'][] = $profile['url'];
- if (!$item['private']) {
+ if (!$item['private'] && !empty($actor_profile['followers'])) {
$data['cc'][] = $actor_profile['followers'];
}
}
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];
$type = 'TentativeAccept';
} 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') {
// 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);
}
}
+ // 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 = Image::getInfoFromURL($picture[1]);
+ if ($imgdata) {
+ $attachments[] = ['type' => 'Document',
+ 'mediaType' => $imgdata['mime'],
+ 'url' => $picture[1],
+ 'name' => $picture[2]];
+ }
+ }
+ }
+
return $attachments;
}
{
$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']) {
$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);
}
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
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)
{
+ $orig_body = $item['body'];
$announce = api_share_as_retweet($item);
if (empty($announce['plink'])) {
$data['type'] = 'Create';
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['share-pre-body'])) {
+ // Pure announce, without a quote
+ $data['type'] = 'Announce';
+ $data['object'] = $id;
+ return $data;
+ }
+
+ // Quote
+ $data['type'] = 'Create';
+ $item['body'] = trim($announce['share-pre-body']) . "\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;
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
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,
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,
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