OPENRECの「ユーザーID」が未設定のユーザのコメントを取得した場合に発生する不具合を修正

Author: ryu-s

OpenrecSitePlugin/API.cs

@@ -132,13 +132,13 @@ public static async Task<List<string>> GetBanList(IDataSource dataSource, Contex
             var packet = Packet.Parse(str) as PacketOpen;
             return packet.Context;
         }
-        public static async Task<Low.Chats.RootObject[]> GetChats(IDataSource dataSource, string liveId, DateTime toCreatedAt, CookieContainer cc)
+        public static async Task<(Low.Chats.RootObject[], string raw)> GetChats(IDataSource dataSource, string liveId, DateTime toCreatedAt, CookieContainer cc)
         {
             //https://public.openrec.tv/external/api/v5/movies/9PgmVnlqtMz/chats?to_created_at=2018-07-24T19:32:50.395Z
             var url = "https://public.openrec.tv/external/api/v5/movies/" + liveId + "/chats?to_created_at=" + toCreatedAt.ToString("yyyy-MM-ddTHH:mm:ss.fffZ");
             var res = await dataSource.GetAsync(url, cc);
             var obj = Tools.Deserialize<Low.Chats.RootObject[]>(res);
-            return obj;
+            return (obj, res);
         }
         /// <summary>
         /// 

OpenrecSitePlugin/CommentProvider.cs

@@ -103,9 +103,8 @@ protected virtual CookieContainer CreateCookieContainer(IBrowserProfile browserP
             return cc;
         }
         //protected virtual Extract()
-        public async Task ConnectAsync(string input, IBrowserProfile browserProfile)
+        private async Task ConnectInternalAsync(string input, IBrowserProfile browserProfile)
         {
-            BeforeConnecting();
             if (_ws != null)
             {
                 throw new InvalidOperationException("");
@@ -146,17 +145,24 @@ public async Task ConnectAsync(string input, IBrowserProfile browserProfile)
             _startAt = movieContext2.StartedAt.DateTime;
             _500msTimer.Enabled = true;
 
-            var chats = await GetChats(movieContext2);
-            foreach (var item in chats)
+            var (chats, raw) = await GetChats(movieContext2);
+            try
             {
-                var comment = Tools.Parse(item);
-                var commentData = Tools.CreateCommentData(comment, _startAt, _siteOptions);
-                var messageContext = CreateMessageContext(comment, commentData, true);
-                if (messageContext != null)
+                foreach (var item in chats)
                 {
-                    MessageReceived?.Invoke(this, messageContext);
+                    var comment = Tools.Parse(item);
+                    var commentData = Tools.CreateCommentData(comment, _startAt, _siteOptions);
+                    var messageContext = CreateMessageContext(comment, commentData, true);
+                    if (messageContext != null)
+                    {
+                        MessageReceived?.Invoke(this, messageContext);
+                    }
                 }
             }
+            catch (Exception ex)
+            {
+                _logger.LogException(ex, "", "raw=" + raw);
+            }
             foreach (var user in _userStoreManager.GetAllUsers(SiteType.Openrec))
             {
                 if (!(user is IUser2 user2)) continue;
@@ -231,7 +237,18 @@ public async Task ConnectAsync(string input, IBrowserProfile browserProfile)
                     goto Reconnect;
                 }
             }
-            AfterDisconnected();
+        }
+        public async Task ConnectAsync(string input, IBrowserProfile browserProfile)
+        {
+            BeforeConnecting();
+            try
+            {
+                await ConnectInternalAsync(input, browserProfile);
+            }
+            finally
+            {
+                AfterDisconnected();
+            }
         }
 
         protected virtual IBlackListProvider CreateBlacklistProvider()
@@ -244,7 +261,7 @@ protected virtual IOpenrecWebsocket CreateOpenrecWebsocket()
             return new OpenrecWebsocket(_logger);
         }
 
-        protected virtual async Task<Low.Chats.RootObject[]> GetChats(MovieInfo movieContext2)
+        protected virtual async Task<(Low.Chats.RootObject[], string raw)> GetChats(MovieInfo movieContext2)
         {
             return await API.GetChats(_dataSource, movieContext2.Id, DateTime.Now, _cc);
         }

OpenrecSitePlugin/Tools.cs

@@ -232,7 +232,12 @@ public static IComment Parse(Low.Chats.RootObject obj)
                 Nickname = obj.User.Nickname,
                 PostedAt = obj.PostedAt.DateTime,
                 StampUrl = obj.Stamp?.ImageUrl,
-                UserId = obj.User.Id,
+                //2019/07/09 obj.User.Idはnullの場合があったため変更した
+                //User.Idはユーザページの「ユーザ情報」で変更できる。
+                //「 ユーザーIDを設定すると、チャットやコメントが可能になります。」との記載があるため、
+                //コメントを投稿できている時点でnullは無いと思っていた。
+                //恐らく設定直後で反映されていないんだろう。
+                UserId = obj.User.OpenrecUserId.ToString(),
                 YellPoints = obj.Yell?.Points,
                  UserIconUrl=obj.User.IconImageUrl,
             };