fix: ban/warn delegate deleteMsg to ctx.{ban|warn}

Author: MKRhere

handlers/commands/ban.js

@@ -52,11 +52,6 @@ const banHandler = async (ctx) => {
 		return ctx.replyWithHTML('ℹ️ <b>Can\'t ban other admins.</b>');
 	}
 
-	if (ctx.message.reply_to_message) {
-		ctx.deleteMessage(ctx.message.reply_to_message.message_id)
-			.catch(() => null);
-	}
-
 	if (!flags.has('amend') && userToBan.status === 'banned') {
 		return ctx.replyWithHTML(
 			html`🚫 ${displayUser(userToBan)} <b>is already banned.</b>`,
@@ -67,6 +62,7 @@ const banHandler = async (ctx) => {
 		admin: ctx.from,
 		reason: '[' + ctx.chat.title + '] ' + await substom(reason),
 		userToBan,
+		msg: ctx.message.reply_to_message
 	});
 };
 

handlers/commands/report.js

@@ -27,7 +27,7 @@ const reportHandler = async ctx => {
 	if (!ctx.message.reply_to_message) {
 		await ctx.deleteMessage();
 		return ctx.replyWithHTML(
-			'ℹ️ <b>Reply to message you\'d like to report</b>',
+			'ℹ️ <b>Reply to the message you\'d like to report</b>',
 		).then(scheduleDeletion());
 	}
 	const admins = (await ctx.getChatAdministrators())

handlers/commands/warn.js

@@ -45,17 +45,13 @@ const warnHandler = async (ctx) => {
 			.then(scheduleDeletion());
 	}
 
-	if (ctx.message.reply_to_message) {
-		ctx.deleteMessage(ctx.message.reply_to_message.message_id)
-			.catch(() => null);
-	}
-
 	return ctx.warn({
 		admin: ctx.from,
 		amend: flags.has('amend'),
 		reason: '[' + ctx.chat.title + '] ' + await substom(reason),
 		userToWarn,
 		mode: 'manual',
+		msg: ctx.message.reply_to_message,
 	});
 };