chris/pixelfed
1
0
Fork 0
forked from mirror/pixelfed
Code Pull requests Activity

Update lexer regex, fix mention regex and add more tests

Browse source
This commit is contained in:
Daniel Supernault 2023-10-15 03:51:45 -06:00
parent 36df0d8373
commit 778e83d398
No known key found for this signature in database
GPG key ID: 23740873EE6F76A1
2 changed files with 64 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Util/Lexer/Regex.php
View file

@ -162,7 +162,7 @@ abstract class Regex
// look-ahead capture here and don't append $after when we return. // look-ahead capture here and don't append $after when we return.
$tmp['valid_mention_preceding_chars'] = '([^a-zA-Z0-9_!#\$%&*@＠\/]|^|(?:^|[^a-z0-9_+~.-])RT:?)'; $tmp['valid_mention_preceding_chars'] = '([^a-zA-Z0-9_!#\$%&*@＠\/]|^|(?:^|[^a-z0-9_+~.-])RT:?)';
$re['valid_mentions_or_lists'] = '/'.$tmp['valid_mention_preceding_chars'].'(['.$tmp['at_signs'].'])([a-z0-9_\-.]{1,20})((\/[a-z][a-z0-9_\-]{0,24})?(?=(.*|$))(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i'; $re['valid_mentions_or_lists'] = '/'.$tmp['valid_mention_preceding_chars'].'(['.$tmp['at_signs'].'])([\p{L}0-9_\-.]{1,20})((\/[a-z][a-z0-9_\-]{0,24})?(?=(.*|$))(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/iu';
$re['valid_reply'] = '/^(?:['.$tmp['spaces'].'])*['.$tmp['at_signs'].']([a-z0-9_\-.]{1,20})(?=(.*|$))/iu'; $re['valid_reply'] = '/^(?:['.$tmp['spaces'].'])*['.$tmp['at_signs'].']([a-z0-9_\-.]{1,20})(?=(.*|$))/iu';
$re['end_mention_match'] = '/\A(?:['.$tmp['at_signs'].']|['.$tmp['latin_accents'].']|:\/\/)/iu'; $re['end_mention_match'] = '/\A(?:['.$tmp['at_signs'].']|['.$tmp['latin_accents'].']|:\/\/)/iu';

63
tests/Unit/Lexer/UsernameTest.php
View file

@ -175,4 +175,67 @@ class UsernameTest extends TestCase
$this->assertEquals($expectedEntity, $entities); $this->assertEquals($expectedEntity, $entities);
} }
/** @test * */
public function germanUmlatsAutolink()
{
$mentions = "@März and @königin and @Glück";
$autolink = Autolink::create()->autolink($mentions);
$expectedAutolink = '<a class="u-url mention" href="https://pixelfed.dev/März" rel="external nofollow noopener" target="_blank">@März</a> and <a class="u-url mention" href="https://pixelfed.dev/königin" rel="external nofollow noopener" target="_blank">@königin</a> and <a class="u-url mention" href="https://pixelfed.dev/Glück" rel="external nofollow noopener" target="_blank">@Glück</a>';
$this->assertEquals($expectedAutolink, $autolink);
}
/** @test * */
public function germanUmlatsExtractor()
{
$mentions = "@März and @königin and @Glück";
$entities = Extractor::create()->extract($mentions);
$expectedEntity = [
"hashtags" => [],
"urls" => [],
"mentions" => [
"märz",
"königin",
"glück",
],
"replyto" => null,
"hashtags_with_indices" => [],
"urls_with_indices" => [],
"mentions_with_indices" => [
[
"screen_name" => "März",
"indices" => [
0,
5,
],
],
[
"screen_name" => "königin",
"indices" => [
10,
18,
],
],
[
"screen_name" => "Glück",
"indices" => [
23,
29,
],
],
],
];
$this->assertEquals($expectedEntity, $entities);
}
/** @test * */
public function germanUmlatsWebfingerAutolink()
{
$mentions = "hello @märz@example.org!";
$autolink = Autolink::create()->autolink($mentions);
$expectedAutolink = 'hello <a class="u-url list-slug" href="https://pixelfed.dev/@märz@example.org" rel="external nofollow noopener" target="_blank">@märz@example.org</a>!';
$this->assertEquals($expectedAutolink, $autolink);
}
} }