fix multiple requests processing issue

src/entities/twitter/api/twitterApi.ts

@@ -5,7 +5,9 @@ import { TweetJson } from '../model';
 
 const API_JSON_DATA = 'https://twitter.com/i/api/graphql';
 
-export const getPage = async (twitterLink: string): Promise<TweetJson> => {
+export const getPage = async (
+	twitterLink: string
+): Promise<TweetJson | undefined> => {
 	try {
 		const browser = await puppeteer.launch({
 			executablePath: puppeteerExecutablePath,

src/features/bot/index.ts

@@ -0,0 +1 @@
+export * from './processMessages';

src/features/bot/processMessages.ts

@@ -0,0 +1,33 @@
+import { IContextBot } from '../../shared/config';
+
+export const addMsgToRemoveList = (messageId: number, ctx: IContextBot) => {
+	const user = ctx.from!;
+	if (!ctx.session.usersList) {
+		ctx.session.usersList = [{ ...user, messagesToRemove: [messageId] }];
+		return;
+	}
+
+	const oldU = ctx.session.usersList.find((u) => u.id === user.id);
+	if (oldU) {
+		oldU.messagesToRemove.push(messageId);
+	}
+};
+
+const getMsgToRemoveList = (ctx: IContextBot) => {
+	const msgToRemoveList = ctx.session.usersList?.find(
+		(u) => u.id === ctx.from?.id
+	)?.messagesToRemove;
+	return msgToRemoveList ?? [];
+};
+
+export const removeTempMessages = (ctx: IContextBot) => {
+	const msgIdList = getMsgToRemoveList(ctx);
+	const chatId = ctx.chat?.id;
+	if (msgIdList.length > 0 && chatId) {
+		for (const msgId of msgIdList) {
+			ctx.telegram
+				.deleteMessage(chatId, msgId)
+				.catch((error) => console.error(error));
+		}
+	}
+};

src/features/index.ts

@@ -1,3 +1 @@
 export { onBotUp } from './onBotUp';
-export { onServiceFinish } from './onServiceFinish';
-export { onServiceInit } from './onServiceInit';

src/features/onBotUp.ts

@@ -8,19 +8,19 @@ export const onBotUp = async () => {
 	try {
 		const dbUsers = await getUsers();
 		await timeout(500);
-		if (dbUsers && !dbUsers?.socialBotUpFlag) {
+		if (dbUsers && !dbUsers.socialBotUpFlag) {
 			const users = [
-				...dbUsers?.insta,
-				...dbUsers?.twitter,
-				...dbUsers?.tiktok,
-				...dbUsers?.you,
+				...dbUsers.insta,
+				...dbUsers.twitter,
+				...dbUsers.tiktok,
+				...dbUsers.you,
 			].filter((v, i, a) => a.findIndex((v2) => v2.id === v.id) === i); // unique users only;
 
 			for (const user of users) {
 				try {
 					await bot.telegram.sendMessage(
 						user.id as number,
-						i18n.t(user.language_code ?? 'en', 'botWokeUp'),
+						i18n.t(user.language_code ?? 'en', 'botUpText'),
 						{ parse_mode: 'Markdown' }
 					);
 					await timeout(500);

src/features/scenes/index.ts

@@ -0,0 +1,2 @@
+export { onServiceFinish } from './onServiceFinish';
+export { onServiceInit } from './onServiceInit';

src/features/onServiceFinish.ts → src/features/scenes/onServiceFinish.ts

@@ -1,7 +1,8 @@
-import { SocialMediaType } from '../entities/storage';
-import { BOT_ADMIN_ID, IContextBot } from '../shared/config';
-import { notifyAdmin } from '../shared/notifyAdmin';
-import { saveServiceFinisher } from './storage';
+import { SocialMediaType } from '../../entities/storage';
+import { BOT_ADMIN_ID, IContextBot } from '../../shared/config';
+import { notifyAdmin } from '../../shared/notifyAdmin';
+import { removeTempMessages } from '../bot';
+import { saveServiceFinisher } from '../storage';
 
 interface OnServiceInitArgs {
 	ctx: IContextBot;
@@ -30,4 +31,6 @@ export const onServiceFinish = ({
 			saveServiceFinisher(user, socialMediaType);
 		}
 	}
+	ctx.scene.leave();
+	removeTempMessages(ctx);
 };

src/features/onServiceInit.ts → src/features/scenes/onServiceInit.ts

@@ -1,7 +1,7 @@
-import { SocialMediaType } from '../entities/storage';
-import { BOT_ADMIN_ID, IContextBot } from '../shared/config';
-import { notifyAdmin } from '../shared/notifyAdmin';
-import { saveServiceInitiator } from './storage';
+import { SocialMediaType } from '../../entities/storage';
+import { BOT_ADMIN_ID, IContextBot } from '../../shared/config';
+import { notifyAdmin } from '../../shared/notifyAdmin';
+import { saveServiceInitiator } from '../storage';
 
 interface OnServiceInitArgs {
 	ctx: IContextBot;

src/getScenesData.ts

@@ -12,22 +12,18 @@ export const getScenesData = () => {
 	return [
 		{
 			urls: YOUTUBE_URL,
-			reply: 'preparingVideo',
 			scene: youtubeScene.id,
 		},
 		{
 			urls: [TWITTER_URL],
-			reply: 'preparingLink',
 			scene: twitterScene.id,
 		},
 		{
 			urls: [INSTAGRAM_URL],
-			reply: 'preparingLink',
 			scene: instagramScene.id,
 		},
 		{
 			urls: [TIKTOK_URL],
-			reply: 'preparingVideo',
 			scene: tiktokScene.id,
 		},
 	];

src/index.ts

@@ -1,6 +1,7 @@
 import { Scenes, session, Telegraf } from 'telegraf';
 
-import { onBotUp } from './features';
+import { addMsgToRemoveList } from './features/bot';
+// import { onBotUp } from './features';
 import { getScenesData } from './getScenesData';
 import { feedbackScene } from './scenes/feedback';
 import { instagramScene } from './scenes/instagram';
@@ -27,11 +28,7 @@ bot.catch((error) => {
 	console.error(error, 'INDEX.TS');
 });
 
-onBotUp();
-
-bot.start(async (ctx) => {
-	await ctx.reply(ctx.i18n.t('start', { userId: ctx.from.id }));
-});
+// onBotUp();
 
 const lang = {
 	ru: '🇷🇺 Язык изменен на русский!',
@@ -52,6 +49,24 @@ bot.command('feedback', async (ctx) => {
 	await ctx.scene.enter(feedbackScene.id);
 });
 
+bot.use(async (ctx, next) => {
+	/** While the user is in a certain scene,
+	 * new commands are not processed */
+	const isStarted = ctx.state.isStarted;
+	const isRunning = ctx.scene.current;
+
+	if (!isStarted && isRunning) {
+		const { message_id } = await ctx.reply(ctx.i18n.t('pleaseWait'));
+		addMsgToRemoveList(message_id, ctx);
+		return;
+	}
+	return next();
+});
+
+bot.start(async (ctx) => {
+	await ctx.reply(ctx.i18n.t('start', { userId: ctx.from.id }));
+});
+
 bot.on('message', async (ctx) => {
 	const handleMessage = async () => {
 		if ('text' in ctx.message) {
@@ -62,8 +77,12 @@ bot.on('message', async (ctx) => {
 				urls.some((url) => link.includes(url))
 			);
 			if (selectedAction) {
-				const { scene, reply } = selectedAction;
-				await ctx.reply(ctx.i18n.t(reply));
+				ctx.state.isStarted = true;
+				const { scene } = selectedAction;
+				const { message_id } = await ctx.reply(
+					ctx.i18n.t('processingLink')
+				);
+				addMsgToRemoveList(message_id, ctx);
 				await ctx.scene.enter(scene);
 			} else await ctx.reply(ctx.i18n.t('invalidLink'));
 		}

src/scenes/instagram/index.ts

@@ -1,12 +1,12 @@
 import { Scenes } from 'telegraf';
 
 import { getPage, parsePage } from '../../entities/instagram';
-import { onServiceFinish, onServiceInit } from '../../features';
 import {
 	sendFewVideos,
 	sendManyFiles,
 	sendSingleFile,
 } from '../../features/instagram';
+import { onServiceFinish, onServiceInit } from '../../features/scenes';
 import { IContextBot } from '../../shared/config';
 
 export const instagramScene = new Scenes.BaseScene<IContextBot>(

src/scenes/tiktok/index.ts

@@ -1,7 +1,7 @@
 import { Scenes } from 'telegraf';
 
 import { getPage, parsePage } from '../../entities/tiktok';
-import { onServiceFinish, onServiceInit } from '../../features';
+import { onServiceFinish, onServiceInit } from '../../features/scenes';
 import { IContextBot } from '../../shared/config';
 import { calcLinkSize, retryGettingPage } from '../../shared/utils';
 

src/scenes/twitter/index.ts

@@ -5,7 +5,7 @@ import {
 	getPage,
 	processTweetJson,
 } from '../../entities/twitter';
-import { onServiceFinish, onServiceInit } from '../../features';
+import { onServiceFinish, onServiceInit } from '../../features/scenes';
 import { IContextBot } from '../../shared/config';
 
 const ACTION_ID = 'action';

src/scenes/youtube/index.ts

@@ -5,7 +5,7 @@ import {
 	getPage,
 	parsePage,
 } from '../../entities/youtube';
-import { onServiceFinish, onServiceInit } from '../../features';
+import { onServiceFinish, onServiceInit } from '../../features/scenes';
 import { IContextBot } from '../../shared/config';
 import { retryGettingPage } from '../../shared/utils';
 

src/shared/config/context.interface.ts

@@ -1,11 +1,12 @@
 import { Context, Scenes } from 'telegraf';
+import { User } from 'typegram';
 
-export interface UserSessionData {
-	userId: number;
+export interface UserSession extends User {
+	messagesToRemove: number[];
 }
 
 interface SceneSession extends Scenes.SceneSession {
-	data: UserSessionData[];
+	usersList: UserSession[] | undefined;
 }
 
 export interface IContextBot extends Context {

src/shared/config/locales/en.json

@@ -1,9 +1,9 @@
 {
 	"//start_command": "",
 	"start": "🔗 Please send the link",
-	"preparingVideo": "⏳ Preparing the video, it will take no more than a minute",
-	"preparingLink": "⏳ Processing the link, it will take no more than a minute",
+	"processingLink": "⏳ Processing the link, it will take no more than a minute",
 	"invalidLink": "🚫 Please send a valid link.",
+	"pleaseWait": "⚡️ Your request is being processed\n⌛️ Please be patient",
 
 	"//insta_scene": "",
 	"downloadAll": "📥 Download all",
@@ -36,6 +36,7 @@
 	"uploadingMedia": "📤 Uploading to Telegram...",
 	"uploadingVideo": "📤 Uploading the video to Telegram...",
 	"savedByBot": "📤 Saved by: @insta_twitter_youtube_bot",
-	"botWokeUpTechIssues": "Hey! 👋\nTechnical issues have been resolved 🛠✅\nYou can use the bot again 🚀",
-	"botWokeUp": "⚡️ ***Update*** ⚡️\n\n💡 Added support for ***TikTok links!***\n🛠 Additionally, minor bugs with Twitter links have been fixed. You can try re-uploading the links that had errors"
+
+	"botUpTechIssues": "Hey! 👋\nTechnical issues have been resolved 🛠✅\nYou can use the bot again 🚀",
+	"botUpText": "⚡️ ***Update*** ⚡️\n\n💡 Added support for ***TikTok links!***\n🛠 Additionally, minor bugs with Twitter links have been fixed. You can try re-uploading the links that had errors"
 }

src/shared/config/locales/ru.json

@@ -1,9 +1,9 @@
 {
 	"//start-command": "",
 	"start": "🔗 Отправьте ссылку",
-	"preparingVideo": "⏳ Подготавливаем видео, это займёт не больше минуты",
-	"preparingLink": "⏳ Обработка ссылки, это займёт не больше минуты",
-	"invalidLink": "🚫 Отправьте корректную ссылку.",
+	"processingLink": "⏳ Обработываем ссылку, это займёт не больше минуты",
+	"pleaseWait": "⚡️ Ваш запрос обрабатывается\n⌛️ Пожалуйста, подождите",
+	"invalidLink": "🚫 Отправьте корректную ссылку",
 
 	"//insta-scene": "",
 	"downloadAll": "📥 Скачать все",
@@ -35,6 +35,6 @@
 	"uploadingVideo": "📤 Загружаем видео в телеграм...",
 	"savedByBot": "📤 Загружено при помощи: @insta_twitter_youtube_bot",
 	"chooseQuality": "🎥 Выберите разрешение:",
-	"botWokeUpTechIssues": "Привет! 👋\nТехнические неполадки разрешены 🛠✅\nМожете вновь пользоваться ботом 🚀",
-	"botWokeUp": "⚡️ ***Обновление*** ⚡️\n\n💡 Теперь поддерживаются ***ссылки с TikTok***!\n🛠 Также исправлены незначительные баги со ссылками с twitter, можете попробовать загрузить заново ссылки с ошибками"
+	"botUpTechIssues": "Привет! 👋\nТехнические неполадки разрешены 🛠✅\nМожете вновь пользоваться ботом 🚀",
+	"botUpText": "⚡️ ***Обновление*** ⚡️\n\n💡 Теперь поддерживаются ***ссылки с TikTok***!\n🛠 Также исправлены незначительные баги со ссылками с twitter, можете попробовать загрузить заново ссылки с ошибками"
 }