From 9e218e34574def7177a9cc460ff9f1f7ad00657c Mon Sep 17 00:00:00 2001 From: alina sireneva Date: Tue, 3 Dec 2024 02:40:31 +0300 Subject: [PATCH] fix(dispatcher): support text filters inside filters.replyTo --- packages/dispatcher/src/filters/text.ts | 30 ++++++++++++++----------- 1 file changed, 17 insertions(+), 13 deletions(-) diff --git a/packages/dispatcher/src/filters/text.ts b/packages/dispatcher/src/filters/text.ts index c9ac6bc1..56aca153 100644 --- a/packages/dispatcher/src/filters/text.ts +++ b/packages/dispatcher/src/filters/text.ts @@ -1,10 +1,12 @@ import type { BusinessCallbackQuery, - BusinessMessage, CallbackQuery, ChosenInlineResult, InlineCallbackQuery, InlineQuery, +} from '@mtcute/core' +import { + BusinessMessage, Message, } from '@mtcute/core' @@ -12,21 +14,23 @@ import type { UpdateContextDistributed } from '../context/base.js' import type { UpdateFilter } from './types.js' -type UpdatesWithText = UpdateContextDistributed< - | Message - | BusinessMessage - | InlineQuery - | ChosenInlineResult - | CallbackQuery - | InlineCallbackQuery - | BusinessCallbackQuery -> +type UpdatesWithText = + | Message + | BusinessMessage + | UpdateContextDistributed< + | InlineQuery + | ChosenInlineResult + | CallbackQuery + | InlineCallbackQuery + | BusinessCallbackQuery + > function extractText(obj: UpdatesWithText): string | null { + if (obj instanceof Message || obj instanceof BusinessMessage) { + return obj.text + } + switch (obj._name) { - case 'new_message': - case 'new_business_message': - return obj.text case 'inline_query': return obj.query case 'chosen_inline_result':