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

Explicitly check for bot/WH users before running command handler

Browse Source
This commit is contained in:
Ske 2020-06-26 01:49:51 +02:00
parent 4f6a4c000d
commit e4d51b5198
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
PluralKit.Bot/Handlers/MessageCreated.cs
View File

@ -62,9 +62,15 @@ namespace PluralKit.Bot
ctx = await conn.QueryMessageContext(evt.Author.Id, evt.Channel.GuildId, evt.Channel.Id); ctx = await conn.QueryMessageContext(evt.Author.Id, evt.Channel.GuildId, evt.Channel.Id);
// Try each handler until we find one that succeeds // Try each handler until we find one that succeeds
var _ = await TryHandleLogClean(evt, ctx) || if (await TryHandleLogClean(evt, ctx))
await TryHandleCommand(evt, ctx) || return;
await TryHandleProxy(evt, ctx);
// Only do command/proxy handling if it's a user account
if (evt.Message.Author.IsBot || evt.Message.WebhookMessage || evt.Message.Author.IsSystem == true)
return;
if (await TryHandleCommand(evt, ctx))
return;
await TryHandleProxy(evt, ctx);
} }
private async ValueTask<bool> TryHandleLogClean(MessageCreateEventArgs evt, MessageContext ctx) private async ValueTask<bool> TryHandleLogClean(MessageCreateEventArgs evt, MessageContext ctx)