liz/PluralKit
liz/PluralKit
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix executing some commands without defs

Browse Source
This commit is contained in:
Ske 2021-09-25 20:24:16 +02:00
parent b6fc86d427
commit 8aa448c475
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
PluralKit.Bot/CommandSystem/Context.cs
View File

@ -37,7 +37,7 @@ namespace PluralKit.Bot
private readonly CommandMessageService _commandMessageService; private readonly CommandMessageService _commandMessageService;
private readonly IDiscordCache _cache; private readonly IDiscordCache _cache;
private Command _currentCommand; private Command? _currentCommand;
public Context(ILifetimeScope provider, Shard shard, Guild? guild, Channel channel, MessageCreateEvent message, int commandParseOffset, public Context(ILifetimeScope provider, Shard shard, Guild? guild, Channel channel, MessageCreateEvent message, int commandParseOffset,
PKSystem senderSystem, MessageContext messageContext) PKSystem senderSystem, MessageContext messageContext)
@ -110,20 +110,20 @@ namespace PluralKit.Bot
return msg; return msg;
} }
public async Task Execute<T>(Command commandDef, Func<T, Task> handler) public async Task Execute<T>(Command? commandDef, Func<T, Task> handler)
{ {
_currentCommand = commandDef; _currentCommand = commandDef;
try try
{ {
using (_metrics.Measure.Timer.Time(BotMetrics.CommandTime, new MetricTags("Command", commandDef.Key))) using (_metrics.Measure.Timer.Time(BotMetrics.CommandTime, new MetricTags("Command", commandDef?.Key ?? "null")))
await handler(_provider.Resolve<T>()); await handler(_provider.Resolve<T>());
_metrics.Measure.Meter.Mark(BotMetrics.CommandsRun); _metrics.Measure.Meter.Mark(BotMetrics.CommandsRun);
} }
catch (PKSyntaxError e) catch (PKSyntaxError e)
{ {
await Reply($"{Emojis.Error} {e.Message}\n**Command usage:**\n> pk;{commandDef.Usage}"); await Reply($"{Emojis.Error} {e.Message}\n**Command usage:**\n> pk;{commandDef?.Usage}");
} }
catch (PKError e) catch (PKError e)
{ {