Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

Merged
merged 13 commits into from
Sep 26, 2024
Merged

Convert JS to TS (commits 7-13 of PR435) - attempt#2 #585

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
4150ea5
util/index: convert js to ts
Mersho Oct 4, 2023
5d3aa28
jobs: convert js to ts
Mersho Sep 11, 2023
2501abc
bot/start: fixing types & import/exports
Mersho Sep 11, 2023
df9681c
bot/validation: convert js to ts
Mersho Sep 12, 2023
ff52901
lnurl/lnurl-pay: convert js to ts
Mersho Sep 11, 2023
27c978e
refactor: correcting a bad practice
Mersho Sep 13, 2023
4aeffd6
refactor: there's no need for isInt()
Mersho Sep 14, 2023
8d7865a
bot: fix bugs in validations.ts
webwarrior-ws Sep 2, 2024
a256aaa
bot,util: fix bug in validateAdmin
webwarrior-ws Sep 5, 2024
8a22b8f
bot: fix date comparison in isValidInvoice
webwarrior-ws Sep 5, 2024
20b6ccf
WIP: added some debug logging
webwarrior-ws Sep 9, 2024
ba09fdd
WIP: more debug logging
webwarrior-ws Sep 12, 2024
706b9fd
bot,util,locales,tests: don't use objects in locales
webwarrior-ws Sep 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 24 additions & 20 deletions bot/modules/dispute/messages.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
const { getDisputeChannel, getDetailedOrder, sanitizeMD } = require('../../../util');
const {
getDisputeChannel,
getDetailedOrder,
sanitizeMD,
} = require('../../../util');
const { logger } = require('../../../logger');

exports.beginDispute = async (ctx, initiator, order, buyer, seller) => {
Expand Down Expand Up @@ -91,25 +95,25 @@ exports.disputeData = async (
// Fix Issue 543: Escape underscores in usernames
const escapedInitiatorUsername = sanitizeMD(initiatorUser.username);
const escapedCounterPartyUsername = sanitizeMD(counterPartyUser.username);
await ctx.telegram.sendMessage(
solver.tg_id,
ctx.i18n.t('dispute_started_channel', {
initiatorUser: { ...initiatorUser, username: escapedInitiatorUsername },
initiatorTgId: initiatorUser.tg_id,
counterPartyUser: { ...counterPartyUser, username: escapedCounterPartyUsername },
counterPartyUserTgId: counterPartyUser.tg_id,
buyer,
seller,
buyerDisputes,
sellerDisputes,
detailedOrder,
type,
sellerToken: order.seller_dispute_token,
buyerToken: order.buyer_dispute_token,
}),
{ parse_mode: 'MarkdownV2' }
);

const message = ctx.i18n.t('dispute_started_channel', {
initiatorUser: escapedInitiatorUsername,
initiatorTgId: initiatorUser.tg_id,
counterPartyUser: escapedCounterPartyUsername,
counterPartyUserTgId: counterPartyUser.tg_id,
buyer,
seller,
buyerDisputes,
sellerDisputes,
detailedOrder,
type,
sellerToken: order.seller_dispute_token,
buyerToken: order.buyer_dispute_token,
});
console.log(`Contens of message:\n${message}`);
await ctx.telegram.sendMessage(solver.tg_id, message, {
parse_mode: 'MarkdownV2',
});
// message to both parties letting them know the dispute
// has been taken by a solver
await ctx.telegram.sendMessage(
Expand Down
75 changes: 41 additions & 34 deletions bot/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,17 @@ import { Message } from 'typegram'
import { UserDocument } from '../models/user'
import { FilterQuery } from 'mongoose';
const OrderEvents = require('./modules/events/orders');

const { limit } = require('@grammyjs/ratelimiter');
import { limit } from "@grammyjs/ratelimiter"
const schedule = require('node-schedule');
const {
import {
Order,
User,
PendingPayment,
Community,
Dispute,
Config,
} = require('../models');
const { getCurrenciesWithPrice, deleteOrderFromChannel, removeAtSymbol } = require('../util');
} from '../models';
import { getCurrenciesWithPrice, deleteOrderFromChannel, removeAtSymbol } from '../util';
const {
commandArgsMiddleware,
stageMiddleware,
Expand Down Expand Up @@ -55,32 +54,34 @@ const {
validateLightningAddress,
} = require('./validations');
import * as messages from './messages';
const {
import {
attemptPendingPayments,
cancelOrders,
deleteOrders,
calculateEarnings,
attemptCommunitiesPendingPayments,
deleteCommunity,
nodeInfo,
} = require('../jobs');
const { logger } = require('../logger');
} from '../jobs';
import { logger } from "../logger";
import { ICommunity, IUsernameId } from '../models/community';

export interface MainContext extends Context {
match: Array<string> | null;
i18n: I18nContext;
user: UserDocument;
admin: UserDocument;
}

interface OrderQuery {
export interface OrderQuery {
status?: string;
buyer_id?: string;
seller_id?: string;
}

const askForConfirmation = async (user: UserDocument, command: string) => {
try {
let orders = [];
let orders: any[] = [];
if (command === '/cancel') {
const where: FilterQuery<OrderQuery> = {
$and: [
Expand Down Expand Up @@ -133,6 +134,7 @@ const askForConfirmation = async (user: UserDocument, command: string) => {
return orders;
} catch (error) {
logger.error(error);
return null;
}
};

Expand All @@ -145,7 +147,7 @@ has the same condition.
The problem mentioned above is similar to this issue:
https://github.com/telegraf/telegraf/issues/1319#issuecomment-766360594
*/
const ctxUpdateAssertMsg = "ctx.update.message.text is not available.";
export const ctxUpdateAssertMsg = "ctx.update.message.text is not available.";

const initialize = (botToken: string, options: Partial<Telegraf.Options<MainContext>>): Telegraf<MainContext> => {
const i18n = new I18n({
Expand Down Expand Up @@ -215,7 +217,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
const [val] = await validateParams(ctx, 2, '\\<_on/off_\\>');
if (!val) return;
let config = await Config.findOne();
if (!config) {
if (config === null) {
config = new Config();
}
config.maintenance = false;
Expand Down Expand Up @@ -262,11 +264,11 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
throw new Error(ctxUpdateAssertMsg);
}
const params = ctx.update.message.text.split(' ');
const [command, orderId] = params.filter((el) => el);
const [command, orderId] = params.filter((el: string) => el);

if (!orderId) {
const orders = await askForConfirmation(ctx.user, command);
if (!orders.length) return await ctx.reply(`${command} <order Id>`);
if (orders === null || orders.length === 0) return await ctx.reply(`${command} <order Id>`);

return await messages.showConfirmationButtons(ctx, orders, command);
} else if (!(await validateObjectId(ctx, orderId))) {
Expand Down Expand Up @@ -325,7 +327,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
if (!(await validateObjectId(ctx, orderId))) return;
const order = await Order.findOne({ _id: orderId });

if (!order) return;
if (order === null) return;

// We look for a dispute for this order
const dispute = await Dispute.findOne({ order_id: order._id });
Expand Down Expand Up @@ -367,10 +369,11 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont

order.status = 'CANCELED_BY_ADMIN';
order.canceled_by = ctx.admin._id;
const buyer = await User.findOne({ _id: order.buyer_id });
const seller = await User.findOne({ _id: order.seller_id });
await order.save();
OrderEvents.orderUpdated(order);
const buyer = await User.findOne({ _id: order.buyer_id });
const seller = await User.findOne({ _id: order.seller_id });
if (buyer === null || seller === null) throw Error("buyer and/or seller were not found in DB");
// we sent a private message to the admin
await messages.successCancelOrderMessage(ctx, ctx.admin, order, ctx.i18n);
// we sent a private message to the seller
Expand All @@ -390,11 +393,11 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
throw new Error(ctxUpdateAssertMsg);
}
const params = ctx.update.message.text.split(' ');
const [command, orderId] = params.filter((el) => el);
const [command, orderId] = params.filter((el: string) => el);

if (!orderId) {
const orders = await askForConfirmation(ctx.user, command);
if (!orders.length) return await ctx.reply(`${command} <order Id>`);
if (orders === null || orders.length === 0) return await ctx.reply(`${command} <order Id>`);

return await messages.showConfirmationButtons(ctx, orders, command);
} else if (!(await validateObjectId(ctx, orderId))) {
Expand Down Expand Up @@ -445,7 +448,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
await order.save();
OrderEvents.orderUpdated(order);
// We delete the messages related to that order from the channel
await deleteOrderFromChannel(order, bot.telegram);
await deleteOrderFromChannel(order, bot.telegram as any);
}
// we sent a private message to the user
await messages.successCancelAllOrdersMessage(ctx);
Expand All @@ -462,7 +465,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
if (!(await validateObjectId(ctx, orderId))) return;

const order = await Order.findOne({ _id: orderId });
if (!order) return;
if (order === null) return;

// Check if the order status is already PAID_HOLD_INVOICE
if (order.status === 'PAID_HOLD_INVOICE') {
Expand Down Expand Up @@ -498,10 +501,11 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
}

order.status = 'COMPLETED_BY_ADMIN';
const buyer = await User.findOne({ _id: order.buyer_id });
const seller = await User.findOne({ _id: order.seller_id });
await order.save();
OrderEvents.orderUpdated(order);
const buyer = await User.findOne({ _id: order.buyer_id });
const seller = await User.findOne({ _id: order.seller_id });
if (buyer === null || seller === null) throw Error("buyer and/or seller were not found in DB");
// we sent a private message to the admin
await messages.successCompleteOrderMessage(ctx, order);
// we sent a private message to the seller
Expand All @@ -525,11 +529,11 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
if (!(await validateObjectId(ctx, orderId))) return;
const order = await Order.findOne({ _id: orderId });

if (!order) return;
if (order === null) return;

const buyer = await User.findOne({ _id: order.buyer_id });
const seller = await User.findOne({ _id: order.seller_id });

if (buyer === null || seller === null) throw Error("buyer and/or seller were not found in DB");
await messages.checkOrderMessage(ctx, order, buyer, seller);
} catch (error) {
logger.error(error);
Expand All @@ -543,7 +547,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
if (!(await validateObjectId(ctx, orderId))) return;
const order = await Order.findOne({ _id: orderId });

if (!order) return;
if (order === null) return;
if (!order.hash) return;

const invoice = await getInvoice({ hash: order.hash });
Expand All @@ -567,7 +571,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont

const order = await Order.findOne({ hash });

if (!order) return;
if (order === null) return;
await subscribeInvoice(bot, hash, true);
ctx.reply(`hash resubscribed`);
} catch (error: any) {
Expand Down Expand Up @@ -606,11 +610,11 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
throw new Error(ctxUpdateAssertMsg);
}
const params = ctx.update.message.text.split(' ');
const [command, orderId] = params.filter((el) => el);
const [command, orderId] = params.filter((el: string) => el);

if (!orderId) {
const orders = await askForConfirmation(ctx.user, command);
if (!orders.length) return await ctx.reply(`${command} <order Id>`);
if (orders === null || orders.length === 0) return await ctx.reply(`${command} <order Id>`);

return await messages.showConfirmationButtons(ctx, orders, command);
} else if (!(await validateObjectId(ctx, orderId))) {
Expand All @@ -637,7 +641,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
const user = await User.findOne({
$or: [{ username }, { tg_id: username }],
});
if (!user) {
if (user === null) {
await messages.notFoundUserMessage(ctx);
return;
}
Expand All @@ -648,6 +652,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
const community = await Community.findById(
ctx.admin.default_community_id
);
if (community === null) throw Error("Community was not found in DB");
community.banned_users.push({
id: user._id,
username: user.username,
Expand Down Expand Up @@ -680,7 +685,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
const user = await User.findOne({
$or: [{ username }, { tg_id: username }],
});
if (!user) {
if (user === null) {
await messages.notFoundUserMessage(ctx);
return;
}
Expand All @@ -691,8 +696,9 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
const community = await Community.findById(
ctx.admin.default_community_id
);
community.banned_users = community.banned_users.filter(
(el: any) => el.id !== user.id
if (community === null) throw Error("Community was not found in DB");
community.banned_users = community.banned_users.toObject().filter(
(el: IUsernameId) => el.id !== user.id
);
await community.save();
} else {
Expand Down Expand Up @@ -739,7 +745,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
try {
const command = '/setinvoice';
const orders = await askForConfirmation(ctx.user, command);
if (!orders.length) return await ctx.reply(ctx.i18n.t('setinvoice_no_response'));
if (orders === null || !orders.length) return await ctx.reply(ctx.i18n.t('setinvoice_no_response'));

return await messages.showConfirmationButtons(ctx, orders, command);
} catch (error) {
Expand Down Expand Up @@ -859,6 +865,7 @@ const initialize = (botToken: string, options: Partial<Telegraf.Options<MainCont
bot.command('info', userMiddleware, async (ctx: MainContext) => {
try {
const config = await Config.findOne({});
if (config === null) throw Error("Config was not found in DB");
await messages.showInfoMessage(ctx, ctx.user, config);
} catch (error) {
logger.error(error);
Expand Down
Loading
Loading