diff --git a/src/commands/quote.ts b/src/commands/quote.ts index 5f5d91b..a71a118 100644 --- a/src/commands/quote.ts +++ b/src/commands/quote.ts @@ -12,8 +12,7 @@ import { getUserAvatar, logError, makeDarkGradientBgFancy, - oldReplyToMessage, - oldSendMessage + replyToMessage } from "../util/utils"; import {Requirements} from "../base/requirements"; import {Requirement} from "../base/requirement"; @@ -50,15 +49,10 @@ export class Quote extends Command { const chatId = msg.chat.id; const reply = msg.reply_to_message; - if (!reply) { - await oldReplyToMessage(msg, "Сделай /quote реплаем на сообщение 🙂").catch(logError); - return; - } - try { const quoteRaw = (msg.quote?.text ?? reply.text ?? reply.caption ?? "").trim(); if (quoteRaw.length === 0) { - await oldReplyToMessage(msg, "Не нашёл в сообщении текста 😢").catch(logError); + await replyToMessage({message: msg, text: "Не нашёл в сообщении текста 😢"}).catch(logError); return; } @@ -76,7 +70,7 @@ export class Quote extends Command { }).catch(logError); } catch (e) { logError(e); - await oldSendMessage(msg, "Не смог собрать цитату 😢").catch(logError); + await replyToMessage({message: msg, text: "Не смог собрать цитату 😢"}).catch(logError); } } } diff --git a/src/util/utils.ts b/src/util/utils.ts index 96c9bd6..29550bf 100644 --- a/src/util/utils.ts +++ b/src/util/utils.ts @@ -1149,7 +1149,7 @@ export async function processNewMessage(msg: Message): Promise { logError(e); } - if ((msg.new_chat_members?.length || 0 > 0)) { + if ((msg.new_chat_members?.length)) { await bot.sendMessage({chat_id: msg.chat.id, text: randomValue(Environment.ANSWERS.invite)}).catch(logError); return; }