namespace Friendica\Protocol\ActivityPub;
use Friendica\Database\DBA;
+use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\HTML;
use Friendica\Core\Config;
use Friendica\Core\Logger;
use Friendica\Model\Event;
use Friendica\Model\Term;
use Friendica\Model\User;
+use Friendica\Model\Mail;
use Friendica\Protocol\ActivityPub;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\JsonLD;
*
* @return string with replaced emojis
*/
- public static function replaceEmojis($body, array $emojis)
+ private static function replaceEmojis($body, array $emojis)
{
foreach ($emojis as $emoji) {
$replace = '[class=emoji mastodon][img=' . $emoji['href'] . ']' . $emoji['name'] . '[/img][/class]';
*
* @param array $tags
* @param boolean $sensitive
- * @param array $implicit_mentions List of profile URLs to skip
* @return string with tags
*/
- private static function constructTagString($tags, $sensitive, array $implicit_mentions)
+ private static function constructTagString(array $tags = null, $sensitive = false)
{
if (empty($tags)) {
return '';
$tag_text = '';
foreach ($tags as $tag) {
- if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag']) && !in_array($tag['href'], $implicit_mentions)) {
+ if (in_array(defaults($tag, 'type', ''), ['Mention', 'Hashtag'])) {
if (!empty($tag_text)) {
$tag_text .= ',';
}
/**
* Add attachment data to the item array
*
- * @param array $attachments
- * @param array $item
+ * @param array $attachments
+ * @param array $item
+ * @param boolean $no_images
*
* @return array array
*/
- private static function constructAttachList($attachments, $item)
+ private static function constructAttachList($attachments, $item, $no_images)
{
if (empty($attachments)) {
return $item;
foreach ($attachments as $attach) {
$filetype = strtolower(substr($attach['mediaType'], 0, strpos($attach['mediaType'], '/')));
if ($filetype == 'image') {
+ if ($no_images) {
+ continue;
+ }
+
$item['body'] .= "\n[img]" . $attach['url'] . '[/img]';
} else {
if (!empty($item["attach"])) {
*/
public static function updateItem($activity)
{
- $item = Item::selectFirst(['uri', 'parent-uri', 'gravity'], ['uri' => $activity['id']]);
+ $item = Item::selectFirst(['uri', 'thr-parent', 'gravity'], ['uri' => $activity['id']]);
if (!DBA::isResult($item)) {
Logger::warning('Unknown item', ['uri' => $activity['id']]);
return;
}
$item['changed'] = DateTimeFormat::utcNow();
- $item['edited'] = $activity['updated'];
- $item['title'] = HTML::toBBCode($activity['name']);
- $item['content-warning'] = HTML::toBBCode($activity['summary']);
-
- $content = HTML::toBBCode($activity['content']);
- $content = self::replaceEmojis($content, $activity['emojis']);
- $content = self::convertMentions($content);
+ $item['edited'] = DateTimeFormat::utc($activity['updated']);
- $implicit_mentions = [];
- if (($item['parent-uri'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
- $parent = Item::selectFirst(['id', 'author-link', 'alias'], ['uri' => $item['parent-uri']]);
- if (!DBA::isResult($parent)) {
- Logger::warning('Unknown parent item.', ['uri' => $item['parent-uri']]);
- return;
- }
-
- $implicit_mentions = self::getImplicitMentionList($parent);
- $content = self::removeImplicitMentionsFromBody($content, $implicit_mentions);
+ $item = self::processContent($activity, $item);
+ if (empty($item)) {
+ return;
}
- $item['body'] = $content;
- $item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive'], $implicit_mentions);
-
Item::update($item, ['uri' => $activity['id']]);
}
{
$item = [];
$item['verb'] = ACTIVITY_POST;
- $item['parent-uri'] = $activity['reply-to-id'];
+ $item['thr-parent'] = $activity['reply-to-id'];
if ($activity['reply-to-id'] == $activity['id']) {
$item['gravity'] = GRAVITY_PARENT;
$item['object-type'] = ACTIVITY_OBJ_COMMENT;
}
- if (($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
+ if (empty($activity['directmessage']) && ($activity['id'] != $activity['reply-to-id']) && !Item::exists(['uri' => $activity['reply-to-id']])) {
Logger::log('Parent ' . $activity['reply-to-id'] . ' not found. Try to refetch it.');
self::fetchMissingActivity($activity['reply-to-id'], $activity);
}
Item::delete(['uri' => $activity['object_id'], 'owner-id' => $owner]);
}
+ /**
+ * Prepare the item array for an activity
+ *
+ * @param array $activity Activity array
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
+ */
+ public static function addTag($activity)
+ {
+ if (empty($activity['object_content']) || empty($activity['object_id'])) {
+ return;
+ }
+
+ foreach ($activity['receiver'] as $receiver) {
+ $item = Item::selectFirst(['id', 'tag', 'origin', 'author-link'], ['uri' => $activity['target_id'], 'uid' => $receiver]);
+ if (!DBA::isResult($item)) {
+ // We don't fetch missing content for this purpose
+ continue;
+ }
+
+ if (($item['author-link'] != $activity['actor']) && !$item['origin']) {
+ Logger::info('Not origin, not from the author, skipping update', ['id' => $item['id'], 'author' => $item['author-link'], 'actor' => $activity['actor']]);
+ continue;
+ }
+
+ // To-Do:
+ // - Check if "blocktag" is set
+ // - Check if actor is a contact
+
+ if (!stristr($item['tag'], trim($activity['object_content']))) {
+ $tag = $item['tag'] . (strlen($item['tag']) ? ',' : '') . '#[url=' . $activity['object_id'] . ']'. $activity['object_content'] . '[/url]';
+ Item::update(['tag' => $tag], ['id' => $item['id']]);
+ Logger::info('Tagged item', ['id' => $item['id'], 'tag' => $activity['object_content'], 'uri' => $activity['target_id'], 'actor' => $activity['actor']]);
+ }
+ }
+ }
+
/**
* Prepare the item array for an activity
*
{
$item = [];
$item['verb'] = $verb;
- $item['parent-uri'] = $activity['object_id'];
+ $item['thr-parent'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY;
$item['object-type'] = ACTIVITY_OBJ_NOTE;
Logger::log('Event '.$event_id.' was stored', Logger::DEBUG);
}
+ /**
+ * Process the content
+ *
+ * @param array $activity Activity array
+ * @param array $item
+ * @return array|bool Returns the item array or false if there was an unexpected occurrence
+ * @throws \Exception
+ */
+ private static function processContent($activity, $item)
+ {
+ $item['title'] = HTML::toBBCode($activity['name']);
+
+ if (!empty($activity['source'])) {
+ $item['body'] = $activity['source'];
+ } else {
+ $content = HTML::toBBCode($activity['content']);
+
+ if (!empty($activity['emojis'])) {
+ $content = self::replaceEmojis($content, $activity['emojis']);
+ }
+
+ $content = self::convertMentions($content);
+
+ if (empty($activity['directmessage']) && ($item['thr-parent'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
+ $item_private = !in_array(0, $activity['item_receiver']);
+ $parent = Item::selectFirst(['id', 'private', 'author-link', 'alias'], ['uri' => $item['thr-parent']]);
+ if (!DBA::isResult($parent)) {
+ Logger::warning('Unknown parent item.', ['uri' => $item['thr-parent']]);
+ return false;
+ }
+ if ($item_private && !$parent['private']) {
+ Logger::warning('Item is private but the parent is not. Dropping.', ['item-uri' => $item['uri'], 'thr-parent' => $item['thr-parent']]);
+ return false;
+ }
+
+ $potential_implicit_mentions = self::getImplicitMentionList($parent);
+ $content = self::removeImplicitMentionsFromBody($content, $potential_implicit_mentions);
+ $activity['tags'] = self::convertImplicitMentionsInTags($activity['tags'], $potential_implicit_mentions);
+ }
+ $item['content-warning'] = HTML::toBBCode($activity['summary']);
+ $item['body'] = $content;
+
+ if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) {
+ $item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]';
+ }
+ }
+
+ $item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive']);
+
+ $item['location'] = $activity['location'];
+
+ if (!empty($item['latitude']) && !empty($item['longitude'])) {
+ $item['coord'] = $item['latitude'] . ' ' . $item['longitude'];
+ }
+
+ $item['app'] = $activity['generator'];
+
+ return $item;
+ }
+
/**
* Creates an item post
*
private static function postItem($activity, $item)
{
/// @todo What to do with $activity['context']?
-
- if (($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['parent-uri']])) {
- Logger::log('Parent ' . $item['parent-uri'] . ' not found, message will be discarded.', Logger::DEBUG);
+ if (empty($activity['directmessage']) && ($item['gravity'] != GRAVITY_PARENT) && !Item::exists(['uri' => $item['thr-parent']])) {
+ Logger::info('Parent not found, message will be discarded.', ['thr-parent' => $item['thr-parent']]);
return;
}
$item['owner-link'] = $activity['actor'];
$item['owner-id'] = Contact::getIdForURL($activity['actor'], 0, true);
} else {
- Logger::log('Ignoring actor because of thread completion.', Logger::DEBUG);
+ Logger::info('Ignoring actor because of thread completion.');
$item['owner-link'] = $item['author-link'];
$item['owner-id'] = $item['author-id'];
}
$item['uri'] = $activity['id'];
- $content = HTML::toBBCode($activity['content']);
- $content = self::replaceEmojis($content, $activity['emojis']);
- $content = self::convertMentions($content);
- $implicit_mentions = [];
-
- if (($item['parent-uri'] != $item['uri']) && ($item['gravity'] == GRAVITY_COMMENT)) {
- $item_private = !in_array(0, $activity['item_receiver']);
- $parent = Item::selectFirst(['id', 'private', 'author-link', 'alias'], ['uri' => $item['parent-uri']]);
- if (!DBA::isResult($parent)) {
- return;
- }
- if ($item_private && !$parent['private']) {
- Logger::log('Item ' . $item['uri'] . ' is private but the parent ' . $item['parent-uri'] . ' is not. So we drop it.');
- return;
- }
-
- $implicit_mentions = self::getImplicitMentionList($parent);
- $content = self::removeImplicitMentionsFromBody($content, $implicit_mentions);
- }
-
- $item['created'] = $activity['published'];
- $item['edited'] = $activity['updated'];
+ $item['created'] = DateTimeFormat::utc($activity['published']);
+ $item['edited'] = DateTimeFormat::utc($activity['updated']);
$item['guid'] = $activity['diaspora:guid'];
- $item['title'] = HTML::toBBCode($activity['name']);
- $item['content-warning'] = HTML::toBBCode($activity['summary']);
- $item['body'] = $content;
-
- if (($activity['object_type'] == 'as:Video') && !empty($activity['alternate-url'])) {
- $item['body'] .= "\n[video]" . $activity['alternate-url'] . '[/video]';
- }
- $item['location'] = $activity['location'];
-
- if (!empty($item['latitude']) && !empty($item['longitude'])) {
- $item['coord'] = $item['latitude'] . ' ' . $item['longitude'];
+ $item = self::processContent($activity, $item);
+ if (empty($item)) {
+ return;
}
- $item['tag'] = self::constructTagString($activity['tags'], $activity['sensitive'], $implicit_mentions);
- $item['app'] = $activity['generator'];
$item['plink'] = defaults($activity, 'alternate-url', $item['uri']);
- $item = self::constructAttachList($activity['attachments'], $item);
-
- if (!empty($activity['source'])) {
- $item['body'] = $activity['source'];
- }
+ $item = self::constructAttachList($activity['attachments'], $item, !empty($activity['source']));
$stored = false;
$item['contact-id'] = Contact::getIdForURL($activity['author'], 0, true);
}
+ if (!empty($activity['directmessage'])) {
+ self::postMail($activity, $item);
+ continue;
+ }
+
if ($activity['object_type'] == 'as:Event') {
self::createEvent($activity, $item);
}
$item_id = Item::insert($item);
- Logger::log('Storing for user ' . $item['uid'] . ': ' . $item_id);
+ if ($item_id) {
+ Logger::info('Item insertion successful', ['user' => $item['uid'], 'item_id' => $item_id]);
+ } else {
+ Logger::notice('Item insertion aborted', ['user' => $item['uid']]);
+ }
if ($item['uid'] == 0) {
$stored = $item_id;
}
}
+ /**
+ * Creates an mail post
+ *
+ * @param array $activity Activity data
+ * @param array $item item array
+ * @return int|bool New mail table row id or false on error
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ */
+ private static function postMail($activity, $item)
+ {
+ if (($item['gravity'] != GRAVITY_PARENT) && !DBA::exists('mail', ['uri' => $item['thr-parent'], 'uid' => $item['uid']])) {
+ Logger::info('Parent not found, mail will be discarded.', ['uid' => $item['uid'], 'uri' => $item['thr-parent']]);
+ return false;
+ }
+
+ Logger::info('Direct Message', $item);
+
+ $msg = [];
+ $msg['uid'] = $item['uid'];
+
+ $msg['contact-id'] = $item['contact-id'];
+
+ $contact = Contact::getById($item['contact-id'], ['name', 'url', 'photo']);
+ $msg['from-name'] = $contact['name'];
+ $msg['from-url'] = $contact['url'];
+ $msg['from-photo'] = $contact['photo'];
+
+ $msg['uri'] = $item['uri'];
+ $msg['created'] = $item['created'];
+
+ $parent = DBA::selectFirst('mail', ['parent-uri', 'title'], ['uri' => $item['thr-parent']]);
+ if (DBA::isResult($parent)) {
+ $msg['parent-uri'] = $parent['parent-uri'];
+ $msg['title'] = $parent['title'];
+ } else {
+ $msg['parent-uri'] = $item['thr-parent'];
+
+ if (!empty($item['title'])) {
+ $msg['title'] = $item['title'];
+ } elseif (!empty($item['content-warning'])) {
+ $msg['title'] = $item['content-warning'];
+ } else {
+ // Trying to generate a title out of the body
+ $title = $item['body'];
+
+ while (preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#is', $title, $matches)) {
+ $title = $matches[3];
+ }
+
+ $title = trim(HTML::toPlaintext(BBCode::convert($title, false, 2, true), 0));
+
+ if (strlen($title) > 20) {
+ $title = substr($title, 0, 20) . '...';
+ }
+
+ $msg['title'] = $title;
+ }
+ }
+ $msg['body'] = $item['body'];
+
+ return Mail::insert($msg);
+ }
+
/**
* Fetches missing posts
*
$cid = Contact::getIdForURL($activity['actor'], $uid);
if (!empty($cid)) {
self::switchContact($cid);
- DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
+ DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
$contact = DBA::selectFirst('contact', [], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
} else {
- $contact = false;
+ $contact = [];
}
$item = ['author-id' => Contact::getIdForURL($activity['actor']),
'author-link' => $activity['actor']];
+ $note = Strings::escapeTags(trim(defaults($activity, 'content', '')));
+
// Ensure that the contact has got the right network type
self::switchContact($item['author-id']);
- Contact::addRelationship($owner, $contact, $item);
+ $result = Contact::addRelationship($owner, $contact, $item, false, $note);
+ if ($result === true) {
+ ActivityPub\Transmitter::sendContactAccept($item['author-link'], $item['author-id'], $owner['uid']);
+ }
+
$cid = Contact::getIdForURL($activity['actor'], $uid);
if (empty($cid)) {
return;
}
if (empty($contact)) {
- DBA::update('contact', ['hub-verify' => $activity['id']], ['id' => $cid]);
+ DBA::update('contact', ['hub-verify' => $activity['id'], 'protocol' => Protocol::ACTIVITYPUB], ['id' => $cid]);
}
Logger::log('Follow user ' . $uid . ' from contact ' . $cid . ' with id ' . $activity['id']);
self::switchContact($cid);
- if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING, 'pending' => true])) {
+ if (DBA::exists('contact', ['id' => $cid, 'rel' => Contact::SHARING])) {
Contact::remove($cid);
Logger::log('Rejected contact request from contact ' . $cid . ' for user ' . $uid . ' - contact had been removed.', Logger::DEBUG);
} else {
private static function switchContact($cid)
{
$contact = DBA::selectFirst('contact', ['network'], ['id' => $cid, 'network' => Protocol::NATIVE_SUPPORT]);
- if (!DBA::isResult($contact) || ($contact['network'] == Protocol::ACTIVITYPUB)) {
+ if (!DBA::isResult($contact) || in_array($contact['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN])) {
return;
}
*/
private static function getImplicitMentionList(array $parent)
{
- $parent_terms = Term::tagArrayFromItemId($parent['id'], [TERM_MENTION]);
+ if (Config::get('system', 'disable_implicit_mentions')) {
+ return [];
+ }
+
+ $parent_terms = Term::tagArrayFromItemId($parent['id'], [Term::MENTION, Term::IMPLICIT_MENTION]);
- $implicit_mentions = [
- $parent['author-link']
- ];
+ $parent_author = Contact::getDetailsByURL($parent['author-link'], 0);
+
+ $implicit_mentions = [];
+ if (empty($parent_author)) {
+ Logger::notice('Author public contact unknown.', ['author-link' => $parent['author-link'], 'item-id' => $parent['id']]);
+ } else {
+ $implicit_mentions[] = $parent_author['url'];
+ $implicit_mentions[] = $parent_author['nurl'];
+ $implicit_mentions[] = $parent_author['alias'];
+ }
- if ($parent['alias']) {
+ if (!empty($parent['alias'])) {
$implicit_mentions[] = $parent['alias'];
}
* Strips from the body prepended implicit mentions
*
* @param string $body
- * @param array $implicit_mentions List of profile URLs
+ * @param array $potential_mentions
* @return string
*/
- private static function removeImplicitMentionsFromBody($body, array $implicit_mentions)
+ private static function removeImplicitMentionsFromBody($body, array $potential_mentions)
{
+ if (Config::get('system', 'disable_implicit_mentions')) {
+ return $body;
+ }
+
$kept_mentions = [];
// Extract one prepended mention at a time from the body
- while(preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#mi', $body, $matches)) {
- if (!in_array($matches[2], $implicit_mentions) ) {
+ while(preg_match('#^(@\[url=([^\]]+)].*?\[\/url]\s)(.*)#is', $body, $matches)) {
+ if (!in_array($matches[2], $potential_mentions) ) {
$kept_mentions[] = $matches[1];
}
return implode('', $kept_mentions);
}
+
+ private static function convertImplicitMentionsInTags($activity_tags, array $potential_mentions)
+ {
+ if (Config::get('system', 'disable_implicit_mentions')) {
+ return $activity_tags;
+ }
+
+ foreach ($activity_tags as $index => $tag) {
+ if (in_array($tag['href'], $potential_mentions)) {
+ $activity_tags[$index]['name'] = preg_replace(
+ '/' . preg_quote(Term::TAG_CHARACTER[Term::MENTION], '/') . '/',
+ Term::TAG_CHARACTER[Term::IMPLICIT_MENTION],
+ $activity_tags[$index]['name'],
+ 1
+ );
+ }
+ }
+
+ return $activity_tags;
+ }
}
https://reisub.nsupdate.info/git / friendica.git / .git / blobdiff