fix(teach): empty content should not trigger answer, fix #457

koishijs · Feb 3, 2022 · f6e348b · f6e348b
1 parent e9da7b4
commit f6e348b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/plugins/teach/src/receiver.ts b/plugins/teach/src/receiver.ts
@@ -171,6 +171,8 @@ const fullWidth = '，、。～？！（）【】'
 const fullWidthRegExp = new RegExp(`[${fullWidth}]`)
 
 export async function triggerDialogue(ctx: Context, session: Session, next: Next = noop) {
+  if (!session.content) return
+
   const state = ctx.getSessionState(session)
   state.next = next
   state.test = {}
@@ -246,7 +248,7 @@ export async function triggerDialogue(ctx: Context, session: Session, next: Next
   await ctx.app.parallel(session, 'dialogue/send', state)
 }
 
-export default function apply(ctx: Context, config: Dialogue.Config) {
+export default function receiver(ctx: Context, config: Dialogue.Config) {
   const { nickname = ctx.app.options.nickname, maxRedirections = 3 } = config
   const nicknames = makeArray(nickname).map(escapeRegExp)
   const nicknameRE = new RegExp(`^((${nicknames.join('|')})[,，]?\\s*)+`)
@@ -336,9 +338,9 @@ export default function apply(ctx: Context, config: Dialogue.Config) {
   })
 
   ctx2.command('dialogue <message:text>', '触发教学对话')
-    .action(async ({ session, next }, message = '') => {
-      if (session._redirected > maxRedirections) return next()
+    .action(async ({ session }, message = '') => {
+      if (session._redirected > maxRedirections) return
       session.content = message
-      return triggerDialogue(ctx, session, next)
+      return triggerDialogue(ctx, session)
     })
 }
diff --git a/plugins/teach/src/update.ts b/plugins/teach/src/update.ts
@@ -100,7 +100,6 @@ function isIntegerOrInterval(source: string) {
 }
 
 function review(dialogues: Dialogue[], argv: Dialogue.Argv) {
-  const { session } = argv
   const output = dialogues.map((d) => {
     const details = getDetails(argv, d)
     const { questionType = '问题', answerType = '回答' } = details