汎用コマンド解釈処理部分の作成

DataType/ErrorType.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.ComponentModel;
+using System.ComponentModel;
 
 namespace PriconneBotConsoleApp.DataType
 {
@@ -12,10 +9,13 @@ public enum ErrorType
         //予約関連
         [Description("予約に失敗しました。")]
         FailedReservation,
+
         [Description("予約できません。予約可能時間は{0}:00～{1}:00です。")]
         OutOfReservationTime,
+
         [Description("コメントが長いので切り取られました。\n 問題がある場合は予約削除をして再度予約してください。")]
         TooLongComment,
+
         [Description("予約できません。予約は{0}周目まで可能です。")]
         OutOfReservationBossLaps,
 

DataType/InfomationType.cs

@@ -13,7 +13,7 @@ public enum InfomationType
 
         // 凸報告関連
         [Description("<@{0}>の凸報告を代理削除しました。\nこのメッセージは{1}秒後削除されます。")]
-        DeleteInsted,
+        DeleteInstead,
 
         //持ち越し関連
         [Description("持ち越しをすべて削除しました。\nこのメッセージは{0}秒後削除されます。")]

Database/Shiori/DatabaseReservationController.cs

@@ -51,7 +51,7 @@ public static List<ReservationData> LoadReservationData(PlayerData playerData)
 
         public static IEnumerable<ReservationData> LoadReservationData(ClanData clanData, int bossNumber)
         {
-            if (bossNumber < CommonDefine.MinBossNumber || bossNumber > CommonDefine.MaxBossNumber)
+            if (!CommonDefine.IsValidBossNumber(bossNumber))
             {
                 return null;
             }
@@ -66,7 +66,7 @@ public static IEnumerable<ReservationData> LoadReservationData(ClanData clanData
 
         public static List<ReservationData> LoadBossLapReservationData(ClanData clanData, int bossNumber)
         {
-            if (bossNumber < CommonDefine.MinBossNumber || bossNumber > CommonDefine.MaxBossNumber)
+            if (!CommonDefine.IsValidBossNumber(bossNumber))
             {
                 return null;
             }

Define/ClanBattleDefine.cs

@@ -3,5 +3,8 @@
     public static class ClanBattleDefine
     {
         public const short MaxLapNumber = 250;
+
+        public static bool IsValidLapNumber(int value)
+            => 0 <= value && value <= MaxLapNumber;
     }
 }

Define/CommonDefine.cs

@@ -19,5 +19,14 @@ public static class CommonDefine
         public const int MaxDamageValue = 999999;
 
         public const int DisplayDamageUnit = 10000;
+
+        public static bool IsValidBossNumber(int value)
+            => MinBossNumber <= value && value <= MaxBossNumber;
+
+        public static bool IsValidBattleTime(int value)
+            => MinBattleTime <= value && value <= MaxBattleTime;
+
+        public static bool IsValidDamageValue(int value)
+            => 0 <= value && value <= MaxDamageValue;
     }
 }

Extension/EnumerableExtension.cs

@@ -13,5 +13,27 @@ 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;
+        }
     }
 }

Script/ClanBattle/BattleCarryOver.cs

@@ -60,8 +60,8 @@ public void UpdateCarryOverData()
 
             if (!byte.TryParse(m_CommandEventArgs.Arguments[0], out var bossNumber)
                 || !byte.TryParse(m_CommandEventArgs.Arguments[1], out var remainTime)
-                || bossNumber < CommonDefine.MinBossNumber || bossNumber > CommonDefine.MaxBossNumber
-                || remainTime < CommonDefine.MinBattleTime || remainTime > CommonDefine.MaxBattleTime
+                || !CommonDefine.IsValidBossNumber(bossNumber)
+                || !CommonDefine.IsValidBattleTime(remainTime)
                 || playerData == null)
             {
                 return;
@@ -131,14 +131,14 @@ public void DeleteOtherPlayerData()
             var targetUser = MentionUtils.TryParseUser(m_CommandEventArgs.Arguments[0], out var userID)
                     || ulong.TryParse(m_CommandEventArgs.Arguments[0], out userID)
                 ? m_CommandEventArgs.Role.Guild.GetUser(userID)
-                : throw new ArgumentNullException();
+                : throw new ArgumentNullException("ユーザー情報がありません。");
 
             // コマンドは `!rm @削除対象のユーザー 古い方から何番目か` としている。
             if (!byte.TryParse(m_CommandEventArgs.Arguments[1], out var number)
                 || number <= 0
                 || CommonDefine.MaxReportNumber < number)
             {
-                throw new ArgumentOutOfRangeException();
+                throw new ArgumentOutOfRangeException("持ち越しがありません。");
             }
 
             var playerData = DatabasePlayerDataController.LoadPlayerData(m_CommandEventArgs.Role, targetUser.Id);
@@ -172,7 +172,7 @@ private void DeletePlayerCarryOverData(PlayerData playerData, byte deleteNumber)
 
             if (carryOverList.Length == 0)
             {
-                throw new ArgumentOutOfRangeException();
+                throw new ArgumentOutOfRangeException("持ち越しがありません。");
             }
 
             DatabaseCarryOverController.DeleteCarryOverData(carryOverList[(deleteNumber > 0 && deleteNumber <= carryOverList.Length) ? deleteNumber - 1 : 0]);

Script/ClanBattle/BattleProgress.cs

@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Text.RegularExpressions;
@@ -38,7 +37,7 @@ public string GetNameWithData()
 
                 return string.Join(
                     halfSizeWhitespace,
-                    ((ProgressStatus) ProgressData.Status).ToLabel(),
+                    ((ProgressStatus)ProgressData.Status).ToLabel(),
                     ProgressData.CarryOverFlag ? "持" : fullSizeWhitespace,
                     $"{ProgressData.Damage,6}@{ProgressData.RemainTime:D2}",
                     ((AttackType)ProgressData.AttackType).ToShortLabel(),
@@ -62,7 +61,7 @@ public BattleProgress(CommandEventArgs commandEventArgs)
         public async Task Start()
         {
             if (!ushort.TryParse(m_CommandEventArgs.Arguments[0], out var lap)
-                || lap > ClanBattleDefine.MaxLapNumber || lap <= 0)
+                || !ClanBattleDefine.IsValidLapNumber(lap))
             {
                 return;
             }
@@ -112,29 +111,33 @@ public async Task UpdateAttackData(AttackType attackType)
         /// <returns></returns>
         public async Task UpdateDamageData()
         {
+            // TODO : progressDataFlagでやりくりしているのが非常に見にくいので修正したい
             var progressDataFlag = false;
-            uint damageNumber = 0;
+            int damageNumber = 0;
             byte remainTimeNumber = 0;
 
+            // TODO : 冗長なRegexの高速化 #131
             if (Regex.IsMatch(m_CommandEventArgs.Name, @"\d+万$"))
             {
-                if (!uint.TryParse(Regex.Match(m_CommandEventArgs.Name, @"\d+").ToString(), out damageNumber)
-                   || damageNumber > CommonDefine.MaxDamageValue)
+                if (!int.TryParse(Regex.Match(m_CommandEventArgs.Name, @"\d+").ToString(), out damageNumber)
+                   || CommonDefine.IsValidDamageValue(damageNumber))
                 {
                     return;
                 }
 
                 progressDataFlag = true;
             }
 
+            // TODO : 冗長なRegexの高速化 #131
             if (Regex.IsMatch(m_CommandEventArgs.Name, @"\d+@\d+"))
             {
                 var damageText = Regex.Match(m_CommandEventArgs.Name, @"\d+@").ToString();
                 var remainTimeText = Regex.Match(m_CommandEventArgs.Name, @"@\d+").ToString();
 
-                if (!uint.TryParse(Regex.Match(damageText, @"\d+").ToString(), out damageNumber)
+                if (!int.TryParse(Regex.Match(damageText, @"\d+").ToString(), out damageNumber)
                     || !byte.TryParse(Regex.Match(remainTimeText, @"\d+").ToString(), out remainTimeNumber)
-                    || damageNumber > CommonDefine.MaxDamageValue || remainTimeNumber > CommonDefine.MaxBattleTime)
+                    || CommonDefine.IsValidDamageValue(damageNumber)
+                    || remainTimeNumber > CommonDefine.MaxBattleTime)
                 {
                     return;
                 }
@@ -162,7 +165,7 @@ public async Task UpdateDamageData()
                 userProgressData.Status = (byte)ProgressStatus.SOS;
             }
 
-            userProgressData.Damage = damageNumber;
+            userProgressData.Damage = (uint)damageNumber;
             userProgressData.RemainTime = remainTimeNumber;
             userProgressData.CommentData = string.Join(" ", m_CommandEventArgs.Arguments);
             await UpdateProgressData(userProgressData, m_CommandEventArgs.PlayerData);
@@ -283,7 +286,7 @@ private async Task ChangeLap(ushort lap = 0)
         /// <returns></returns>
         private void InitializeProgressData()
         {
-            if(DatabaseProgressController.GetProgressData(m_CommandEventArgs.ClanData, m_BossNumberType) is { } deleteData)
+            if (DatabaseProgressController.GetProgressData(m_CommandEventArgs.ClanData, m_BossNumberType) is { } deleteData)
             {
                 DatabaseProgressController.DeleteProgressData(deleteData);
             }
@@ -330,15 +333,16 @@ private async Task SendClanProgressList(bool removeLastMessage = true)
         private Embed CreateProgressList()
         {
             var clanPlayerDataList = DatabasePlayerDataController.LoadPlayerData(m_CommandEventArgs.ClanData);
-            var clanProgressData = DatabaseProgressController.GetProgressData(m_CommandEventArgs.ClanData, m_BossNumberType)
-                .OrderBy(x => x.Status).ThenByDescending(x => x.Damage).ThenBy(x => x.CreateDateTime)
-                .ToArray();
 
-            var progressPlayer = clanProgressData.Select(x => 
-                    new PlayerInfo(clanPlayerDataList.FirstOrDefault(y => y.PlayerID == x.PlayerID),x))
+            var progressPlayer = DatabaseProgressController.GetProgressData(m_CommandEventArgs.ClanData, m_BossNumberType)
+                .OrderBy(x => x.Status)
+                .ThenByDescending(x => x.Damage)
+                .ThenBy(x => x.CreateDateTime)
+                .Select(x => new PlayerInfo(clanPlayerDataList.FirstOrDefault(y => y.PlayerID == x.PlayerID), x))
                 .ToArray();
 
             var bossLap = m_CommandEventArgs.ClanData.GetBossLap(m_BossNumberType);
+
             var bossData = RediveClanBattleData.BossDataList
                 .FirstOrDefault(x => x.BossNumber == (byte)m_BossNumberType && x.LapNumberFrom <= bossLap && (x.LapNumberTo == -1 || x.LapNumberTo >= bossLap));
 

Script/ClanBattle/BattleReport.cs

@@ -54,6 +54,7 @@ public void RegisterReportData()
         {
             var reportData = new ReportData();
 
+            // TODO : 冗長なRegexの高速化 #131
             if (Regex.IsMatch(m_CommandEventArgs.Name, @"\d\D{1,3}"))
             {
                 var bossNumber = int.Parse(Regex.Match(m_CommandEventArgs.Name, @"\d").Value);
@@ -69,7 +70,7 @@ public void RegisterReportData()
                 reportData.BossNumber = (byte)bossNumber;
             }
 
-            if (reportData.BossNumber < CommonDefine.MinBossNumber || reportData.BossNumber > CommonDefine.MaxBossNumber)
+            if (!CommonDefine.IsValidBossNumber(reportData.BossNumber))
             {
                 return;
             }
@@ -120,7 +121,7 @@ public void DeleteReportData()
             }
 
             var removeData = DatabaseReportDataController.GetReportData(playerData)
-                .OrderBy(x => x.DateTime).Last();
+                .MaxBy(x => x.DateTime);
 
             if (DatabaseReportDataController.DeleteReportData(removeData))
             {
@@ -129,7 +130,7 @@ public void DeleteReportData()
                 if (playerData.UserID != m_CommandEventArgs.User.Id)
                 {
                     _ = m_CommandEventArgs.SocketUserMessage.Channel.SendTimedMessageAsync(TimeDefine.SuccessMessageDisplayTime,
-                        string.Format(InfomationType.DeleteInsted.ToLabel(), playerData.UserID, TimeDefine.SuccessMessageDisplayTime));
+                        string.Format(InfomationType.DeleteInstead.ToLabel(), playerData.UserID, TimeDefine.SuccessMessageDisplayTime));
                 }
             }
         }
@@ -140,9 +141,9 @@ public void DeleteReportData()
         public void RegisterOtherUserReportData()
         {
             if ((!ulong.TryParse(m_CommandEventArgs.Arguments[0], out var registerUserID)
-                && !MentionUtils.TryParseUser(m_CommandEventArgs.Arguments[0], out registerUserID))
+                    && !MentionUtils.TryParseUser(m_CommandEventArgs.Arguments[0], out registerUserID))
                 || !byte.TryParse(m_CommandEventArgs.Arguments[1], out var bossNumber)
-                || bossNumber > CommonDefine.MaxBossNumber || bossNumber < CommonDefine.MinBossNumber
+                || !CommonDefine.IsValidBossNumber(bossNumber)
                 || !EnumMapper.TryParse<AttackType>(m_CommandEventArgs.Arguments[2], out var attackType))
             {
                 return;

Script/ClanBattle/BattleReservation.cs

@@ -1,10 +1,6 @@
 using System;
-using System.Collections.Generic;
 using System.Linq;
 using System.Text;
-using System.Threading.Tasks;
-using Discord;
-using Discord.WebSocket;
 using PriconneBotConsoleApp.Database;
 using PriconneBotConsoleApp.DataModel;
 using PriconneBotConsoleApp.DataType;
@@ -36,8 +32,10 @@ public void RegisterReserveData()
                     TimeDefine.ErrorMessageDisplayTime,
                     string.Format(ErrorType.OutOfReservationTime.ToLabel(),
                         $"{m_CommandEventArgs.ClanData.ReservationStartTime.Hours}",
-                        $"{m_CommandEventArgs.ClanData.ReservationEndTime.Hours}")
-                    );
+                        $"{m_CommandEventArgs.ClanData.ReservationEndTime.Hours}"
+                    )
+                );
+
                 return;
             }
 
@@ -49,6 +47,7 @@ public void RegisterReserveData()
                     TimeDefine.ErrorMessageDisplayTime,
                     ErrorType.FailedReservation.ToLabel()
                     );
+
                 return;
             }
 
@@ -62,6 +61,7 @@ public void RegisterReserveData()
                     TimeDefine.ErrorMessageDisplayTime,
                     string.Format(ErrorType.OutOfReservationBossLaps.ToLabel(), allowReservationLap.ToString())
                     );
+
                 return;
             }
 
@@ -79,7 +79,7 @@ public void DeleteReserveData()
         {
             var deleteReservationData = MessageToReservationData();
 
-            if (deleteReservationData is null)
+            if (deleteReservationData == null)
             {
                 return;
             }
@@ -104,8 +104,10 @@ public void DeleteReserveData()
         /// <returns></returns>
         private ReservationData MessageToReservationData()
         {
-            if (!Enum.TryParse<BossNumberType>(m_CommandEventArgs.Arguments[1], out var bossNumber)
-                || !(byte.TryParse(m_CommandEventArgs.Arguments[0], out var battleLap) && battleLap > m_CommandEventArgs.ClanData.GetBossLap(bossNumber)))
+            if (!byte.TryParse(m_CommandEventArgs.Arguments[1], out var bossNumber)
+                || !byte.TryParse(m_CommandEventArgs.Arguments[0], out var battleLap)
+                || !CommonDefine.IsValidBossNumber(bossNumber)
+                || !CommonDefine.IsValidBattleTime(battleLap))
             {
                 return null;
             }
@@ -122,7 +124,7 @@ private ReservationData MessageToReservationData()
             {
                 PlayerID = m_CommandEventArgs.PlayerData.PlayerID,
                 BattleLap = battleLap,
-                BossNumber = (byte)bossNumber,
+                BossNumber = bossNumber,
                 CommentData = commentData,
             };
         }
@@ -147,7 +149,7 @@ private void RegisterReservationData(ReservationData reservationData)
 
         private bool DeleteUserReservationData(ReservationData reservationData)
         {
-            var userReservationDataList = DatabaseReservationController.LoadReservationData(reservationData.PlayerData);
+            var userReservationDataList = DatabaseReservationController.LoadReservationData(m_CommandEventArgs.PlayerData);
 
             var sqlReservationData = userReservationDataList
                 .Where(x => x.BossNumber == reservationData.BossNumber && x.BattleLap == reservationData.BattleLap)

Script/ClanBattle/BattleReservationSummary.cs

@@ -41,7 +41,7 @@ public async Task RunInteraction(SocketMessageComponent messageComponent)
                 return;
             }
 
-            if(buttonType == ButtonType.Reload)
+            if (buttonType == ButtonType.Reload)
             {
                 await UpdateMessage();
             }
@@ -105,6 +105,7 @@ private Embed CreateEmbed()
             var reservationDataSet = DatabaseReservationController.LoadReservationData(m_ClanData);
             List<List<ReservationData>> reservationDataList = new();
 
+            // TODO : Linqで行けそうな気がする
             for (var i = 0; i < CommonDefine.MaxBossNumber; i++)
             {
                 reservationDataList.Add(new List<ReservationData>());
@@ -119,7 +120,7 @@ private Embed CreateEmbed()
 
                 if (!reservationDataList[i].Any())
                 {
-                    // 何かの空白代入して空行を生成している。
+                    // 空行を保つためのゼロ幅空白(\u200b)を挿入している。
                     fieldBuilder.Value = "\n\u200b";
                 }
                 else