From 9b64035231b231a374f3ee076d8de438c2230018 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 15 Aug 2021 22:53:42 -0400 Subject: [PATCH 1/2] ActivityPub: Add support for non-link mentions - 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. --- src/Protocol/ActivityPub/Processor.php | 44 ++++++++++++++++++++------ 1 file changed, 35 insertions(+), 9 deletions(-) diff --git a/src/Protocol/ActivityPub/Processor.php b/src/Protocol/ActivityPub/Processor.php index 496e73553..790a933bb 100644 --- a/src/Protocol/ActivityPub/Processor.php +++ b/src/Protocol/ActivityPub/Processor.php @@ -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; + } } From 42c21df11834713e54c63019631a0c35d1f27ac2 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Tue, 17 Aug 2021 08:54:16 -0400 Subject: [PATCH 2/2] Add tests for a couple of static methods of Protocol\ActivityPub\Processor --- .../Protocol/ActivityPub/ProcessorMock.php | 40 +++++++++ .../Protocol/ActivityPub/ProcessorTest.php | 87 +++++++++++++++++++ 2 files changed, 127 insertions(+) create mode 100644 tests/src/Protocol/ActivityPub/ProcessorMock.php create mode 100644 tests/src/Protocol/ActivityPub/ProcessorTest.php diff --git a/tests/src/Protocol/ActivityPub/ProcessorMock.php b/tests/src/Protocol/ActivityPub/ProcessorMock.php new file mode 100644 index 000000000..8d509bf9d --- /dev/null +++ b/tests/src/Protocol/ActivityPub/ProcessorMock.php @@ -0,0 +1,40 @@ +. + * + */ + +namespace Friendica\Test\src\Protocol\ActivityPub; + +use Friendica\Protocol\ActivityPub\Processor; + +/** + * Class ProcessorMock + * + * Exposes protected methods for test in the inherited class + * + * @method static string addMentionLinks(string $body, array $tags) + * @method static string normalizeMentionLinks(string $body) + */ +class ProcessorMock extends Processor +{ + public static function __callStatic($name, $arguments) + { + return self::$name(...$arguments); + } +} diff --git a/tests/src/Protocol/ActivityPub/ProcessorTest.php b/tests/src/Protocol/ActivityPub/ProcessorTest.php new file mode 100644 index 000000000..894e90af2 --- /dev/null +++ b/tests/src/Protocol/ActivityPub/ProcessorTest.php @@ -0,0 +1,87 @@ + [ + 'expected' => '@[url=https://example.com]Example[/url]', + 'body' => '[url=https://example.com]@Example[/url]', + ], + 'one-link-#' => [ + 'expected' => '#[url=https://example.com]Example[/url]', + 'body' => '[url=https://example.com]#Example[/url]', + ], + 'one-link-!' => [ + 'expected' => '![url=https://example.com]Example[/url]', + 'body' => '[url=https://example.com]!Example[/url]', + ], + 'wrong-hash-char' => [ + 'expected' => '[url=https://example.com]%Example[/url]', + 'body' => '[url=https://example.com]%Example[/url]', + ], + 'multiple-links' => [ + 'expected' => '@[url=https://example.com]Example[/url] #[url=https://example.com]Example[/url] ![url=https://example.com]Example[/url]', + 'body' => '[url=https://example.com]@Example[/url] [url=https://example.com]#Example[/url] [url=https://example.com]!Example[/url]', + ], + 'already-correct-format' => [ + 'expected' => '@[url=https://example.com]Example[/url] #[url=https://example.com]Example[/url] ![url=https://example.com]Example[/url]', + 'body' => '@[url=https://example.com]Example[/url] #[url=https://example.com]Example[/url] ![url=https://example.com]Example[/url]', + ], + 'mixed-format' => [ + 'expected' => '@[url=https://example.com]Example[/url] #[url=https://example.com]Example[/url] ![url=https://example.com]Example[/url] @[url=https://example.com]Example[/url] #[url=https://example.com]Example[/url] ![url=https://example.com]Example[/url]', + 'body' => '[url=https://example.com]@Example[/url] [url=https://example.com]#Example[/url] [url=https://example.com]!Example[/url] @[url=https://example.com]Example[/url] #[url=https://example.com]Example[/url] ![url=https://example.com]Example[/url]', + ], + ]; + } + + /** + * @dataProvider dataNormalizeMentionLinks + * + * @param string $expected + * @param string $body + */ + public function testNormalizeMentionLinks(string $expected, string $body) + { + $this->assertEquals($expected, ProcessorMock::normalizeMentionLinks($body)); + } + + public function dataAddMentionLinks(): array + { + return [ + 'issue-10603' => [ + 'expected' => '@[url=https://social.wake.st/users/liaizon]liaizon@social.wake.st[/url] @[url=https://friendica.mrpetovan.com/profile/hypolite]hypolite@friendica.mrpetovan.com[/url] yes

', + 'body' => '@liaizon@social.wake.st @hypolite@friendica.mrpetovan.com yes

', + 'tags' => [ + [ + 'type' => 'Mention', + 'href' => 'https://social.wake.st/users/liaizon', + 'name' => '@liaizon@social.wake.st' + ], + [ + 'type' => 'Mention', + 'href' => 'https://friendica.mrpetovan.com/profile/hypolite', + 'name' => '@hypolite@friendica.mrpetovan.com' + ] + ], + ], + ]; + } + + /** + * @dataProvider dataAddMentionLinks + * + * @param string $expected + * @param string $body + * @param array $tags + */ + public function testAddMentionLinks(string $expected, string $body, array $tags) + { + $this->assertEquals($expected, ProcessorMock::addMentionLinks($body, $tags)); + } +}