mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #5965 from annando/ap-nick

Browse source 
Use nickname based mentions for AP
This commit is contained in:
Hypolite Petovan 2018-10-19 08:51:38 -04:00 committed by GitHub
commit 6e164ed09f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Protocol/ActivityPub/Transmitter.php
View file

@ -743,6 +743,26 @@ class Transmitter
return $attachments; return $attachments;
} }
/**
* @brief Callback function to replace a Friendica style mention in a mention that is used on AP
*
* @param array $match Matching values for the callback
* @return string Replaced mention
*/
private static function MentionCallback($match)
{
if (empty($match[1])) {
return;
}
$data = Contact::getDetailsByURL($match[1]);
if (empty($data) || empty($data['nick'])) {
return;
}
return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
}
/** /**
* Remove image elements and replaces them with links to the image * Remove image elements and replaces them with links to the image
* *
@ -851,6 +871,9 @@ class Transmitter
$body = self::removePictures($body); $body = self::removePictures($body);
} }
$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, 7);
$data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"]; $data['source'] = ['content' => $item['body'], 'mediaType' => "text/bbcode"];