From 3025421e34bd9e8a3d32611bd5c74fc1953957bd Mon Sep 17 00:00:00 2001 From: xzeldon Date: Thu, 20 Oct 2022 19:54:24 +0300 Subject: [PATCH] fix bug with ctx. --- .gitignore | 3 ++- src/handlers/balabola.ts | 18 +++++++++--------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index a0d218e..ad73ad3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ node_modules dist -.env \ No newline at end of file +.env +balabola.tar.gz \ No newline at end of file diff --git a/src/handlers/balabola.ts b/src/handlers/balabola.ts index 68f9c4d..9f03b28 100644 --- a/src/handlers/balabola.ts +++ b/src/handlers/balabola.ts @@ -11,14 +11,14 @@ const filter = composer const selectStyleKeyboard = (ctx: C) => { return Keyboard.builder() - .textButton({ label: '1', payload: { command: 'пр 0 ' + ctx.text! } }) - .textButton({ label: '2', payload: { command: 'пр 24 ' + ctx.text! } }) - .textButton({ label: '3', payload: { command: 'пр 25 ' + ctx.text! } }) - .textButton({ label: '4', payload: { command: 'пр 11 ' + ctx.text! } }) + .textButton({ label: '1', payload: { command: 'пр 0 ' + ctx.$match[1] } }) + .textButton({ label: '2', payload: { command: 'пр 24 ' + ctx.$match[1] } }) + .textButton({ label: '3', payload: { command: 'пр 25 ' + ctx.$match[1] } }) + .textButton({ label: '4', payload: { command: 'пр 11 ' + ctx.$match[1] } }) .row() - .textButton({ label: '5', payload: { command: 'пр 6 ' + ctx.text! } }) - .textButton({ label: '6', payload: { command: 'пр 8 ' + ctx.text! } }) - .textButton({ label: '7', payload: { command: 'пр 9 ' + ctx.text! } }) + .textButton({ label: '5', payload: { command: 'пр 6 ' + ctx.$match[1] } }) + .textButton({ label: '6', payload: { command: 'пр 8 ' + ctx.$match[1] } }) + .textButton({ label: '7', payload: { command: 'пр 9 ' + ctx.$match[1] } }) .row() .textButton({ label: 'чзх', payload: { command: 'help' } }) .inline(); @@ -47,7 +47,7 @@ filter.hear(/^(?:пр)\s(1|2|3|4|5|6|7)\s(.*)?$/i, async ctx => { const intro = ctx.$match[1]; const query = ctx.$match[2]; - await ctx.send('генерирую!!'); + await ctx.send('генерирую!!!'); const result = await balabolaQueue.add(() => balabola(query, BALABOLA_INTROS[+intro - 1])); await ctx.send(result); @@ -55,6 +55,6 @@ filter.hear(/^(?:пр)\s(1|2|3|4|5|6|7)\s(.*)?$/i, async ctx => { filter.use(async ctx => { if (ctx.isChat) return; - const result = await balabolaQueue.add(() => balabola(ctx.text!, 6)); + const result = await balabolaQueue.add(() => balabola(ctx.text!, 0)); await ctx.send(result); });