From 6bb176263a6381e8d71dd07c8ce64d526f450e07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= Date: Mon, 18 Apr 2022 00:08:11 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=E7=A8=80=E3=81=AB=E3=83=A6=E3=83=BC?= =?UTF-8?q?=E3=82=B6=E6=83=85=E5=A0=B1=E3=81=8C=E5=8F=96=E5=BE=97=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=81=AA=E3=81=84=E5=A0=B4=E5=90=88=E3=81=8C=E3=81=82?= =?UTF-8?q?=E3=82=8A=E5=8F=96=E5=BE=97=E5=87=BA=E6=9D=A5=E3=81=AA=E3=81=84?= =?UTF-8?q?=E3=81=A8=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=99=E3=82=89?= =?UTF-8?q?=E8=A1=A8=E7=A4=BA=E3=81=95=E3=82=8C=E3=81=AA=E3=81=8F=E3=81=AA?= =?UTF-8?q?=E3=82=8B=E3=81=AE=E3=81=A7=E5=9B=9E=E9=81=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NicoSitePlugin2/Api.cs | 4 +--- NicoSitePlugin2/TestCommentProvider.cs | 13 ++++++------- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/NicoSitePlugin2/Api.cs b/NicoSitePlugin2/Api.cs index 2a54e17f..6e51dd88 100644 --- a/NicoSitePlugin2/Api.cs +++ b/NicoSitePlugin2/Api.cs @@ -30,9 +30,7 @@ public static async Task GetUserInfo(IDataSource server, CookieContain var res = await server.GetAsync(url, cc); var obj = JsonConvert.DeserializeObject(res); if (obj.Data.Length == 0) - { - throw new ArgumentException("指定されたuserIdは存在しない:" + userId); - } + return null; var data = obj.Data[0]; var userInfo = new UserInfo { diff --git a/NicoSitePlugin2/TestCommentProvider.cs b/NicoSitePlugin2/TestCommentProvider.cs index 3eb732de..1f791d93 100644 --- a/NicoSitePlugin2/TestCommentProvider.cs +++ b/NicoSitePlugin2/TestCommentProvider.cs @@ -417,16 +417,15 @@ private async Task ProcessChatMessageAsync(Chat.IChatMessage message) { _chatProvider?.Disconnect(); } - string username; + string username = null; if (IsRawUserId(chat.UserId) && chat.UserId != SystemUserId && _siteOptions.IsAutoGetUsername) { var userInfo = await Api.GetUserInfo(_server, _cc, chat.UserId); - username = userInfo.Nickname; - user.Name = Common.MessagePartFactory.CreateMessageItems(username); - } - else - { - username = null; + if (userInfo != null) + { + username = userInfo.Nickname; + user.Name = Common.MessagePartFactory.CreateMessageItems(username); + } } if (_siteOptions.IsAutoSetNickname) { From ae028c44716ee78d2b57806e7382702a9f81ee02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=A2=E3=82=BA=E3=82=BF=E3=82=B1?= Date: Mon, 18 Apr 2022 00:24:12 +0900 Subject: [PATCH 2/2] =?UTF-8?q?null=E6=BC=94=E7=AE=97=E5=AD=90=E3=81=AE?= =?UTF-8?q?=E3=81=93=E3=81=A8=E3=82=92=E5=BF=98=E3=82=8C=E3=81=A6=E3=81=84?= =?UTF-8?q?=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- NicoSitePlugin2/TestCommentProvider.cs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/NicoSitePlugin2/TestCommentProvider.cs b/NicoSitePlugin2/TestCommentProvider.cs index 1f791d93..22fc1562 100644 --- a/NicoSitePlugin2/TestCommentProvider.cs +++ b/NicoSitePlugin2/TestCommentProvider.cs @@ -421,11 +421,8 @@ private async Task ProcessChatMessageAsync(Chat.IChatMessage message) if (IsRawUserId(chat.UserId) && chat.UserId != SystemUserId && _siteOptions.IsAutoGetUsername) { var userInfo = await Api.GetUserInfo(_server, _cc, chat.UserId); - if (userInfo != null) - { - username = userInfo.Nickname; - user.Name = Common.MessagePartFactory.CreateMessageItems(username); - } + username = userInfo?.Nickname; + user.Name = Common.MessagePartFactory.CreateMessageItems(username); } if (_siteOptions.IsAutoSetNickname) {