From 4b753704878bb105dae2c75300f493124cdda1a3 Mon Sep 17 00:00:00 2001 From: mujurin1 Date: Sun, 17 Mar 2024 06:16:42 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=8B=E3=82=B3=E7=94=9F=E3=81=A7=E3=83=A6?= =?UTF-8?q?=E3=83=BC=E3=82=B6=E3=83=BC=E5=90=8D=E3=81=8C=E8=A1=A8=E7=A4=BA?= =?UTF-8?q?=E3=81=95=E3=82=8C=E3=82=8B=E3=82=88=E3=81=86=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitattributes | 2 +- NicoSitePlugin2/Api.cs | 6 ------ NicoSitePlugin2/TestCommentProvider.cs | 3 +++ 3 files changed, 4 insertions(+), 7 deletions(-) diff --git a/.gitattributes b/.gitattributes index 1ff0c423..be3fd97e 100644 --- a/.gitattributes +++ b/.gitattributes @@ -10,7 +10,7 @@ # default for csharp files. # Note: This is only used by command line ############################################################################### -#*.cs diff=csharp +*.cs diff=csharp ############################################################################### # Set the merge driver for project and solution files diff --git a/NicoSitePlugin2/Api.cs b/NicoSitePlugin2/Api.cs index 39369ec9..9987d425 100644 --- a/NicoSitePlugin2/Api.cs +++ b/NicoSitePlugin2/Api.cs @@ -16,12 +16,6 @@ public ApiGetCommunityLivesException() } } class NotLoggedInException : Exception { } - class UserInfo - { - public string Nickname { get; set; } - public string UserIconUrl { get; set; } - - } static class Api { public static async Task GetCommunityLives(IDataSource server, CookieContainer cc, string communityId) diff --git a/NicoSitePlugin2/TestCommentProvider.cs b/NicoSitePlugin2/TestCommentProvider.cs index b0dbb1bd..cbe26f29 100644 --- a/NicoSitePlugin2/TestCommentProvider.cs +++ b/NicoSitePlugin2/TestCommentProvider.cs @@ -427,6 +427,9 @@ private async Task ProcessChatMessageAsync(Chat.IChatMessage message) { _chatProvider?.Disconnect(); } + if (chat.Name != null) { + user.Name = Common.MessagePartFactory.CreateMessageItems(chat.Name); + } if (_siteOptions.IsAutoSetNickname) { var nick = SitePluginCommon.Utils.ExtractNickname(chat.Content);