minster586/nadekobot
1
0
Fork 0
mirror of https://gitlab.com/Kwoth/nadekobot.git synced 2025-09-10 17:28:27 -04:00
Code Issues Packages Projects Releases Wiki Activity

Added default value support to medusa system, thanks to kotz

Browse Source
This commit is contained in:
Kwoth
2023-02-10 20:17:13 +01:00
parent 699a5e0c8c
commit 8ceab64b96
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/NadekoBot/Common/Medusa/MedusaLoaderService.cs
View File

@@ -459,6 +459,9 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
pb.WithIsMultiple(paramData.IsParams) pb.WithIsMultiple(paramData.IsParams)
.WithIsOptional(paramData.IsOptional) .WithIsOptional(paramData.IsOptional)
.WithIsRemainder(paramData.IsLeftover); .WithIsRemainder(paramData.IsLeftover);
if (paramData.IsOptional)
pb.WithDefault(paramData.DefaultValue);
}; };
[MethodImpl(MethodImplOptions.NoInlining)] [MethodImpl(MethodImplOptions.NoInlining)]
@@ -800,6 +803,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
var leftoverAttribute = pi.GetCustomAttribute<leftoverAttribute>(true); var leftoverAttribute = pi.GetCustomAttribute<leftoverAttribute>(true);
var hasDefaultValue = pi.HasDefaultValue; var hasDefaultValue = pi.HasDefaultValue;
var defaultValue = pi.DefaultValue;
var isLeftover = leftoverAttribute != null; var isLeftover = leftoverAttribute != null;
var isParams = pi.GetCustomAttribute<ParamArrayAttribute>() is not null; var isParams = pi.GetCustomAttribute<ParamArrayAttribute>() is not null;
var paramType = pi.ParameterType; var paramType = pi.ParameterType;
@@ -836,7 +840,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
continue; continue;
} }
canInject = false; canInject = false;
if (isParams) if (isParams)
{ {
@@ -857,7 +861,7 @@ public sealed class MedusaLoaderService : IMedusaLoaderService, IReadyExecutor,
throw new ArgumentException("Leftover attribute error."); throw new ArgumentException("Leftover attribute error.");
} }
cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, isLeftover, isParams)); cmdParams.Add(new ParamData(paramType, paramName, hasDefaultValue, defaultValue, isLeftover, isParams));
} }

1
src/NadekoBot/Common/Medusa/Models/ParamData.cs
View File

@@ -4,6 +4,7 @@ public sealed record ParamData(
Type Type, Type Type,
string Name, string Name,
bool IsOptional, bool IsOptional,
object? DefaultValue,
bool IsLeftover, bool IsLeftover,
bool IsParams bool IsParams
); );