bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

New function to replace mentions with nicknames

Browse source
This commit is contained in:
Michael 2021-07-22 09:13:39 +00:00
parent bb5f738619
commit 71f53c946f
3 changed files with 36 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/Content/Text/BBCode.php
View file

@ -1263,6 +1263,39 @@ class BBCode
return $bbcode;
}
/**
* Replace names in mentions with nicknames
*
* @param string $body
* @return string Body with replaced mentions
*/
public static function setMentionsToNicknames(string $body):string
{
$regexp = "/([@!])\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
return preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
}
/**
* Callback function to replace a Friendica style mention in a mention with the nickname
*
* @param array $match Matching values for the callback
* @return string Replaced mention
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function mentionCallback($match)
{
if (empty($match[2])) {
return '';
}
$data = Contact::getByURL($match[2], false, ['url', 'nick']);
if (empty($data['nick'])) {
return $match[0];
}
return $match[1] . '[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
}
/**
* Converts a BBCode message for a given URI-ID to a HTML message
*

2
src/Object/Api/Mastodon/Status.php
View file

@ -131,7 +131,7 @@ class Status extends BaseDataTransferObject
$this->muted = $userAttributes->muted;
$this->bookmarked = $userAttributes->bookmarked;
$this->pinned = $userAttributes->pinned;
$this->content = BBCode::convertForUriId($item['uri-id'], ($item['raw-body'] ?? $item['body']), BBCode::API);
$this->content = BBCode::convertForUriId($item['uri-id'], BBCode::setMentionsToNicknames($item['raw-body'] ?? $item['body']), BBCode::API);
$this->reblog = $reblog;
$this->application = $application->toArray();
$this->account = $account->toArray();

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

@ -1343,27 +1343,6 @@ class Transmitter
return $attachments;
}
/**
* 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
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function mentionCallback($match)
{
if (empty($match[1])) {
return '';
}
$data = Contact::getByURL($match[1], false, ['url', 'nick']);
if (empty($data['nick'])) {
return $match[0];
}
return '@[url=' . $data['url'] . ']' . $data['nick'] . '[/url]';
}
/**
* Callback function to replace a Friendica style mention in a mention for a summary
*
@ -1568,8 +1547,7 @@ class Transmitter
if ($type == 'Event') {
$data = array_merge($data, self::createEvent($item));
} else {
$regexp = "/[@!]\[url\=([^\[\]]*)\].*?\[\/url\]/ism";
$body = preg_replace_callback($regexp, ['self', 'mentionCallback'], $body);
$body = BBCode::setMentionsToNicknames($body);
$data['content'] = BBCode::convertForUriId($item['uri-id'], $body, BBCode::ACTIVITYPUB);
}
@ -1579,8 +1557,7 @@ class Transmitter
// 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::setMentionsToNicknames($item['body']);
$richbody = BBCode::removeAttachment($richbody);
$data['contentMap'][$language] = BBCode::convertForUriId($item['uri-id'], $richbody, BBCode::EXTERNAL);