h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-16 14:22:54 +08:00
Code Issues Releases Wiki Activity

Emojis now represented as "[emoji]"

Browse Source
This commit is contained in:
Andrew Hong 2023-07-13 01:09:35 -04:00
parent f44e6e510d
commit 3d17a03dc6
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Chat/MessageFormatterTests.cs
View File

@ -478,7 +478,7 @@ namespace osu.Game.Tests.Chat
Content = "This is a [http://www.simple-test.com simple test] with some [traps] and [[wiki links]]. Don't forget to visit https://osu.ppy.sh (now!)[http://google.com]\uD83D\uDE12" Content = "This is a [http://www.simple-test.com simple test] with some [traps] and [[wiki links]]. Don't forget to visit https://osu.ppy.sh (now!)[http://google.com]\uD83D\uDE12"
}); });
Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now!", result.DisplayContent); Assert.AreEqual("This is a simple test with some [traps] and wiki links. Don't forget to visit https://osu.ppy.sh now![emoji]", result.DisplayContent);
Assert.AreEqual(4, result.Links.Count); Assert.AreEqual(4, result.Links.Count);
Link f = result.Links.Find(l => l.Url == "https://dev.ppy.sh/wiki/wiki links"); Link f = result.Links.Find(l => l.Url == "https://dev.ppy.sh/wiki/wiki links");
@ -503,11 +503,10 @@ namespace osu.Game.Tests.Chat
} }
[Test] [Test]
[Ignore("https://github.com/ppy/osu/pull/24190")]
public void TestEmoji() public void TestEmoji()
{ {
Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" }); Message result = MessageFormatter.FormatMessage(new Message { Content = "Hello world\uD83D\uDE12<--This is an emoji,There are more emojis among us:\uD83D\uDE10\uD83D\uDE00,\uD83D\uDE20" });
Assert.AreEqual("Hello world\0\0\0<--This is an emoji,There are more:\0\0\0\0\0\0,\0\0\0", result.DisplayContent); Assert.AreEqual("Hello world[emoji]<--This is an emoji,There are more emojis among us:[emoji][emoji],[emoji]", result.DisplayContent);
Assert.AreEqual(result.Links.Count, 4); Assert.AreEqual(result.Links.Count, 4);
Assert.AreEqual(result.Links[0].Index, 11); Assert.AreEqual(result.Links[0].Index, 11);
Assert.AreEqual(result.Links[1].Index, 49); Assert.AreEqual(result.Links[1].Index, 49);

2
osu.Game/Online/Chat/MessageFormatter.cs
View File

@ -257,7 +257,7 @@ namespace osu.Game.Online.Chat
private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3) private static MessageFormatterResult format(string toFormat, int startIndex = 0, int space = 3)
{ {
// see: https://github.com/ppy/osu/pull/24190 // see: https://github.com/ppy/osu/pull/24190
toFormat = Regex.Replace(toFormat, emoji_regex.ToString(), string.Empty); toFormat = Regex.Replace(toFormat, emoji_regex.ToString(), "[emoji]");
var result = new MessageFormatterResult(toFormat); var result = new MessageFormatterResult(toFormat);