Skip to content

Community administrators now can use checkorder and checkinvoice commands #732

New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Merged
grunch merged 5 commits into from
Mar 20, 2026
Merged

Community administrators now can use checkorder and checkinvoice commands #732

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
84b9379
Community administrators now can use checkorder and checkinvoice comm…
Luquitasjeffrey Feb 2, 2026
2610270
Code formatting
Luquitasjeffrey Feb 3, 2026
c44bbb1
Merge remote-tracking branch 'upstream/main' into issue703
Luquitasjeffrey Mar 19, 2026
0cfcde9
Address mostronator comment, added a check for checkorder and checkin…
Luquitasjeffrey Mar 19, 2026
9ca2320
Code formatting
Luquitasjeffrey Mar 19, 2026
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
66 changes: 39 additions & 27 deletions bot/start.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -579,7 +579,7 @@ const initialize = (
}
});

bot.command('checkorder', superAdminMiddleware, async (ctx: MainContext) => {
Comment thread
Luquitasjeffrey marked this conversation as resolved.
bot.command('checkorder', adminMiddleware, async (ctx: MainContext) => {
try {
const [orderId] = (await validateParams(ctx, 2, '\\<_order id_\\>'))!;
if (!orderId) return;
Expand All @@ -588,6 +588,14 @@ const initialize = (

if (order === null) return;

// If the user is a community admin but not a superadmin we need to check the communities match
if (
!ctx.admin.admin &&
String(order.community_id) !== String(ctx.admin.default_community_id)
) {
return await messages.notAuthorized(ctx, ctx.admin.tg_id);
}

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

Expand All @@ -597,35 +605,39 @@ const initialize = (
}
});

bot.command(
'checkinvoice',
superAdminMiddleware,
async (ctx: MainContext) => {
try {
const [orderId] = (await validateParams(ctx, 2, '\\<_order id_\\>'))!;
if (!orderId) return;
if (!(await validateObjectId(ctx, orderId))) return;
const order = await Order.findOne({ _id: orderId });

if (order === null) return;
if (!order.hash) return;
bot.command('checkinvoice', adminMiddleware, async (ctx: MainContext) => {
try {
const [orderId] = (await validateParams(ctx, 2, '\\<_order id_\\>'))!;
if (!orderId) return;
if (!(await validateObjectId(ctx, orderId))) return;
const order = await Order.findOne({ _id: orderId });

const invoice = await getInvoice({ hash: order.hash });
if (invoice === undefined) {
throw new Error('invoice is undefined');
}
if (order === null) return;
if (!order.hash) return;

// If the user is a community admin but not a superadmin we need to check the communities match
if (
!ctx.admin.admin &&
String(order.community_id) !== String(ctx.admin.default_community_id)
) {
return await messages.notAuthorized(ctx, ctx.admin.tg_id);
}

await messages.checkInvoiceMessage(
ctx,
invoice.is_confirmed,
invoice.is_canceled!,
invoice.is_held!,
);
} catch (error) {
logger.error(error);
const invoice = await getInvoice({ hash: order.hash });
if (invoice === undefined) {
throw new Error('invoice is undefined');
}
},
);

await messages.checkInvoiceMessage(
ctx,
invoice.is_confirmed,
invoice.is_canceled!,
invoice.is_held!,
);
} catch (error) {
logger.error(error);
}
});

bot.command('resubscribe', superAdminMiddleware, async (ctx: MainContext) => {
try {
Expand Down
Loading