A free and open source instant messaging and VoIP chat app built for friends, groups, and communities.
fix(api): keep the discriminator an admin sets (#3787)
Hampusd4bb09cf6d0a
diff --git a/fluxer_api/src/api/infrastructure/DiscriminatorService.ts b/fluxer_api/src/api/infrastructure/DiscriminatorService.tsindex de25b77d7..6e5be0e74 100644--- a/fluxer_api/src/api/infrastructure/DiscriminatorService.ts+++ b/fluxer_api/src/api/infrastructure/DiscriminatorService.ts@@ -19,6 +19,7 @@ interface GenerateDiscriminatorParams {username: string;requestedDiscriminator?: number;user?: User | null;+ adminOverride?: boolean;}interface GenerateDiscriminatorResult {@@ -76,7 +77,7 @@ export class DiscriminatorService {}async generateDiscriminator(params: GenerateDiscriminatorParams): Promise<GenerateDiscriminatorResult> {- const {username, requestedDiscriminator, user} = params;+ const {username, requestedDiscriminator, user, adminOverride} = params;const usernameLower = username.toLowerCase();const lockKey = `discrim-lock:${usernameLower}`;const lockToken = await this.acquireLockWithRetry(lockKey);@@ -84,7 +85,7 @@ export class DiscriminatorService {return {discriminator: -1, available: false};}try {- const allowCustomDiscriminator = await this.canUseCustomDiscriminator(user);+ const allowCustomDiscriminator = adminOverride === true || (await this.canUseCustomDiscriminator(user));if (allowCustomDiscriminator && requestedDiscriminator !== undefined) {const isAvailable = await this.isDiscriminatorAvailable(usernameLower, requestedDiscriminator);if (isAvailable) {diff --git a/fluxer_api/src/api/user/UserRename.ts b/fluxer_api/src/api/user/UserRename.tsindex a45cfc331..07bc34fd2 100644--- a/fluxer_api/src/api/user/UserRename.ts+++ b/fluxer_api/src/api/user/UserRename.ts@@ -38,12 +38,14 @@ async function chooseDiscriminator(user: User,uniqueUsernames: boolean,{username, discriminator}: {username: string; discriminator?: number},+ adminOverride: boolean,): Promise<number> {if (uniqueUsernames) return USERNAME_MODE_DISCRIMINATOR;const result = await deps.discriminatorService.generateDiscriminator({username,requestedDiscriminator: discriminator,user,+ adminOverride,});if (!result.available || result.discriminator === -1) {throw new TagAlreadyTakenError();@@ -62,7 +64,7 @@ export async function renameUser(const reservation = uniqueUsernames ? await reserveUsername({users, cache}, tag.username, user.id) : null;let updatedUser: User;try {- const discriminator = await chooseDiscriminator(deps, user, uniqueUsernames, tag);+ const discriminator = await chooseDiscriminator(deps, user, uniqueUsernames, tag, reason === 'admin_action');updatedUser = await users.patchUpsert(user.id, {username: tag.username, discriminator}, user.toRow());} finally {await reservation?.release();