style: cleanup code

FlandreBot · Jun 20, 2023 · d7889de · d7889de
1 parent f447ad2
commit d7889de
Show file tree

Hide file tree

Showing 11 changed files with 51 additions and 10 deletions.
diff --git a/src/Flandre.Framework/Common/Command.cs b/src/Flandre.Framework/Common/Command.cs
@@ -89,11 +89,11 @@ private void InferFromMethod(MethodBase method)
             var paramIsParamArray = param.ParameterType.IsArray &&
                                     param.GetCustomAttribute<ParamArrayAttribute>() is not null;
             Parameters.Add(new CommandParameter(
-                name: param.Name!,
-                type: param.ParameterType,
-                isRequired: !(paramIsParamArray || param.HasDefaultValue),
-                defaultValue: param.HasDefaultValue ? param.DefaultValue : null,
-                isParamArray: paramIsParamArray) { Description = description });
+                param.Name!,
+                param.ParameterType,
+                !(paramIsParamArray || param.HasDefaultValue),
+                param.HasDefaultValue ? param.DefaultValue : null,
+                paramIsParamArray) { Description = description });
         }
     }
 

diff --git a/src/Flandre.Framework/Common/CommandExceptions.cs b/src/Flandre.Framework/Common/CommandExceptions.cs
@@ -1,7 +1,14 @@
 namespace Flandre.Framework.Common;
 
+/// <summary>
+/// 指令调用异常
+/// </summary>
 public sealed class CommandInvokeException : Exception
 {
+    /// <summary>
+    /// 
+    /// </summary>
+    /// <param name="message"></param>
     public CommandInvokeException(string message) : base(message)
     {
     }

diff --git a/src/Flandre.Framework/Common/CommandOption.cs b/src/Flandre.Framework/Common/CommandOption.cs
@@ -1,17 +1,38 @@
 namespace Flandre.Framework.Common;
 
+/// <summary>
+/// 指令选项
+/// </summary>
 public sealed class CommandOption
 {
+    /// <summary>
+    /// 选项名称
+    /// </summary>
     public string Name { get; }
 
+    /// <summary>
+    /// 选项短名称
+    /// </summary>
     public char ShortName { get; }
 
+    /// <summary>
+    /// 是否有短名称
+    /// </summary>
     public bool HasShortName { get; }
 
+    /// <summary>
+    /// 选项类型
+    /// </summary>
     public Type Type { get; }
 
+    /// <summary>
+    /// 选项默认值
+    /// </summary>
     public object? DefaultValue { get; }
 
+    /// <summary>
+    /// 选项描述
+    /// </summary>
     public string? Description { get; init; }
 
     internal CommandOption(string name, char shortName, Type type, object? defaultValue)

diff --git a/src/Flandre.Framework/Extensions/SessionExtensions.cs b/src/Flandre.Framework/Extensions/SessionExtensions.cs
@@ -1,5 +1,4 @@
 using Flandre.Core.Messaging;
-using Flandre.Framework.Common;
 using Flandre.Framework.Utils;
 
 // ReSharper disable once CheckNamespace

diff --git a/src/Flandre.Framework/FlandreApp.cs b/src/Flandre.Framework/FlandreApp.cs
@@ -3,6 +3,7 @@
 using Flandre.Core.Messaging;
 using Flandre.Framework.Common;
 using Flandre.Framework.Events;
+using Flandre.Framework.Internal;
 using Flandre.Framework.Routing;
 using Flandre.Framework.Services;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/src/Flandre.Framework/FlandreAppBuilder.cs b/src/Flandre.Framework/FlandreAppBuilder.cs
@@ -1,5 +1,6 @@
 using Flandre.Core.Common;
 using Flandre.Framework.Common;
+using Flandre.Framework.Internal;
 using Flandre.Framework.Services;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;

diff --git a/....Framework/Common/DefaultCommandParser.cs → ...ramework/Internal/DefaultCommandParser.cs b/....Framework/Common/DefaultCommandParser.cs → ...ramework/Internal/DefaultCommandParser.cs
@@ -1,8 +1,9 @@
 using System.Collections;
 using Flandre.Core.Utils;
+using Flandre.Framework.Common;
 using Flandre.Framework.Services;
 
-namespace Flandre.Framework.Common;
+namespace Flandre.Framework.Internal;
 
 internal class DefaultCommandParser : ICommandParser
 {

diff --git a/...e.Framework/Common/PluginCommandLoader.cs → ...Framework/Internal/PluginCommandLoader.cs b/...e.Framework/Common/PluginCommandLoader.cs → ...Framework/Internal/PluginCommandLoader.cs
@@ -1,11 +1,12 @@
 using System.ComponentModel;
 using System.Reflection;
+using Flandre.Framework.Common;
 using Flandre.Framework.Routing;
 using Flandre.Framework.Services;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
 
-namespace Flandre.Framework.Common;
+namespace Flandre.Framework.Internal;
 
 /// <summary>
 /// 读取指令的上下文

diff --git a/src/Flandre.Framework/Services/MiddlewareService.cs b/src/Flandre.Framework/Services/MiddlewareService.cs
@@ -0,0 +1,11 @@
+using Flandre.Framework.Common;
+
+namespace Flandre.Framework.Services;
+
+/// <summary>
+/// 中间件服务
+/// </summary>
+public sealed class MiddlewareService
+{
+    private readonly List<Func<MiddlewareContext, Func<Task>, Task>> _middleware = new();
+}
diff --git a/tests/Flandre.Framework.Tests/CommandTests.cs b/tests/Flandre.Framework.Tests/CommandTests.cs
@@ -1,5 +1,4 @@
 using System.ComponentModel;
-using System.Text;
 using Flandre.Core.Common;
 using Flandre.Framework.Routing;
 using Flandre.Framework.Services;

diff --git a/tests/Flandre.Framework.Tests/Usings.cs b/tests/Flandre.Framework.Tests/Usings.cs
@@ -1,4 +1,4 @@
 global using Xunit;
 global using Flandre.Adapters.Mock;
 global using Flandre.Framework.Common;
-global using Flandre.Core.Messaging;
+global using Flandre.Core.Messaging;