Merge pull request #260 from Hampo/dev

Update EmoteExtractor to support multibyte
TwitchLib · Dec 4, 2023 · cdf0e4c · cdf0e4c
2 parents cf5f549 + 1066b8b
commit cdf0e4c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/TwitchLib.Client.Models/Extractors/EmoteExtractor.cs b/TwitchLib.Client.Models/Extractors/EmoteExtractor.cs
@@ -10,6 +10,7 @@ public static List<Emote> Extract(string? rawEmoteSetString, string message)
             if (string.IsNullOrEmpty(rawEmoteSetString) || string.IsNullOrEmpty(message))
                 return emotes;
 
+            System.Globalization.StringInfo messageInfo = new(message);
             // 25:5-9,28-32/28087:15-21 => 25:5-9,28-32  28087:15-21
 #pragma warning disable CS8604 // Possible null reference argument. false positiv in NS 2.0
             foreach (var emoteData in new SpanSliceEnumerator(rawEmoteSetString, '/'))
@@ -30,7 +31,11 @@ public static List<Emote> Extract(string? rawEmoteSetString, string message)
                     var start = int.Parse(startSlice);
                     var end = int.Parse(endSlice);
 #endif
-                    emotes.Add(new(emoteId, message.Substring(start, end - start + 1), start, end));
+                    int trueStart = messageInfo.SubstringByTextElements(0, start + 1).Length - 1;
+                    string name = messageInfo.SubstringByTextElements(start, end - start + 1);
+                    int trueEnd = trueStart + name.Length - 1;
+
+                    emotes.Add(new(emoteId, name, trueStart, trueEnd));
                 }
             }
             return emotes;

diff --git a/TwitchLib.Client.Test/Parsing.cs b/TwitchLib.Client.Test/Parsing.cs
@@ -1,4 +1,5 @@
-using TwitchLib.Client.Models.Internal;
+using TwitchLib.Client.Models.Extractors;
+using TwitchLib.Client.Models.Internal;
 using Xunit;
 
 namespace TwitchLib.Client.Test;
@@ -21,6 +22,14 @@ public void Badges()
         TagHelper.ToBadges(badges);
     }
 
+    [Fact]
+    public void EmoteExtractorExtract()
+    {
+        var emotes = EmoteExtractor.Extract("25:10-14", "One 😂 Two Kappa Three");
+        Assert.True(emotes.Count == 1);
+        Assert.True(emotes[0].Name == "Kappa");
+    }
+
 
     [Theory]
     [InlineData("@ban-duration=350;room-id=12345678;target-user-id=87654321;tmi-sent-ts=1642719320727 :tmi.twitch.tv CLEARCHAT #dallas :ronni")]