Eauldane/SnowcloakServer
1
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Collision avoidance - UID length = 8, GID length = 10

Browse Source
This commit is contained in:
Eauldane
2025-09-14 00:43:36 +01:00
parent f07fd3990b
commit d23184b1ec
3 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MareSynchronosServer/MareSynchronosAuthService/Services/AccountRegistrationService.cs
View File

@@ -85,7 +85,7 @@ public class AccountRegistrationService
var hasValidUid = false; var hasValidUid = false;
while (!hasValidUid) while (!hasValidUid)
{ {
var uid = StringUtils.GenerateRandomString(7); var uid = StringUtils.GenerateRandomString(8);
if (_mareDbContext.Users.Any(u => u.UID == uid || u.Alias == uid)) continue; if (_mareDbContext.Users.Any(u => u.UID == uid || u.Alias == uid)) continue;
user.UID = uid; user.UID = uid;
hasValidUid = true; hasValidUid = true;

4
MareSynchronosServer/MareSynchronosServer/Hubs/MareHub.Groups.cs
View File

@@ -212,10 +212,10 @@ public partial class MareHub
throw new System.Exception($"Max groups for user is {_maxExistingGroupsByUser}, max joined groups is {_maxJoinedGroupsByUser}."); throw new System.Exception($"Max groups for user is {_maxExistingGroupsByUser}, max joined groups is {_maxJoinedGroupsByUser}.");
} }
var gid = StringUtils.GenerateRandomString(9); var gid = StringUtils.GenerateRandomString(10);
while (await DbContext.Groups.AnyAsync(g => g.GID == "SNOW-" + gid).ConfigureAwait(false)) while (await DbContext.Groups.AnyAsync(g => g.GID == "SNOW-" + gid).ConfigureAwait(false))
{ {
gid = StringUtils.GenerateRandomString(9); gid = StringUtils.GenerateRandomString(10);
} }
gid = "SNOW-" + gid; gid = "SNOW-" + gid;

6
MareSynchronosServer/MareSynchronosServices/Discord/MareModule.cs
View File

@@ -82,7 +82,7 @@ public class MareModule : InteractionModuleBase
var hasValidUid = false; var hasValidUid = false;
while (!hasValidUid) while (!hasValidUid)
{ {
var uid = StringUtils.GenerateRandomString(7); var uid = StringUtils.GenerateRandomString(8);
if (db.Users.Any(u => u.UID == uid || u.Alias == uid)) continue; if (db.Users.Any(u => u.UID == uid || u.Alias == uid)) continue;
user.UID = uid; user.UID = uid;
hasValidUid = true; hasValidUid = true;
@@ -510,7 +510,7 @@ public class MareModule : InteractionModuleBase
var hasValidUid = false; var hasValidUid = false;
while (!hasValidUid) while (!hasValidUid)
{ {
var uid = StringUtils.GenerateRandomString(7); var uid = StringUtils.GenerateRandomString(8);
if (await db.Users.AnyAsync(u => u.UID == uid || u.Alias == uid).ConfigureAwait(false)) continue; if (await db.Users.AnyAsync(u => u.UID == uid || u.Alias == uid).ConfigureAwait(false)) continue;
newUser.UID = uid; newUser.UID = uid;
hasValidUid = true; hasValidUid = true;
@@ -1195,7 +1195,7 @@ public class MareModule : InteractionModuleBase
var hasValidUid = false; var hasValidUid = false;
while (!hasValidUid) while (!hasValidUid)
{ {
var uid = StringUtils.GenerateRandomString(7); var uid = StringUtils.GenerateRandomString(8);
if (db.Users.Any(u => u.UID == uid || u.Alias == uid)) continue; if (db.Users.Any(u => u.UID == uid || u.Alias == uid)) continue;
user.UID = uid; user.UID = uid;
hasValidUid = true; hasValidUid = true;