From 0774cb22b3f349ebf417f4d65acf4f503cb8cb61 Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sat, 23 Aug 2025 14:00:17 +0930 Subject: [PATCH 1/2] Update MareWizardModule.cs --- .../MareSynchronosServices/Discord/MareWizardModule.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.cs index 5b7e4a3..926746e 100644 --- a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.cs +++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.cs @@ -176,7 +176,7 @@ public partial class MareWizardModule : InteractionModuleBase { cb.WithButton("User Info", "wizard-userinfo", ButtonStyle.Secondary, new Emoji("ℹī¸")); cb.WithButton("Recover", "wizard-recover", ButtonStyle.Secondary, new Emoji("đŸĨ")); - cb.WithButton("Secondary UID", "wizard-secondary", ButtonStyle.Secondary, new Emoji("2ī¸âƒŖ")); + // cb.WithButton("Secondary UID", "wizard-secondary", ButtonStyle.Secondary, new Emoji("2ī¸âƒŖ")); cb.WithButton("Vanity IDs", "wizard-vanity", ButtonStyle.Secondary, new Emoji("💅")); cb.WithButton("Delete", "wizard-delete", ButtonStyle.Danger, new Emoji("⚠ī¸")); } From 6071598b5961cfe1160d24523d316e1c69a3ab06 Mon Sep 17 00:00:00 2001 From: Caraxi Date: Sat, 23 Aug 2025 19:13:40 +0930 Subject: [PATCH 2/2] Update MareWizardModule.Vanity.cs --- .../Discord/MareWizardModule.Vanity.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Vanity.cs b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Vanity.cs index 5d79847..2571e67 100644 --- a/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Vanity.cs +++ b/MareSynchronosServer/MareSynchronosServices/Discord/MareWizardModule.Vanity.cs @@ -93,12 +93,12 @@ public partial class MareWizardModule using var db = await GetDbContext().ConfigureAwait(false); bool canAddVanityId = !db.Users.Any(u => u.UID == modal.DesiredVanityUID || u.Alias == modal.DesiredVanityUID); - Regex rgx = new(@"^[_\-a-zA-Z0-9]{5,15}$", RegexOptions.ECMAScript); + Regex rgx = new(@"^[_\-a-zA-Z0-9]{2,15}$", RegexOptions.ECMAScript); if (!rgx.Match(desiredVanityUid).Success) { eb.WithColor(Color.Red); eb.WithTitle("Invalid Vanity UID"); - eb.WithDescription("A Vanity UID must be between 5 and 15 characters long and only contain the letters A-Z, numbers 0-9, dashes (-) and underscores (_)."); + eb.WithDescription("A Vanity UID must be between 2 and 15 characters long and only contain the letters A-Z, numbers 0-9, dashes (-) and underscores (_)."); cb.WithButton("Cancel", "wizard-vanity", ButtonStyle.Secondary, emote: new Emoji("❌")); cb.WithButton("Pick Different UID", "wizard-vanity-uid-set:" + uid, ButtonStyle.Primary, new Emoji("💅")); } @@ -169,12 +169,12 @@ public partial class MareWizardModule using var db = await GetDbContext().ConfigureAwait(false); bool canAddVanityId = !db.Groups.Any(u => u.GID == modal.DesiredVanityGID || u.Alias == modal.DesiredVanityGID); - Regex rgx = new(@"^[_\-a-zA-Z0-9]{5,20}$", RegexOptions.ECMAScript); + Regex rgx = new(@"^[_\-a-zA-Z0-9]{2,20}$", RegexOptions.ECMAScript); if (!rgx.Match(desiredVanityGid).Success) { eb.WithColor(Color.Red); eb.WithTitle("Invalid Vanity Syncshell ID"); - eb.WithDescription("A Vanity Syncshell ID must be between 5 and 20 characters long and only contain the letters A-Z, numbers 0-9, dashes (-) and underscores (_)."); + eb.WithDescription("A Vanity Syncshell ID must be between 2 and 20 characters long and only contain the letters A-Z, numbers 0-9, dashes (-) and underscores (_)."); cb.WithButton("Cancel", "wizard-vanity", ButtonStyle.Secondary, emote: new Emoji("❌")); cb.WithButton("Pick Different ID", "wizard-vanity-gid-set:" + gid, ButtonStyle.Primary, new Emoji("💅")); }