diff --git a/app.ts b/app.ts index d2d5eb4c..5dc9a299 100644 --- a/app.ts +++ b/app.ts @@ -1,9 +1,9 @@ import 'dotenv/config'; import { SocksProxyAgent } from "socks-proxy-agent"; import { MainContext, start } from "./bot/start"; -import mongoConnect from './db_connect' +import { connect as mongoConnect } from './db_connect' const { resubscribeInvoices } = require('./ln'); -import logger from "./logger"; +import { logger } from "./logger"; import { Telegraf } from "telegraf"; const { delay } = require('./util'); diff --git a/bot/messages.ts b/bot/messages.ts index a49ccac7..35aad6f5 100644 --- a/bot/messages.ts +++ b/bot/messages.ts @@ -12,7 +12,7 @@ const { decimalRound, getUserAge, } = require('../util'); -import logger from "../logger"; +import { logger } from "../logger"; import { MainContext } from './start'; import { UserDocument } from '../models/user' import { IOrder } from '../models/order' diff --git a/db_connect.ts b/db_connect.ts index e93a8f7b..c3ecb9b4 100644 --- a/db_connect.ts +++ b/db_connect.ts @@ -1,5 +1,5 @@ import mongoose, { ConnectOptions } from "mongoose"; -import logger from "./logger"; +import { logger } from "./logger"; // connect to database const credentials = process.env.DB_USER @@ -20,4 +20,4 @@ const connect = () => { return mongoose; }; -export default connect; +export { connect }; diff --git a/jobs/calculate_community_earnings.ts b/jobs/calculate_community_earnings.ts index 54e59b23..6d12fc92 100644 --- a/jobs/calculate_community_earnings.ts +++ b/jobs/calculate_community_earnings.ts @@ -1,5 +1,5 @@ import { Order, Community } from '../models'; -import logger from "../logger"; +import { logger } from "../logger"; const calculateEarnings = async () => { try { @@ -42,4 +42,4 @@ const calculateEarnings = async () => { } }; -export default calculateEarnings; +export { calculateEarnings }; diff --git a/jobs/cancel_orders.ts b/jobs/cancel_orders.ts index 0879a056..b574f4f4 100644 --- a/jobs/cancel_orders.ts +++ b/jobs/cancel_orders.ts @@ -4,7 +4,7 @@ import { User, Order } from "../models"; const { cancelShowHoldInvoice, cancelAddInvoice } = require('../bot/commands'); import * as messages from "../bot/messages"; import { getUserI18nContext, holdInvoiceExpirationInSecs } from '../util'; -import logger from "../logger"; +import { logger } from "../logger"; const cancelOrders = async (bot: Telegraf) => { try { @@ -99,4 +99,4 @@ const cancelOrders = async (bot: Telegraf) => { } }; -export default cancelOrders; +export { cancelOrders }; diff --git a/jobs/communities.ts b/jobs/communities.ts index c57b5d49..a18023f8 100644 --- a/jobs/communities.ts +++ b/jobs/communities.ts @@ -2,7 +2,7 @@ import { Telegraf } from "telegraf"; import { MainContext } from "../bot/start"; import { Order, Community } from '../models'; -import logger from "../logger"; +import { logger } from "../logger"; const deleteCommunity = async (bot: Telegraf) => { try { @@ -34,4 +34,4 @@ const deleteCommunity = async (bot: Telegraf) => { } }; -export default deleteCommunity; +export { deleteCommunity }; diff --git a/jobs/delete_published_orders.ts b/jobs/delete_published_orders.ts index 18c2134a..517d9d8b 100644 --- a/jobs/delete_published_orders.ts +++ b/jobs/delete_published_orders.ts @@ -3,7 +3,7 @@ import { MainContext } from "../bot/start"; import { Order } from '../models'; const { deleteOrderFromChannel } = require('../util'); -import logger from "../logger"; +import { logger } from "../logger"; const deleteOrders = async (bot: Telegraf) => { try { @@ -33,4 +33,4 @@ const deleteOrders = async (bot: Telegraf) => { } }; -export default deleteOrders; +export { deleteOrders }; diff --git a/jobs/index.ts b/jobs/index.ts index 281f16f6..f0279233 100644 --- a/jobs/index.ts +++ b/jobs/index.ts @@ -2,11 +2,11 @@ import { attemptPendingPayments, attemptCommunitiesPendingPayments, } from "./pending_payments"; -import cancelOrders from "./cancel_orders"; -import deleteOrders from "./delete_published_orders"; -import calculateEarnings from './calculate_community_earnings' -import deleteCommunity from './communities' -import nodeInfo from './node_info' +import { cancelOrders } from "./cancel_orders"; +import { deleteOrders } from "./delete_published_orders"; +import { calculateEarnings } from './calculate_community_earnings'; +import { deleteCommunity } from './communities'; +import { info as nodeInfo } from './node_info'; export { attemptPendingPayments, diff --git a/jobs/node_info.ts b/jobs/node_info.ts index 0caa7c5b..ccb16fe4 100644 --- a/jobs/node_info.ts +++ b/jobs/node_info.ts @@ -3,7 +3,7 @@ import { MainContext } from "../bot/start"; import { Config } from '../models'; const { getInfo } = require('../ln'); -import logger from "../logger"; +import { logger } from "../logger"; const info = async (bot: Telegraf) => { try { @@ -21,4 +21,4 @@ const info = async (bot: Telegraf) => { } }; -export default info; +export { info }; diff --git a/jobs/pending_payments.ts b/jobs/pending_payments.ts index 3cd8e295..aaa750be 100644 --- a/jobs/pending_payments.ts +++ b/jobs/pending_payments.ts @@ -1,6 +1,6 @@ import { PendingPayment, Order, User, Community } from '../models'; import * as messages from '../bot/messages'; -import logger from "../logger"; +import { logger } from "../logger"; import { Telegraf } from 'telegraf'; import { I18nContext } from '@grammyjs/i18n'; import { MainContext } from '../bot/start'; diff --git a/ln/index.ts b/ln/index.ts index 57372418..fc1c5f11 100644 --- a/ln/index.ts +++ b/ln/index.ts @@ -4,9 +4,9 @@ import { cancelHoldInvoice, getInvoice, } from './hold_invoice'; -import subscribeInvoice from './subscribe_invoice'; +import { subscribeInvoice } from './subscribe_invoice'; const subscribeProbe = require('./subscribe_probe'); -import resubscribeInvoices from './resubscribe_invoices'; +import { resubscribeInvoices } from './resubscribe_invoices'; const { payRequest, payToBuyer, isPendingPayment } = require('./pay_request'); import { getInfo } from './info'; diff --git a/ln/resubscribe_invoices.ts b/ln/resubscribe_invoices.ts index 33ae6e90..89d35485 100644 --- a/ln/resubscribe_invoices.ts +++ b/ln/resubscribe_invoices.ts @@ -4,7 +4,7 @@ import { getInvoices, GetInvoicesResult } from 'lightning'; import { lnd } from './connect'; const subscribeInvoice = require('./subscribe_invoice'); import { Order } from '../models'; -import logger from "../logger"; +import { logger } from "../logger"; const resubscribeInvoices = async (bot: Telegraf) => { try { @@ -36,4 +36,4 @@ const resubscribeInvoices = async (bot: Telegraf) => { } }; -export default resubscribeInvoices +export { resubscribeInvoices }; diff --git a/ln/subscribe_invoice.ts b/ln/subscribe_invoice.ts index 5485984e..9b40b675 100644 --- a/ln/subscribe_invoice.ts +++ b/ln/subscribe_invoice.ts @@ -127,4 +127,4 @@ const subscribeInvoice = async (bot: Telegraf, id: string, resub: b } }; -export default subscribeInvoice; +export { subscribeInvoice }; diff --git a/lnurl/lnurl-pay.ts b/lnurl/lnurl-pay.ts index 4ebc2e99..16ecf97d 100644 --- a/lnurl/lnurl-pay.ts +++ b/lnurl/lnurl-pay.ts @@ -1,5 +1,5 @@ import axios from 'axios'; -import logger from "../logger"; +import { logger } from "../logger"; // { // pr: String, // bech32-serialized lightning invoice diff --git a/logger.ts b/logger.ts index 37d0d3a8..ed341614 100644 --- a/logger.ts +++ b/logger.ts @@ -24,4 +24,4 @@ const logger = winston.createLogger({ }); -export default logger; +export { logger }; diff --git a/tests/bot_test.js b/tests/bot_test.js index 0feb9570..5a13934e 100644 --- a/tests/bot_test.js +++ b/tests/bot_test.js @@ -10,7 +10,7 @@ const ordersActions = require('../bot/ordersActions'); const testUser = require('./user'); const testOrder = require('./order'); const { getCurrenciesWithPrice } = require('../util'); -const mongoConnect = require('../db_connect').default; +const { connect: mongoConnect } = require('../db_connect'); mongoConnect();