From 96678a45c3c39f771f4f38ee2b0db8e0755910ac Mon Sep 17 00:00:00 2001
From: wancat <wancat@wancat.cc>
Date: Sun, 29 Oct 2023 17:32:18 +0800
Subject: [PATCH] feat: remove $ from condition field name

---
 packages/models/quest.js          | 4 ++--
 server/src/game/commandHandler.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/models/quest.js b/packages/models/quest.js
index 39a35ab..1eb2b94 100644
--- a/packages/models/quest.js
+++ b/packages/models/quest.js
@@ -31,8 +31,8 @@ const conditionSchema = new Schema({
 })
 
 conditionSchema.add({
-  $or: [conditionSchema],
-  $not: conditionSchema,
+  or: [conditionSchema],
+  not: conditionSchema,
 })
 
 const stageSchema = new Schema({
diff --git a/server/src/game/commandHandler.js b/server/src/game/commandHandler.js
index 7ee78c8..54ea91f 100644
--- a/server/src/game/commandHandler.js
+++ b/server/src/game/commandHandler.js
@@ -58,8 +58,8 @@ export default class CommandHandler extends SessionHandler {
     return (
       this.checkKeys(condition) &&
       (await this.checkFiles(condition.files)) &&
-      (await this.checkNot(condition.$not)) &&
-      (await this.checkOr(condition.$or)) === true
+      (await this.checkNot(condition.not)) &&
+      (await this.checkOr(condition.or)) === true
     )
   }