Merge pull request #8 from pckv/5-digit-ids

Support 5-length IDs
minetoblend · Sep 29, 2024 · 430cb50 · 430cb50
2 parents c2ca62d + ebe8373
commit 430cb50
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 33 deletions.
diff --git a/src/commands/drop.ts b/src/commands/drop.ts
@@ -13,6 +13,7 @@ import { getNextCardId } from '../services/getNextCardId.js';
 import { GuildSettings } from '../entities/guildSettings.js';
 import { EventLogService } from '../services/eventLogService.js';
 import { unlink } from 'fs/promises';
+import { stringId } from '../lib/utils.js';
 
 @ApplyOptions<Command.Options>({
 	description: 'Drops 3 cards'
@@ -204,15 +205,3 @@ export class DropCommand extends Command {
 		}
 	}
 }
-
-function stringId(id: number) {
-	let stringId = '';
-	const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
-
-	for (let i = 0; i < 4; i++) {
-		stringId += chars[id % chars.length];
-		id = Math.floor(id / chars.length);
-	}
-
-	return stringId.split('').reverse().join('');
-}
diff --git a/src/commands/jobs.ts b/src/commands/jobs.ts
@@ -51,7 +51,7 @@ export class JobsCommand extends Subcommand {
 						.setName('assign')
 						.setDescription('Assign card to slot')
 						.addStringOption((arg) =>
-							arg.setName('card').setDescription('Card to assign').setRequired(true).setMaxLength(4).setMinLength(4)
+							arg.setName('card').setDescription('Card to assign').setRequired(true).setMaxLength(5).setMinLength(4)
 						)
 						.addStringOption((arg) =>
 							arg

diff --git a/src/commands/use.ts b/src/commands/use.ts
@@ -12,6 +12,7 @@ import { DiscordUser } from '../entities/discordUser.js';
 import { getNextCardId } from '../services/getNextCardId.js';
 import { EventLogService } from '../services/eventLogService.js';
 import { unlink } from 'fs/promises';
+import { stringId } from '../lib/utils.js';
 
 export class UseCommand extends Command {
 	registerApplicationCommands(registry: ApplicationCommandRegistry) {
@@ -192,15 +193,3 @@ export class UseCommand extends Command {
 		}, 1000 * 60);
 	}
 }
-
-function stringId(id: number) {
-	let stringId = '';
-	const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
-
-	for (let i = 0; i < 4; i++) {
-		stringId += chars[id % chars.length];
-		id = Math.floor(id / chars.length);
-	}
-
-	return stringId.split('').reverse().join('');
-}
diff --git a/src/commands/view.ts b/src/commands/view.ts
@@ -21,13 +21,6 @@ export class ViewCommand extends Command {
   public override async chatInputRun(interaction: Command.ChatInputCommandInteraction) {
     const id = interaction.options.getString('card')!
 
-    if(id.length != 4) {
-      await interaction.reply({
-        content: 'Invalid card code',
-        ephemeral: true
-      })
-      return;
-    }
 
     const card = await db
         .getRepository(Card)

diff --git a/src/entities/card.ts b/src/entities/card.ts
@@ -5,7 +5,7 @@ import { CardCondition } from './cardCondition.js';
 
 @Entity('card')
 export class Card {
-	@PrimaryColumn('char', { length: 4 })
+	@PrimaryColumn('char', { length: 5 })
 	id!: string;
 
 	@ManyToOne(() => Mapper, { eager: false, nullable: false })

diff --git a/src/lib/utils.ts b/src/lib/utils.ts
@@ -51,3 +51,19 @@ function getGuildInfo(guild: Guild | null, channel: | Channel | null) {
 
 	return text
 }
+
+export function stringId(id: number) {
+	let stringId = '';
+	const chars = 'abcdefghijklmnopqrstuvwxyz0123456789';
+
+	const is5Digit = id >= 36 ** 4;
+	const length = is5Digit ? 5 : 4;
+	if (is5Digit) id -= 36 ** 4;
+
+	for (let i = 0; i < length; i++) {
+		stringId += chars[id % chars.length];
+		id = Math.floor(id / chars.length);
+	}
+
+	return stringId.split('').reverse().join('');
+}