notfire/Iceshrimp.NET
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[parsing] Allow usernames starting & ending with an underscore

Browse source
This commit is contained in:
Laura Hausmann 2024-05-18 16:53:20 +02:00
parent adba960f8c
commit 91544cdd78
No known key found for this signature in database
GPG key ID: D044E84C5BE01605
2 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Iceshrimp.Parsing/Mfm.fs
View file

@ -228,7 +228,8 @@ module private MfmParser =
>>. skipString "@" >>. skipString "@"
>>. many1Chars ( >>. many1Chars (
satisfy isAsciiLetterOrNumber satisfy isAsciiLetterOrNumber
<|> attempt (anyOf "._-" .>> nextCharSatisfies isAsciiLetterOrNumber) <|> pchar '_'
<|> attempt (anyOf ".-" .>> nextCharSatisfies isAsciiLetterOrNumber)
) )
.>>. opt (skipChar '@' >>. domain) .>>. opt (skipChar '@' >>. domain)
.>> (lookAhead .>> (lookAhead

12
Iceshrimp.Tests/Parsing/MfmTests.cs
View file

@ -66,13 +66,21 @@ public class MfmTests
[TestMethod] [TestMethod]
public void TestMention() public void TestMention()
{ {
const string input = "test @test test @test@instance.tld"; const string input = "test @test test @test@instance.tld @test_ @_test @test_@instance.tld @_test@instance.tld";
List<MfmNode> expected = List<MfmNode> expected =
[ [
new MfmTextNode("test "), new MfmTextNode("test "),
new MfmMentionNode("test", "test", null), new MfmMentionNode("test", "test", null),
new MfmTextNode(" test "), new MfmTextNode(" test "),
new MfmMentionNode("test@instance.tld", "test", "instance.tld") new MfmMentionNode("test@instance.tld", "test", "instance.tld"),
new MfmTextNode(" "),
new MfmMentionNode("test_", "test_", null),
new MfmTextNode(" "),
new MfmMentionNode("_test", "_test", null),
new MfmTextNode(" "),
new MfmMentionNode("test_@instance.tld", "test_", "instance.tld"),
new MfmTextNode(" "),
new MfmMentionNode("_test@instance.tld", "_test", "instance.tld"),
]; ];
var res = Mfm.parse(input); var res = Mfm.parse(input);