From 14186c2ab328c56b6dd42311b994c73ec31d1abc Mon Sep 17 00:00:00 2001 From: Aotumuri Date: Mon, 5 May 2025 12:38:19 +0900 Subject: [PATCH] fix --- resources/QuickChat.json | 84 +++++++++++++++++++++++++++++++++------- src/core/Schemas.ts | 5 ++- 2 files changed, 74 insertions(+), 15 deletions(-) diff --git a/resources/QuickChat.json b/resources/QuickChat.json index eed049948..7f3a8a1d9 100644 --- a/resources/QuickChat.json +++ b/resources/QuickChat.json @@ -27,9 +27,21 @@ } ], "attack": [ - { "key": "attack", "text": "Attack [P1]!", "requiresPlayer": true }, - { "key": "mirv", "text": "Launch a MIRV at [P1]!", "requiresPlayer": true }, - { "key": "focus", "text": "Focus fire on [P1]!", "requiresPlayer": true }, + { + "key": "attack", + "text": "Attack [P1]!", + "requiresPlayer": true + }, + { + "key": "mirv", + "text": "Launch a MIRV at [P1]!", + "requiresPlayer": true + }, + { + "key": "focus", + "text": "Focus fire on [P1]!", + "requiresPlayer": true + }, { "key": "finish", "text": "Let's finish off [P1]!", @@ -54,24 +66,68 @@ } ], "greet": [ - { "key": "hello", "text": "Hello!", "requiresPlayer": false }, - { "key": "good_luck", "text": "Good luck!", "requiresPlayer": false }, - { "key": "have_fun", "text": "Have fun!", "requiresPlayer": false }, - { "key": "gg", "text": "GG!", "requiresPlayer": false }, + { + "key": "hello", + "text": "Hello!", + "requiresPlayer": false + }, + { + "key": "good_luck", + "text": "Good luck!", + "requiresPlayer": false + }, + { + "key": "have_fun", + "text": "Have fun!", + "requiresPlayer": false + }, + { + "key": "gg", + "text": "GG!", + "requiresPlayer": false + }, { "key": "nice_to_meet", "text": "Nice to meet you!", "requiresPlayer": false }, - { "key": "well_played", "text": "Well played!", "requiresPlayer": false }, - { "key": "hi_again", "text": "Hi again!", "requiresPlayer": false }, - { "key": "bye", "text": "Bye!", "requiresPlayer": false }, - { "key": "thanks", "text": "Thanks!", "requiresPlayer": false } + { + "key": "well_played", + "text": "Well played!", + "requiresPlayer": false + }, + { + "key": "hi_again", + "text": "Hi again!", + "requiresPlayer": false + }, + { + "key": "bye", + "text": "Bye!", + "requiresPlayer": false + }, + { + "key": "thanks", + "text": "Thanks!", + "requiresPlayer": false + } ], "misc": [ - { "key": "go", "text": "Let’s go!", "requiresPlayer": false }, - { "key": "strategy", "text": "Nice strategy!", "requiresPlayer": false }, - { "key": "fun", "text": "This game is fun!", "requiresPlayer": false }, + { + "key": "go", + "text": "Let’s go!", + "requiresPlayer": false + }, + { + "key": "strategy", + "text": "Nice strategy!", + "requiresPlayer": false + }, + { + "key": "fun", + "text": "This game is fun!", + "requiresPlayer": false + }, { "key": "pr", "text": "When will my PR finally get merged...?", diff --git a/src/core/Schemas.ts b/src/core/Schemas.ts index 482f2e38d..c98a4c23d 100644 --- a/src/core/Schemas.ts +++ b/src/core/Schemas.ts @@ -276,7 +276,10 @@ export const QuickChatIntentSchema = BaseIntentSchema.extend({ recipient: ID, quickChatKey: z .string() - .regex(/^(help|attack|defend|greet|misc)\.[a-zA-Z0-9_]+$/), + .regex(/^(help|attack|defend|greet|misc)\.[a-zA-Z0-9_]+$/) + .refine((val) => val.split(".")[1]?.length <= 50, { + message: "The key name (after the dot) must be 50 characters or less.", + }), variables: z.record(z.string()).optional(), });