*/
namespace Friendica\Protocol\ActivityPub;
-use Friendica\BaseObject;
use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Plaintext;
-use Friendica\Core\Cache;
+use Friendica\Core\Cache\Cache;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Database\DBA;
+use Friendica\DI;
use Friendica\Model\APContact;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
$count = DBA::count('contact', $condition);
$data = ['@context' => ActivityPub::CONTEXT];
- $data['id'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+ $data['id'] = DI::baseUrl() . '/followers/' . $owner['nickname'];
$data['type'] = 'OrderedCollection';
$data['totalItems'] = $count;
}
if (empty($page)) {
- $data['first'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
+ $data['first'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=1';
} else {
$data['type'] = 'OrderedCollectionPage';
$list = [];
}
if (!empty($list)) {
- $data['next'] = System::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
+ $data['next'] = DI::baseUrl() . '/followers/' . $owner['nickname'] . '?page=' . ($page + 1);
}
- $data['partOf'] = System::baseUrl() . '/followers/' . $owner['nickname'];
+ $data['partOf'] = DI::baseUrl() . '/followers/' . $owner['nickname'];
$data['orderedItems'] = $list;
}
$count = DBA::count('contact', $condition);
$data = ['@context' => ActivityPub::CONTEXT];
- $data['id'] = System::baseUrl() . '/following/' . $owner['nickname'];
+ $data['id'] = DI::baseUrl() . '/following/' . $owner['nickname'];
$data['type'] = 'OrderedCollection';
$data['totalItems'] = $count;
}
if (empty($page)) {
- $data['first'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
+ $data['first'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=1';
} else {
$data['type'] = 'OrderedCollectionPage';
$list = [];
}
if (!empty($list)) {
- $data['next'] = System::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
+ $data['next'] = DI::baseUrl() . '/following/' . $owner['nickname'] . '?page=' . ($page + 1);
}
- $data['partOf'] = System::baseUrl() . '/following/' . $owner['nickname'];
+ $data['partOf'] = DI::baseUrl() . '/following/' . $owner['nickname'];
$data['orderedItems'] = $list;
}
$count = DBA::count('item', $condition);
$data = ['@context' => ActivityPub::CONTEXT];
- $data['id'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+ $data['id'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
$data['type'] = 'OrderedCollection';
$data['totalItems'] = $count;
if (empty($page)) {
- $data['first'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
+ $data['first'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=1';
} else {
$data['type'] = 'OrderedCollectionPage';
$list = [];
}
if (!empty($list)) {
- $data['next'] = System::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
+ $data['next'] = DI::baseUrl() . '/outbox/' . $owner['nickname'] . '?page=' . ($page + 1);
}
- $data['partOf'] = System::baseUrl() . '/outbox/' . $owner['nickname'];
+ $data['partOf'] = DI::baseUrl() . '/outbox/' . $owner['nickname'];
$data['orderedItems'] = $list;
}
{
return ['type' => 'Service',
'name' => FRIENDICA_PLATFORM . " '" . FRIENDICA_CODENAME . "' " . FRIENDICA_VERSION . '-' . DB_UPDATE_VERSION,
- 'url' => BaseObject::getApp()->getBaseURL()];
+ 'url' => DI::baseUrl()->get()];
}
/**
$data['id'] = $contact['url'];
$data['diaspora:guid'] = $user['guid'];
$data['type'] = ActivityPub::ACCOUNT_TYPES[$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['following'] = DI::baseUrl() . '/following/' . $user['nickname'];
+ $data['followers'] = DI::baseUrl() . '/followers/' . $user['nickname'];
+ $data['inbox'] = DI::baseUrl() . '/inbox/' . $user['nickname'];
+ $data['outbox'] = DI::baseUrl() . '/outbox/' . $user['nickname'];
$data['preferredUsername'] = $user['nickname'];
$data['name'] = $contact['name'];
$data['vcard:hasAddress'] = ['@type' => 'vcard:Home', 'vcard:country-name' => $profile['country-name'],
$data['publicKey'] = ['id' => $contact['url'] . '#main-key',
'owner' => $contact['url'],
'publicKeyPem' => $user['pubkey']];
- $data['endpoints'] = ['sharedInbox' => System::baseUrl() . '/inbox'];
+ $data['endpoints'] = ['sharedInbox' => DI::baseUrl() . '/inbox'];
$data['icon'] = ['type' => 'Image',
'url' => $contact['photo']];
{
return [
'@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/profile/' . $username,
+ 'id' => DI::baseUrl() . '/profile/' . $username,
'type' => 'Tombstone',
'published' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
'updated' => DateTimeFormat::utcNow(DateTimeFormat::ATOM),
}
}
- if (Config::get('debug', 'total_ap_delivery')) {
+ if (Config::get('system', 'ap_always_bcc')) {
+ $always_bcc = true;
+ }
+
+ if (self::isAnnounce($item) || Config::get('debug', 'total_ap_delivery')) {
// Will be activated in a later step
$networks = Protocol::FEDERATED;
} else {
$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']) {
+ // Directly mention the original author upon a quoted reshare.
+ // Else just ensure that the original author receives the reshare.
+ $announce = self::getAnnounceArray($item);
+ if (!empty($announce['comment'])) {
+ $data['to'][] = $announce['actor']['url'];
+ } elseif (!empty($announce)) {
+ $data['cc'][] = $announce['actor']['url'];
+ }
+
$data = array_merge($data, self::fetchPermissionBlockFromConversation($item));
$data['to'][] = ActivityPub::PUBLIC_COLLECTION;
// Only check for a reshare, if it is a real reshare and no quoted reshare
if (strpos($item['body'], "[share") === 0) {
- $announce = self::getAnnounceObject($item);
+ $announce = self::getAnnounceArray($item);
$reshared = !empty($announce);
}
$cachekey = 'APDelivery:createActivity:' . $item_id;
if (!$force) {
- $data = Cache::get($cachekey);
+ $data = DI::cache()->get($cachekey);
if (!is_null($data)) {
return $data;
}
$data = ActivityPub\Transmitter::createActivityFromItem($item_id);
- Cache::set($cachekey, $data, Cache::QUARTER_HOUR);
+ DI::cache()->set($cachekey, $data, Cache::QUARTER_HOUR);
return $data;
}
$terms = Term::tagArrayFromItemId($item['id'], [Term::HASHTAG, Term::MENTION, Term::IMPLICIT_MENTION]);
foreach ($terms as $term) {
if ($term['type'] == Term::HASHTAG) {
- $url = System::baseUrl() . '/search?tag=' . urlencode($term['term']);
+ $url = DI::baseUrl() . '/search?tag=' . urlencode($term['term']);
$tags[] = ['type' => 'Hashtag', 'href' => $url, 'name' => '#' . $term['term']];
} elseif ($term['type'] == Term::MENTION || $term['type'] == Term::IMPLICIT_MENTION) {
$contact = Contact::getDetailsByURL($term['url']);
}
}
- $announce = self::getAnnounceObject($item);
+ $announce = self::getAnnounceArray($item);
// Mention the original author upon commented reshares
if (!empty($announce['comment'])) {
$tags[] = ['type' => 'Mention', 'href' => $announce['actor']['url'], 'name' => '@' . $announce['actor']['addr']];
$data['content'] = BBCode::convert($body, false, 9);
}
- $regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
- $richbody = preg_replace_callback($regexp, ['self', 'mentionCallback'], $item['body']);
- $richbody = BBCode::removeAttachment($richbody);
+ // The regular "content" field does contain a minimized HTML. This is done since systems like
+ // Mastodon has got problems with - for example - embedded pictures.
+ // The contentMap does contain the unmodified HTML.
+ $language = self::getLanguage($item);
+ if (!empty($language)) {
+ $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['contentMap'][$language] = BBCode::convert($richbody, false);
+ }
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];
return $data;
}
+ /**
+ * Fetches the language from the post, the user or the system.
+ *
+ * @param array $item
+ *
+ * @return string language string
+ */
+ private static function getLanguage(array $item)
+ {
+ // Try to fetch the language from the post itself
+ if (!empty($item['language'])) {
+ $languages = array_keys(json_decode($item['language'], true));
+ if (!empty($languages[0])) {
+ return $languages[0];
+ }
+ }
+
+ // Otherwise use the user's language
+ if (!empty($item['uid'])) {
+ $user = DBA::selectFirst('user', ['language'], ['uid' => $item['uid']]);
+ if (!empty($user['language'])) {
+ return $user['language'];
+ }
+ }
+
+ // And finally just use the system language
+ return Config::get('system', 'language');
+ }
+
/**
* Creates an an "add tag" entry
*
private static function createAnnounce($item, $data)
{
$orig_body = $item['body'];
- $announce = self::getAnnounceObject($item);
+ $announce = self::getAnnounceArray($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['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)) {
- 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;
- }
+ if (empty($announce['comment'])) {
+ // Pure announce, without a quote
+ $data['type'] = 'Announce';
+ $data['object'] = $announce['object']['uri'];
+ return $data;
}
- $item['body'] = $orig_body;
+ // Quote
$data['type'] = 'Create';
+ $item['body'] = $announce['comment'] . "\n" . $announce['object']['plink'];
$data['object'] = self::createNote($item);
+
+ /// @todo Finally descide how to implement this in AP. This is a possible way:
+ $data['object']['attachment'][] = self::createNote($announce['object']);
+
+ $data['object']['source']['content'] = $orig_body;
return $data;
}
*
* @return array
*/
- public static function getAnnounceObject($item)
+ public static function getAnnounceArray($item)
{
- $announce = api_share_as_retweet($item);
- if (empty($announce['plink'])) {
+ $reshared = Item::getShareArray($item);
+ if (empty($reshared['guid'])) {
+ return [];
+ }
+
+ $reshared_item = Item::selectFirst([], ['guid' => $reshared['guid']]);
+ if (!DBA::isResult($reshared_item)) {
return [];
}
- /// @ToDo Check if the announced item is an AP object
+ if (!in_array($reshared_item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
+ return [];
+ }
- $profile = APContact::getByURL($announce['author-link'], false);
+ $profile = APContact::getByURL($reshared_item['author-link'], false);
if (empty($profile)) {
return [];
}
- return ['id' => $announce['plink'], 'actor' => $profile, 'comment' => trim($announce['share-pre-body'])];
+ return ['object' => $reshared_item, 'actor' => $profile, 'comment' => $reshared['comment']];
+ }
+
+ /**
+ * Checks if the provided item array is an announce
+ *
+ * @param array $item
+ *
+ * @return boolean
+ */
+ public static function isAnnounce($item)
+ {
+ $announce = self::getAnnounceArray($item);
+ if (empty($announce)) {
+ return false;
+ }
+
+ return empty($announce['comment']);
}
/**
$hash = hash('ripemd128', $contact['uid'].'-'.$contact['id'].'-'.$contact['created']);
$uuid = substr($hash, 0, 8). '-' . substr($hash, 8, 4) . '-' . substr($hash, 12, 4) . '-' . substr($hash, 16, 4) . '-' . substr($hash, 20, 12);
- return System::baseUrl() . '/activity/' . $uuid;
+ return DI::baseUrl() . '/activity/' . $uuid;
}
/**
$suggestion = DBA::selectFirst('fsuggest', ['url', 'note', 'created'], ['id' => $suggestion_id]);
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Announce',
'actor' => $owner['url'],
'object' => $suggestion['url'],
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'dfrn:relocate',
'actor' => $owner['url'],
'object' => $owner['url'],
}
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Delete',
'actor' => $owner['url'],
'object' => $owner['url'],
$profile = APContact::getByURL($owner['url']);
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Update',
'actor' => $owner['url'],
'object' => self::getProfile($uid),
$owner = User::getOwnerDataById($uid);
if (empty($id)) {
- $id = System::baseUrl() . '/activity/' . System::createGUID();
+ $id = DI::baseUrl() . '/activity/' . System::createGUID();
}
$data = ['@context' => ActivityPub::CONTEXT,
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Follow',
'actor' => $owner['url'],
'object' => $object,
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Accept',
'actor' => $owner['url'],
'object' => [
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
- 'id' => System::baseUrl() . '/activity/' . System::createGUID(),
+ 'id' => DI::baseUrl() . '/activity/' . System::createGUID(),
'type' => 'Reject',
'actor' => $owner['url'],
'object' => [
return;
}
- $id = System::baseUrl() . '/activity/' . System::createGUID();
+ $id = DI::baseUrl() . '/activity/' . System::createGUID();
$owner = User::getOwnerDataById($uid);
$data = ['@context' => ActivityPub::CONTEXT,
projects / friendica.git / blobdiff