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

Merge pull request #262 from dev-kittens/fix/single-character-name

Browse Source 
Allow single character proxy names
This commit is contained in:
Astrid 2020-12-08 12:21:31 +01:00 committed by GitHub
commit eb9c31778f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
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
@ -96,7 +98,7 @@ namespace PluralKit.Bot
// Send the webhook // Send the webhook
var content = match.ProxyContent; var content = match.ProxyContent;
if (!allowEmbeds) content = content.BreakLinkEmbeds(); if (!allowEmbeds) content = content.BreakLinkEmbeds();
var proxyMessage = await _webhookExecutor.ExecuteWebhook(trigger.Channel, match.Member.ProxyName(ctx), var proxyMessage = await _webhookExecutor.ExecuteWebhook(trigger.Channel, FixSingleCharacterName(match.Member.ProxyName(ctx)),
match.Member.ProxyAvatar(ctx), match.Member.ProxyAvatar(ctx),
content, trigger.Attachments, allowEveryone); content, trigger.Attachments, allowEveryone);
@ -185,13 +187,15 @@ namespace PluralKit.Bot
return true; return true;
} }
private bool CheckProxyNameBoundsOrError(string proxyName) private string FixSingleCharacterName(string proxyName)
{ {
if (proxyName.Length < 2) throw Errors.ProxyNameTooShort(proxyName); if (proxyName.Length == 1) return proxyName += "\u17b5";
if (proxyName.Length > Limits.MaxProxyNameLength) throw Errors.ProxyNameTooLong(proxyName); else return proxyName;
}
// TODO: this never returns false as it throws instead, should this happen? private void CheckProxyNameBoundsOrError(string proxyName)
return true; {
if (proxyName.Length > Limits.MaxProxyNameLength) throw Errors.ProxyNameTooLong(proxyName);
} }
} }
} }