jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Escape url tags before attempting to add missing mention links in Protocol\ActivityPub\Processor

Browse source 
- Mastodon uses @-sign in profile URLs which wrongly triggered the mention link add in existing mentions links
This commit is contained in:
Hypolite Petovan 2021-08-20 03:40:23 -04:00
parent 4b36f7e8c8
commit 1de159a2ae
1 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1207,20 +1207,24 @@ class Processor
// This prevents links to be added again to Pleroma-style mention links // This prevents links to be added again to Pleroma-style mention links
$body = self::normalizeMentionLinks($body); $body = self::normalizeMentionLinks($body);
foreach ($tags as $tag) { $body = BBCode::performWithEscapedTags($body, ['url'], function ($body) use ($tags) {
if (empty($tag['name']) || empty($tag['type']) || empty($tag['href']) || !in_array($tag['type'], ['Mention', 'Hashtag'])) { foreach ($tags as $tag) {
continue; 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);
} }
$hash = substr($tag['name'], 0, 1); return $body;
$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; return $body;
} }