さらに再修正

emojiの形式が増えていた

Author: ryu-s

MultiCommentViewer/Properties/AssemblyInfo.cs

@@ -3,4 +3,4 @@
 
 [assembly: InternalsVisibleTo("MultiCommentViewerTests")]
 
-[assembly: AssemblyVersion("0.6.7")]
+[assembly: AssemblyVersion("0.6.10")]

YouTubeLiveSitePlugin/Next/Tools.cs

@@ -299,13 +299,22 @@ private static List<IMessagePart> GetMessageParts(dynamic ren)
                         }
                         else if (r.ContainsKey("emoji"))
                         {
+                            //SVGは現状表示させられないから、urlの末尾が.svgの場合はTextとして扱い、emojiIdを表示する
                             var emoji = r.emoji;
                             var thumbnail = emoji.image.thumbnails[0];
-                            var emojiUrl = thumbnail.url;
-                            var emojiWidth = (int)(((int?)thumbnail.width) ?? 24);
-                            var emojiHeight = (int)(((int?)thumbnail.height) ?? 24);
-                            var emojiAlt = emoji.image.accessibility.accessibilityData.label;
-                            messageItems.Add(new MessageImage { Url = emojiUrl, Alt = emojiAlt, Height = emojiHeight, Width = emojiWidth });
+                            var emojiUrl = (string)thumbnail.url;
+                            if (emojiUrl.EndsWith(".svg"))
+                            {
+                                var text = (string)emoji.emojiId;
+                                messageItems.Add(MessagePartFactory.CreateMessageText(text));
+                            }
+                            else
+                            {
+                                var emojiWidth = thumbnail.ContainsKey("width") ? (int)thumbnail.width : 24;
+                                var emojiHeight = thumbnail.ContainsKey("height") ? (int)thumbnail.height : 24;
+                                var emojiAlt = emoji.image.accessibility.accessibilityData.label;
+                                messageItems.Add(new MessageImage { Url = emojiUrl, Alt = emojiAlt, Height = emojiHeight, Width = emojiWidth });
+                            }
                         }
                         else
                         {
@@ -315,7 +324,7 @@ private static List<IMessagePart> GetMessageParts(dynamic ren)
                 }
                 catch(Exception ex)
                 {
-                    var raw = ((string)ren.runs.ToString()).Replace(Environment.NewLine, "");
+                    var raw = ((string)ren.message.runs.ToString()).Replace(Environment.NewLine, "");
                     throw new ParseException(raw, ex);
                 }
             }

YouTubeLiveSitePlugin/Test2/Exceptions.cs

@@ -63,7 +63,10 @@ public ParseException(string raw)
         {
             Raw = raw;
         }
-        public ParseException(string raw, Exception inner) : base("", inner) { }
+        public ParseException(string raw, Exception inner) : base("", inner)
+        {
+            Raw = raw;
+        }
     }
 
     [Serializable]