RPCS3/archived-discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2026-01-31 01:25:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

change the defaults and keep NeedsRename and StripZalgo consistent

Browse Source
This commit is contained in:
13xforever
2025-05-29 09:38:48 +05:00
parent 84a37abba5
commit 2f69d16fb8
2 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
CompatBot/EventHandlers/UsernameZalgoMonitor.cs
View File

@@ -99,15 +99,15 @@ public static class UsernameZalgoMonitor
public static async ValueTask<bool> NeedsRenameAsync(string displayName)
{
displayName = displayName.Normalize().TrimEager();
return displayName != await StripZalgoAsync(displayName, null, 0ul, NormalizationForm.FormC, 3).ConfigureAwait(false);
return displayName != await StripZalgoAsync(displayName, null, 0ul).ConfigureAwait(false);
}
private static async Task DmAndRenameUserAsync(DiscordClient client, DiscordMember member, string suggestedName)
private static async ValueTask DmAndRenameUserAsync(DiscordClient client, DiscordMember member, string suggestedName)
{
try
{
var renameTask = member.ModifyAsync(m => m.Nickname = suggestedName);
Config.Log.Info($"Renamed {member.Username}#{member.Discriminator} ({member.Id}) to {suggestedName}");
Config.Log.Info($"Renamed {member} ({member.Id}) to {suggestedName}");
var rulesChannel = await client.GetChannelAsync(Config.BotRulesChannelId).ConfigureAwait(false);
var msg = $"""
Hello, your current _display name_ is breaking {rulesChannel.Mention} #7, so you have been renamed to `{suggestedName}`.
@@ -124,7 +124,7 @@ public static class UsernameZalgoMonitor
}
}
public static async ValueTask<string> StripZalgoAsync(string displayName, string? userName, ulong userId, NormalizationForm normalizationForm = NormalizationForm.FormD, int level = 0)
public static async ValueTask<string> StripZalgoAsync(string displayName, string? userName, ulong userId, NormalizationForm normalizationForm = NormalizationForm.FormC, int level = 3)
{
const int minNicknameLength = 2;
displayName = displayName.Normalize(normalizationForm).TrimEager();
@@ -134,11 +134,11 @@ public static class UsernameZalgoMonitor
return await GenerateRandomNameAsync(userId).ConfigureAwait(false);
var builder = new StringBuilder();
bool skipLowSurrogate = false;
int consecutive = 0;
int codePoint = 0;
char highSurrogate = '\0';
bool hasNormalCharacterBefore = false;
var skipLowSurrogate = false;
var consecutive = 0;
var codePoint = 0;
var highSurrogate = '\0';
var hasNormalCharacterBefore = false;
foreach (var c in displayName)
{
switch (char.GetUnicodeCategory(c))

1
Tests/ZalgoTests.cs
View File

@@ -82,6 +82,7 @@ public class ZalgoTests
[TestCase("͔", true, "Combining marks")]
[TestCase("҉҉҉҉", true, "Combining sign")]
[TestCase("᲼᲼᲼᲼᲼᲼᲼᲼᲼ ", true, "Private block")]
[TestCase("녇", true, "Single character after normalization")]
public async Task ZalgoDetectionTest(string name, bool isBad, string? comment = null)
{
var result = await UsernameZalgoMonitor.NeedsRenameAsync(name).ConfigureAwait(false);