Add badges to redis

dist/TSRedis.d.ts

@@ -7,12 +7,12 @@ declare const messageSchema: z.ZodUnion<[z.ZodObject<{
     channel: z.ZodEnum<["main"]>;
 }, "strip", z.ZodTypeAny, {
     type: "text";
-    text: string;
     channel: "main";
+    text: string;
 }, {
     type: "text";
-    text: string;
     channel: "main";
+    text: string;
 }>, z.ZodObject<{
     type: z.ZodLiteral<"ping">;
     channel: z.ZodEnum<["main"]>;
@@ -28,12 +28,18 @@ type Channel = z.infer<typeof channels>;
 declare const userSchema: z.ZodObject<{
     username: z.ZodNullable<z.ZodString>;
     perk_tier: z.ZodNullable<z.ZodNumber>;
+    osb_badges: z.ZodNullable<z.ZodString>;
+    bso_badges: z.ZodNullable<z.ZodString>;
 }, "strip", z.ZodTypeAny, {
     username: string | null;
     perk_tier: number | null;
+    osb_badges: string | null;
+    bso_badges: string | null;
 }, {
     username: string | null;
     perk_tier: number | null;
+    osb_badges: string | null;
+    bso_badges: string | null;
 }>;
 type RedisUser = z.infer<typeof userSchema>;
 export declare class TSRedis {

src/TSRedis.ts

@@ -1,7 +1,14 @@
+import { escapeMarkdown } from 'discord.js';
 import Redis, { type RedisOptions } from 'ioredis';
 import MockRedis from 'ioredis-mock';
 import { z } from 'zod';
 
+import { stripEmojis } from './util/misc';
+
+function cleanUsername(username: string) {
+	return escapeMarkdown(stripEmojis(username)).substring(0, 32);
+}
+
 const channels = z.enum(['main']);
 
 const patronUpdateMessageSchema = z.object({
@@ -22,7 +29,9 @@ type Channel = z.infer<typeof channels>;
 
 const userSchema = z.object({
 	username: z.string().nullable(),
-	perk_tier: z.number().nullable()
+	perk_tier: z.number().nullable(),
+	osb_badges: z.string().nullable(),
+	bso_badges: z.string().nullable()
 });
 
 type RedisUser = z.infer<typeof userSchema>;
@@ -74,6 +83,9 @@ export class TSRedis {
 	}
 
 	async setUser(userID: string, changes: Partial<RedisUser>) {
+		if (changes.username) {
+			changes.username = cleanUsername(changes.username);
+		}
 		return this.redis.hset(this.getUserHash(userID), changes);
 	}
 
@@ -82,7 +94,9 @@ export class TSRedis {
 
 		return {
 			username: user.username ?? null,
-			perk_tier: user.perk_tier ? Number.parseInt(user.perk_tier) : null
+			perk_tier: user.perk_tier ? Number.parseInt(user.perk_tier) : null,
+			osb_badges: user.osb_badges ?? null,
+			bso_badges: user.bso_badges ?? null
 		};
 	}
 }