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];
}
}
- $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];
// Making the post more compatible for Mastodon by:
// - Making it a note and not an article (no title)
// - Moving the title into the "summary" field that is used as a "content warning"
- $mail['body'] = '[abstract]' . $mail['title'] . "[/abstract]\n".$mail['body'];
+ $mail['body'] = '[abstract]' . $mail['title'] . "[/abstract]\n" . $mail['body'];
$mail['title'] = '';
$mail['author-link'] = $mail['owner-link'] = $mail['from-url'];
$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') {
{
$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
*
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,
'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