bot: introduced HasTelegram type

Introduced HasTelegram type for use in functions that have `bot` argument, which can be either `Context` or `Telegraf<Context>`, but only `telegram` property is used.
lnp2pBot · Feb 20, 2025 · 358b0bf · 358b0bf
1 parent fba7dcb
commit 358b0bf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 11 deletions.
diff --git a/bot/messages.ts b/bot/messages.ts
@@ -15,7 +15,7 @@ const {
 } = require('../util');
 const OrderEvents = require('./modules/events/orders');
 import { logger } from "../logger";
-import { MainContext } from './start';
+import { HasTelegram, MainContext } from './start';
 import { UserDocument } from '../models/user'
 import { IOrder } from '../models/order'
 import { Telegraf } from 'telegraf';
@@ -275,15 +275,15 @@ const invoiceInvalidMessage = async (ctx: MainContext) => {
   }
 };
 
-const invalidOrderMessage = async (ctx: MainContext, bot: MainContext, user: UserDocument) => {
+const invalidOrderMessage = async (ctx: MainContext, bot: HasTelegram, user: UserDocument) => {
   try {
     await bot.telegram.sendMessage(user.tg_id, ctx.i18n.t('order_id_invalid'));
   } catch (error) {
     logger.error(error);
   }
 };
 
-const invalidTypeOrderMessage = async (ctx: MainContext, bot: MainContext, user: UserDocument, type: IOrder["type"]) => {
+const invalidTypeOrderMessage = async (ctx: MainContext, bot: HasTelegram, user: UserDocument, type: IOrder["type"]) => {
   try {
     await bot.telegram.sendMessage(
       user.tg_id,
@@ -294,7 +294,7 @@ const invalidTypeOrderMessage = async (ctx: MainContext, bot: MainContext, user:
   }
 };
 
-const alreadyTakenOrderMessage = async (ctx: MainContext, bot: MainContext, user: UserDocument) => {
+const alreadyTakenOrderMessage = async (ctx: MainContext, bot: HasTelegram, user: UserDocument) => {
   try {
     await bot.telegram.sendMessage(
       user.tg_id,
@@ -321,7 +321,7 @@ const genericErrorMessage = async (bot: MainContext, user: UserDocument, i18n: I
   }
 };
 
-const beginTakeBuyMessage = async (ctx: MainContext, bot: MainContext, seller: UserDocument, order: IOrder) => {
+const beginTakeBuyMessage = async (ctx: MainContext, bot: HasTelegram, seller: UserDocument, order: IOrder) => {
   try {
     const expirationTime =
       Number(process.env.HOLD_INVOICE_EXPIRATION_WINDOW) / 60;
@@ -438,7 +438,7 @@ const onGoingTakeBuyMessage = async (
   }
 };
 
-const beginTakeSellMessage = async (ctx: MainContext, bot: MainContext, buyer: UserDocument, order: IOrder) => {
+const beginTakeSellMessage = async (ctx: MainContext, bot: HasTelegram, buyer: UserDocument, order: IOrder) => {
   try {
     const holdInvoiceExpiration = holdInvoiceExpirationInSecs();
     const orderExpiration =
@@ -884,7 +884,7 @@ const sendBuyerInfo2SellerMessage = async (bot: MainContext, buyer: UserDocument
   }
 };
 
-const cantTakeOwnOrderMessage = async (ctx: MainContext, bot: MainContext, user: UserDocument) => {
+const cantTakeOwnOrderMessage = async (ctx: MainContext, bot: HasTelegram, user: UserDocument) => {
   try {
     await bot.telegram.sendMessage(
       user.tg_id,

diff --git a/bot/start.ts b/bot/start.ts
@@ -1,4 +1,4 @@
-import { Telegraf, session, Context } from 'telegraf';
+import { Telegraf, session, Context, Telegram } from 'telegraf';
 import { I18n, I18nContext } from '@grammyjs/i18n';
 import { Message } from 'typegram'
 import { UserDocument } from '../models/user'
@@ -79,6 +79,10 @@ export interface OrderQuery {
   seller_id?: string;
 }
 
+export interface HasTelegram {
+  telegram: Telegram;
+}
+
 const askForConfirmation = async (user: UserDocument, command: string) => {
   try {
     let orders: any[] = [];

diff --git a/bot/validations.ts b/bot/validations.ts
@@ -1,4 +1,4 @@
-import { MainContext, OrderQuery, ctxUpdateAssertMsg } from "./start";
+import { HasTelegram, MainContext, OrderQuery, ctxUpdateAssertMsg } from "./start";
 import { ICommunity, IUsernameId } from "../models/community";
 import { FilterQuery } from "mongoose";
 import { UserDocument } from "../models/user";
@@ -434,7 +434,7 @@ const isValidInvoice = async (ctx: MainContext, lnInvoice: string) => {
 };
 
 
-const validateTakeSellOrder = async (ctx: MainContext, bot: MainContext, user: UserDocument, order: IOrder) => {
+const validateTakeSellOrder = async (ctx: MainContext, bot: HasTelegram, user: UserDocument, order: IOrder) => {
   try {
     if (!order) {
       await messages.invalidOrderMessage(ctx, bot, user);
@@ -463,7 +463,7 @@ const validateTakeSellOrder = async (ctx: MainContext, bot: MainContext, user: U
   }
 };
 
-const validateTakeBuyOrder = async (ctx: MainContext, bot: MainContext, user: UserDocument, order: IOrder) => {
+const validateTakeBuyOrder = async (ctx: MainContext, bot: HasTelegram, user: UserDocument, order: IOrder) => {
   try {
     if (!order) {
       await messages.invalidOrderMessage(ctx, bot, user);