eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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
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 IDiscordCache _cache;
private Command _currentCommand;
private Command? _currentCommand;
public Context(ILifetimeScope provider, Shard shard, Guild? guild, Channel channel, MessageCreateEvent message, int commandParseOffset,
PKSystem senderSystem, MessageContext messageContext)
@ -110,20 +110,20 @@ namespace PluralKit.Bot
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;
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>());
_metrics.Measure.Meter.Mark(BotMetrics.CommandsRun);
}
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)
{