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

Clean up name length check method

Browse Source
This commit is contained in:
spiral 2020-11-26 00:04:40 -05:00
parent ea4d93208e
commit 277b001050
No known key found for this signature in database
GPG Key ID: 00C26F208D3FCCAB
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -55,7 +55,9 @@ namespace PluralKit.Bot
// 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(message.Channel)) return false; if (!await CheckBotPermissionsOrError(message.Channel)) return false;
if (!CheckProxyNameBoundsOrError(match.Member.ProxyName(ctx))) return false;
// this method throws, so no need to wrap it in an if statement
CheckProxyNameBoundsOrError(match.Member.ProxyName(ctx));
// Check if the sender account can mention everyone/here + embed links // Check if the sender account can mention everyone/here + embed links
// we need to "mirror" these permissions when proxying to prevent exploits // we need to "mirror" these permissions when proxying to prevent exploits
@ -191,13 +193,9 @@ namespace PluralKit.Bot
else return proxyName; else return proxyName;
} }
private bool CheckProxyNameBoundsOrError(string proxyName) private void CheckProxyNameBoundsOrError(string proxyName)
{ {
// if (proxyName.Length < 2) throw Errors.ProxyNameTooShort(proxyName);
if (proxyName.Length > Limits.MaxProxyNameLength) throw Errors.ProxyNameTooLong(proxyName); if (proxyName.Length > Limits.MaxProxyNameLength) throw Errors.ProxyNameTooLong(proxyName);
// TODO: this never returns false as it throws instead, should this happen?
return true;
} }
} }
} }