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

move message length check *after* proxy members check

Browse Source
This commit is contained in:
spiral 2021-06-14 11:31:14 -04:00
parent 6409c76f10
commit 272a3430a6
No known key found for this signature in database
GPG Key ID: A6059F0CA0E1BD31
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
PluralKit.Bot/Proxy/ProxyService.cs
View File

@ -54,9 +54,6 @@ namespace PluralKit.Bot
if (!ShouldProxy(channel, message, ctx)) if (!ShouldProxy(channel, message, ctx))
return false; return false;
// this is hopefully temporary, so not putting it into a separate method
if (message.Content != null && message.Content.Length > 2000) throw new PKError("PluralKit cannot proxy messages over 2000 characters in length.");
// Fetch members and try to match to a specific member // Fetch members and try to match to a specific member
await using var conn = await _db.Obtain(); await using var conn = await _db.Obtain();
@ -67,6 +64,9 @@ namespace PluralKit.Bot
if (!_matcher.TryMatch(ctx, members, out var match, message.Content, message.Attachments.Length > 0, if (!_matcher.TryMatch(ctx, members, out var match, message.Content, message.Attachments.Length > 0,
allowAutoproxy)) return false; allowAutoproxy)) return false;
// this is hopefully temporary, so not putting it into a separate method
if (message.Content != null && message.Content.Length > 2000) throw new PKError("PluralKit cannot proxy messages over 2000 characters in length.");
// Permission check after proxy match so we don't get spammed when not actually proxying // Permission check after proxy match so we don't get spammed when not actually proxying
if (!await CheckBotPermissionsOrError(botPermissions, message.ChannelId)) if (!await CheckBotPermissionsOrError(botPermissions, message.ChannelId))
return false; return false;