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

ActivityPub: Add support for non-link mentions

Browse source 
- This enables implicit mention removal even if the remote server doesn't add links to mentions in the message body.
- This also enable interactive mentions in the message body when implicit mentions are disabled.
This commit is contained in:
Hypolite Petovan 2021-08-15 22:53:42 -04:00
parent f0bb83c225
commit 9b64035231
1 changed files with 35 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/Protocol/ActivityPub/Processor.php
View file

@ -52,18 +52,14 @@ use Friendica\Util\Strings;
class Processor
{
/**
* Converts mentions from Pleroma into the Friendica format
* Extracts the tag character (#, @, !) from mention links
*
* @param string $body
*
* @return string converted body
* @return string
*/
private static function convertMentions($body)
protected static function normalizeMentionLinks(string $body): string
{
$URLSearchString = "^\[\]";
$body = preg_replace("/\[url\=([$URLSearchString]*)\]([#@!])(.*?)\[\/url\]/ism", '$2[url=$1]$3[/url]', $body);
return $body;
return preg_replace('%\[url=([^\[\]]*)]([#@!])(.*?)\[/url]%ism', '$2[url=$1]$3[/url]', $body);
}
/**
@ -463,7 +459,7 @@ class Processor
$content = self::replaceEmojis($content, $activity['emojis']);
}
$content = self::convertMentions($content);
$content = self::addMentionLinks($content, $activity['tags']);
if (!empty($activity['source'])) {
$item['body'] = $activity['source'];
@ -1198,4 +1194,34 @@ class Processor
return implode('', $kept_mentions);
}
/**
* Adds links to string mentions
*
* @param string $body
* @param array $tags
* @return string
*/
protected static function addMentionLinks(string $body, array $tags): string
{
// This prevents links to be added again to Pleroma-style mention links
$body = self::normalizeMentionLinks($body);
foreach ($tags as $tag) {
if (empty($tag['name']) || empty($tag['type']) || empty($tag['href']) || !in_array($tag['type'], ['Mention', 'Hashtag'])) {
continue;
}
$hash = substr($tag['name'], 0, 1);
$name = substr($tag['name'], 1);
if (!in_array($hash, Tag::TAG_CHARACTER)) {
$hash = '';
$name = $tag['name'];
}
$body = str_replace($tag['name'], $hash . '[url=' . $tag['href'] . ']' . $name . '[/url]', $body);
}
return $body;
}
}