fix: regex error checking

KimuSoft · Apr 19, 2023 · 7c4698a · 7c4698a
1 parent eccf634
commit 7c4698a
Show file tree

Hide file tree

Showing 6 changed files with 161 additions and 99 deletions.
diff --git a/bot/findInvalidRules.mjs b/bot/findInvalidRules.mjs
@@ -0,0 +1,21 @@
+import { config } from 'dotenv'
+
+config({ path: '../.env' })
+config({ path: '../shared/.env' })
+
+import { PrismaClient } from '@prisma/client'
+
+const db = new PrismaClient()
+
+const ruleElements = await db.ruleElement.findMany()
+
+for (const el of ruleElements) {
+  try {
+    await db.$queryRaw`select '' ~* ${el.regex}`
+  } catch (e) {
+    console.error('----------------------')
+    console.error(e.message)
+    console.error('element:', el)
+    console.error('rule:', await db.rule.findUnique({where: {id: el.ruleId}}))
+  }
+}
diff --git a/bot/package.json b/bot/package.json
@@ -17,7 +17,7 @@
     "@trpc/server": "9.26.2",
     "axios": "^0.27.2",
     "discord-hybrid-sharding": "^1.7.2",
-    "discord.js": "14.1.1",
+    "discord.js": "14.8.0",
     "dokdo": "pikokr/dokdo#v14",
     "dotenv": "16.0.1",
     "fastify": "4.3.0",

diff --git a/bot/src/modules/rule.ts b/bot/src/modules/rule.ts
@@ -7,6 +7,7 @@ import {
   EmbedBuilder,
   Interaction,
   SelectMenuBuilder,
+  TextBasedChannel
 } from "discord.js"
 import { prisma, Rule, RuleType } from "shared"
 
@@ -29,7 +30,7 @@ class RuleModule extends Extension {
   async tags(i: ChatInputCommandInteraction) {
     let channel = i.channel
     if (!channel) return
-    if (channel.isThread()) channel = channel.parent
+    if (channel.isThread()) channel = channel.parent as TextBasedChannel
     if (!channel) return
     if (channel.isDMBased()) return i.reply("DM 안 받아요")
 

diff --git a/server/src/resolvers/mutation/rule/createRuleElement.ts b/server/src/resolvers/mutation/rule/createRuleElement.ts
@@ -10,6 +10,7 @@ export const createRuleElement: Resolver<
   if (info.regex) {
     try {
       new RegExp(info.regex)
+      await prisma.$queryRaw`select '' ~* ${info.regex}`
     } catch (e) {
       throw new ValidationError("Invalid regex")
     }

diff --git a/server/src/resolvers/mutation/ruleElement/update.ts b/server/src/resolvers/mutation/ruleElement/update.ts
@@ -6,10 +6,11 @@ export const updateRuleElement: Resolver<
   RuleElement,
   RuleElement,
   { info: Partial<RuleElementInfo> }
-> = (elem, { info }) => {
+> = async (elem, { info }) => {
   if (info.regex) {
     try {
       new RegExp(info.regex)
+      await prisma.$queryRaw`select '' ~* ${info.regex}`
     } catch (e) {
       throw new ValidationError("Invalid regex")
     }