feat: forward reported msg to report chat

Author: MKRhere

handlers/commands/report.js

@@ -24,7 +24,8 @@ const reportHandler = async ctx => {
 	// Ignore monospaced reports
 	if (ctx.message.entities?.[0]?.type === 'code' && ctx.message.entities[0].offset === 0)
 		return null;
-	if (!ctx.message.reply_to_message) {
+	const reply = ctx.message.reply_to_message;
+	if (!reply) {
 		await ctx.deleteMessage();
 		return ctx.replyWithHTML(
 			'ℹ️ <b>Reply to the message you\'d like to report</b>',
@@ -34,19 +35,21 @@ const reportHandler = async ctx => {
 		.filter(isQualified)
 		.map(adminMention);
 	// eslint-disable-next-line max-len
-	const s = TgHtml.tag`❗️ <b>Message from ${link(ctx.message.reply_to_message.from)} was reported to the admins</b>.${TgHtml.join('', admins)}`;
+	const s = TgHtml.tag`❗️ <b>Message from ${link(reply.from)} was reported to the admins</b>.${TgHtml.join('', admins)}`;
 	const report = await ctx.replyWithHTML(s, {
-		reply_to_message_id: ctx.message.reply_to_message.message_id,
+		reply_to_message_id: reply.message_id,
 	});
 	if (chats.report) {
+		const msg = await ctx.telegram.forwardMessage(chats.report, ctx.chat.id, reply.message_id);
 		await ctx.deleteMessage();
 		await ctx.telegram.sendMessage(
 			chats.report,
 			TgHtml.tag`❗️ ${link(ctx.from)} reported <a href="${msgLink(
-				ctx.message.reply_to_message,
-			)}">a message</a> from ${link(ctx.message.reply_to_message.from)} in ${ctx.chat.title}!`,
+				reply,
+			)}">a message</a> from ${link(reply.from)} in ${ctx.chat.title}!`,
 			{
 				parse_mode: 'HTML',
+				reply_to_message_id: msg.message_id,
 				reply_markup: { inline_keyboard: [ [ {
 					text: '✔️ Handled',
 					callback_data: Cmd.stringify({

handlers/middlewares/reportHandled.ts

@@ -1,14 +1,19 @@
+import { CallbackQuery, Update } from "telegraf/types";
 import type { ExtendedContext } from "../../typings/context";
 
-export = (ctx: ExtendedContext) => {
+export = (ctx: ExtendedContext<Update.CallbackQueryUpdate<CallbackQuery.DataQuery>>) => {
 	if (ctx.from?.status !== "admin") {
-		return ctx.answerCbQuery("✋ Not permitted!", false, { cache_time: 600 });
+		return ctx.answerCbQuery("✋ Not permitted!", { cache_time: 600 });
 	}
 
 	const [, chatId, msgId] = ctx.match!;
 
 	return Promise.all([
+		// delete the report in the report chat
 		ctx.deleteMessage(),
+		// delete the forwarded contextual message in report chat
+		ctx.deleteMessage(ctx.callbackQuery.message?.reply_to_message?.message_id),
+		// delete the report in the actual chat
 		ctx.telegram.deleteMessage(+chatId, +msgId),
 	]);
 };

typings/context.d.ts

@@ -1,4 +1,4 @@
-import type { Convenience, Message, MessageId, User } from "telegraf/types";
+import type { Convenience, Message, Update, User } from "telegraf/types";
 import type { Context } from "telegraf";
 import type { TgHtml } from "../utils/html";
 
@@ -46,7 +46,7 @@ export interface ContextExtensions {
 	): Promise<Message>;
 }
 
-export type ExtendedContext = ContextExtensions &
-	Context & {
+export type ExtendedContext<U extends Update = Update> = ContextExtensions &
+	Context<U> & {
 		from?: DbUser;
 	};