Merge pull request #163 from ca45382/develop

v1.0.1用
ca45382 · Feb 21, 2023 · d4bec64 · d4bec64
2 parents d88fdd2 + d03e2dc
commit d4bec64
Show file tree

Hide file tree

Showing 10 changed files with 59 additions and 58 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,8 @@ bld/
 [Ll]og/
 [Ll]ogs/
 
+Properties/Resources.Designer.cs
+
 # Visual Studio 2015/2017 cache/options directory
 .vs/
 # Uncomment if you have tasks that create the project's static files in wwwroot

diff --git a/ShioriBot.sln b/ShioriBot.sln
@@ -1,9 +1,9 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.31105.61
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31919.166
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShioriBot.Net", "src/ShioriBot.Net.csproj", "{24C95780-F93B-425D-9B2A-6D1B941FC8A7}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShioriBotDotNet", "src\ShioriBotDotNet.csproj", "{24C95780-F93B-425D-9B2A-6D1B941FC8A7}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/src/Extension/EnumerableExtension.cs b/src/Extension/EnumerableExtension.cs
@@ -13,27 +13,5 @@ public static void ForEach<T>([NotNull] this IEnumerable<T> source, [NotNull] Ac
                 action(element);
             }
         }
-
-        public static TSource MaxBy<TSource, TValue>([NotNull] this IEnumerable<TSource> source, [NotNull] Func<TSource, TValue> func)
-            where TValue : IComparable<TValue>
-        {
-            var firstFlag = true;
-            TValue maxValue = default;
-            TSource maxSource = default;
-
-            foreach (var element in source)
-            {
-                var value = func(element);
-
-                if (firstFlag || value.CompareTo(maxValue) > 0)
-                {
-                    maxValue = value;
-                    maxSource = element;
-                    firstFlag = false;
-                }
-            }
-
-            return maxSource;
-        }
     }
 }
diff --git a/src/Properties/Resources.Designer.cs b/src/Properties/Resources.Designer.cs
diff --git a/src/Script/ClanBattle/BattleDeclaration.cs b/src/Script/ClanBattle/BattleDeclaration.cs
@@ -205,7 +205,7 @@ private async Task SendDeclarationBotMessage()
             var embed = CreateDeclarationDataEmbed();
             var content = CreateDeclarationDataMessage();
             var component = CreateDeclareComponent();
-            var sentMessage = await m_DeclarationChannel.SendMessageAsync(text: content, embed: embed, component: component);
+            var sentMessage = await m_DeclarationChannel.SendMessageAsync(text: content, embed: embed, components: component);
 
             if (sentMessage == null)
             {

diff --git a/src/Script/ClanBattle/BattleReservationSummary.cs b/src/Script/ClanBattle/BattleReservationSummary.cs
@@ -55,7 +55,7 @@ public async Task SendMessage()
         {
             var embedData = CreateEmbed();
             var componentData = CreateComponent();
-            var sendedMessageData = await m_SocketTextChannel.SendMessageAsync(embed: embedData, component: componentData);
+            var sendedMessageData = await m_SocketTextChannel.SendMessageAsync(embed: embedData, components: componentData);
             DatabaseMessageDataController.UpdateMessageID(m_ClanData, sendedMessageData.Id, MessageFeatureType.ReserveResultID);
         }
 
@@ -67,6 +67,12 @@ public async Task UpdateMessage()
             }
 
             var reservationMessageID = m_ClanData.GetMessageID(MessageFeatureType.ReserveResultID);
+
+            if (reservationMessageID == 0)
+            {
+                return;
+            }
+
             var cachedMessage = m_SocketTextChannel.GetCachedMessage(reservationMessageID);
             var embedData = CreateEmbed();
             var componentData = CreateComponent();

diff --git a/src/Script/ClanBattle/UpdateDate.cs b/src/Script/ClanBattle/UpdateDate.cs
@@ -29,6 +29,7 @@ public async Task DeleteYesterdayData()
             sw.Start();
 
             var nowTime = DateTime.Now;
+            //var nowTime = new DateTime(2022, 3, 28, 6,0,0);
 
             var reservarionDataList = DatabaseReservationController.LoadReservationData()
                 .Where(x => x.CreateDateTime < m_BoundaryTime);
@@ -55,20 +56,29 @@ public async Task DeleteYesterdayData()
                     continue;
                 }
 
-                taskList.Add(new BattleTaskKill(clanRole).SyncTaskKillData());
-
-                if (RediveClanBattleData.ClanBattleStartTime <= nowTime && nowTime <= RediveClanBattleData.ClanBattleEndTime)
+                try
                 {
-                    taskList.Add(new BattleReservationSummary(clanRole).UpdateMessage());
+                    taskList.Add(new BattleTaskKill(clanRole).SyncTaskKillData());
 
-                    for (int i = 0; i < CommonDefine.MaxBossNumber; i++)
+                    if (RediveClanBattleData.ClanBattleStartTime <= nowTime && nowTime <= RediveClanBattleData.ClanBattleEndTime)
                     {
-                        taskList.Add(new BattleDeclaration(clanRole, (BossNumberType)(i + 1)).UpdateDeclarationBotMessage());
-                        // TODO:ここに進行の方も追加
+                        taskList.Add(new BattleReservationSummary(clanRole).UpdateMessage());
+
+                        for (int i = 0; i < CommonDefine.MaxBossNumber; i++)
+                        {
+                            taskList.Add(new BattleDeclaration(clanRole, (BossNumberType)(i + 1)).UpdateDeclarationBotMessage());
+                            // TODO:ここに進行の方も追加
+                        }
                     }
+
+                    await Task.WhenAll(taskList);
+                }
+                catch (Exception ex)
+                {
+                    Console.WriteLine(ex.ToString());
                 }
 
-                await Task.WhenAll(taskList);
+                await Task.Delay(1000);
             }
 
             sw.Stop();

diff --git a/src/Script/Program.cs b/src/Script/Program.cs
@@ -41,8 +41,7 @@ public async Task MainAsync()
 
             m_client = new DiscordSocketClient(m_config);
             m_client.MessageReceived += CommandRecieved;
-            m_client.GuildMembersDownloaded += GuildMembersDownloaded;
-            m_client.UserLeft += UserLeft;
+            m_client.Ready += Client_Ready;
             m_client.GuildMemberUpdated += GuildMemberUpdated;
             m_client.InteractionCreated += InteractionCreated;
             m_client.Log += Log;
@@ -91,22 +90,20 @@ private async Task CommandRecieved(SocketMessage socketMessage)
         /// </summary>
         /// <param name="guild"></param>
         /// <returns></returns>
-        private Task GuildMembersDownloaded(SocketGuild guild)
+        private async Task Client_Ready()
         {
-            var discordDataLoader = new DiscordDataLoader();
-            discordDataLoader.UpdateServerData(guild);
-            discordDataLoader.UpdateClanData(guild);
-            discordDataLoader.UpdatePlayerData(guild);
-            return Task.CompletedTask;
-        }
+            var guildList = m_client.Guilds;
 
-        private Task UserLeft(SocketGuildUser userInfo)
-        {
-            var discordDataLoader = new DiscordDataLoader();
-            discordDataLoader.UpdateServerData(userInfo.Guild);
-            discordDataLoader.UpdateClanData(userInfo.Guild);
-            discordDataLoader.UpdatePlayerData(userInfo.Guild);
-            return Task.CompletedTask;
+            await Task.Run(() =>
+            {
+                foreach (var guild in guildList)
+                {
+                    var discordDataLoader = new DiscordDataLoader();
+                    discordDataLoader.UpdateServerData(guild);
+                    discordDataLoader.UpdateClanData(guild);
+                    discordDataLoader.UpdatePlayerData(guild);
+                }
+            });
         }
 
         private Task GuildMemberUpdated(Cacheable<SocketGuildUser, ulong> cachedGuildUser, SocketGuildUser newUserInfo)
@@ -126,6 +123,7 @@ private async Task InteractionCreated(SocketInteraction socketInteraction)
             }
 
             await new ReceiveInteractionController(socketInteraction).Run();
+            await socketInteraction.DeferAsync();
         }
 
         private async Task RefreshInUpdateDate()

diff --git a/src/Script/Utility/Logger.cs b/src/Script/Utility/Logger.cs
@@ -10,7 +10,11 @@ public static class Logger
         public static async Task SendLogMessage(SocketRole role, ClanData clanData, string logMessage)
         {
             var logChannel = role.Guild.GetTextChannel(clanData.GetChannelID(ChannelFeatureType.LogID));
-            await logChannel.SendMessageAsync(logMessage);
+
+            if (logChannel != null)
+            {
+                await logChannel.SendMessageAsync(logMessage);
+            }
         }
     }
 }
diff --git a/src/ShioriBot.Net.csproj → src/ShioriBotDotNet.csproj b/src/ShioriBot.Net.csproj → src/ShioriBotDotNet.csproj
@@ -2,18 +2,21 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <Configurations>Debug;Release</Configurations>
+    <RootNamespace>ShioriBot</RootNamespace>
+    <AssemblyName>ShioriBotDotNet</AssemblyName>
+    <PlatformTarget>x64</PlatformTarget>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
     <DefineConstants>DEBUG;TRACE</DefineConstants>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net.Labs" Version="3.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.11" />
-    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="5.0.2" />
+    <PackageReference Include="Discord.Net" Version="3.9.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.14" />
+    <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="6.0.2" />
   </ItemGroup>
 
   <ItemGroup>