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

fix(proxy): correctly apply Discord webhook name restrictions

Browse Source 
Closes #484.
This commit is contained in:
spiral 2022-09-20 16:04:36 +00:00
parent 494bd8aab3
commit a441c00d94
No known key found for this signature in database
GPG Key ID: 244A11E4B0BCF40E
1 changed files with 34 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
PluralKit.Bot/Services/WebhookExecutorService.cs
View File

@ -115,7 +115,7 @@ public class WebhookExecutorService
var webhookReq = new ExecuteWebhookRequest
{
Username = FixProxyName(req.Name).Truncate(80),
Username = req.Name.FixProxyName().Truncate(80),
Content = content,
AllowedMentions = allowedMentions,
AvatarUrl = !string.IsNullOrWhiteSpace(req.AvatarUrl) ? req.AvatarUrl : null,
@ -243,21 +243,46 @@ public class WebhookExecutorService
return chunks;
}
private string FixProxyName(string name) => FixSingleCharacterName(FixClyde(name));
}
private string FixClyde(string name)
public static class ProxyNameExt
{
public static string FixProxyName(this string name) => name
.FixClyde()
.FixHere()
.FixEveryone()
.FixBackticks()
.FixSingleCharacterName()
.ThrowOnInvalidCharacters();
static string ThrowOnInvalidCharacters(this string name)
{
static string Replacement(Match m) => m.Groups[1].Value + "\u200A" + m.Groups[2].Value;
// Adds a Unicode hair space (\u200A) between the "c" and the "lyde" to avoid Discord matching it
// since Discord blocks webhooks containing the word "Clyde"... for some reason. /shrug
return Regex.Replace(name, "(c)(lyde)", Replacement, RegexOptions.IgnoreCase);
var invalidCharacters = new[] { "@", "#", ":" };
if (invalidCharacters.Any(x => name.Contains(x)))
throw new PKError("Due to Discord limitations, proxy names cannot contain the characters `@`, `#` or `:`. "
+ $"The webhook's name, {name.AsCode()}, contains one or more of these characters.");
return name;
}
private string FixSingleCharacterName(string proxyName)
static string FixHere(this string name)
=> Regex.Replace(name, "(h)(ere)", Replacement, RegexOptions.IgnoreCase);
static string FixEveryone(this string name)
=> Regex.Replace(name, "(e)(veryone)", Replacement, RegexOptions.IgnoreCase);
static string FixBackticks(this string name)
=> Regex.Replace(name, "(e)(veryone)", Replacement, RegexOptions.IgnoreCase);
// Adds a Unicode hair space (\u200A) between the "c" and the "lyde" to avoid Discord matching it
// since Discord blocks webhooks containing the word "Clyde"... for some reason. /shrug
static string FixClyde(this string name)
=> Regex.Replace(name, "(c)(lyde)", Replacement, RegexOptions.IgnoreCase);
static string FixSingleCharacterName(this string proxyName)
{
if (proxyName.Length == 1)
return proxyName + "\u17b5";
return proxyName;
}
static string Replacement(Match m) => m.Groups[1].Value + "\u200A" + m.Groups[2].Value;
}