minor corrects

.env.example

@@ -3,13 +3,14 @@ PROD_BOT_TOKEN=
 # dev
 DEV_BOT_TOKEN=
 
-# bot's author telegram id
-BOT_AUTHOR_ID=
+# telegram id of bot admin
+BOT_ADMIN_ID=
 
-# pages url to scrape
+# scraping page urls
 TWITTER_PAGE_URL=
 INSTA_PAGE_URL=
 YOUTUBE_PAGE_URL=
+TIKTOK_PAGE_URL=
 
 # firebase config variables for analytics data collection
 FIREBASE_API_KEY=

ecosystem.config.js

@@ -1,7 +1,7 @@
 module.exports = {
 	apps: [
 		{
-			name: 'social-media-bot',
+			name: 'social-media-downloader-bot',
 			script: './dist/index.js',
 			instances: 1,
 			autorestart: true,

package.json

@@ -1,5 +1,5 @@
 {
-	"name": "insta-twitter-youtube-bot",
+	"name": "social-media-downloader-bot",
 	"version": "1.0.0",
 	"main": "./src/index.ts",
 	"author": "k.khamidov <khamidoff09@gmail.com>",
@@ -13,9 +13,9 @@
 		"format": "prettier --write ./src/*",
 
 		"process:start": "yarn build && npx pm2 start ecosystem.config.js",
-		"process:stop": "npx pm2 stop social-media-bot",
-		"process:delete": "npx pm2 delete social-media-bot",
-		"process:restart": "yarn build && npx pm2 restart social-media-bot",
+		"process:stop": "npx pm2 stop social-media-downloader-bot",
+		"process:delete": "npx pm2 delete social-media-downloader-bot",
+		"process:restart": "yarn build && npx pm2 restart social-media-downloader-bot",
 		"update": "git pull && yarn process:restart"
 	},
 	"dependencies": {

src/entities/storage/api/storageApi.ts

@@ -1,7 +1,7 @@
 /* eslint-disable no-console */
 import { doc, getDoc, updateDoc } from '@firebase/firestore';
 
-import { BOT_AUTHOR_ID, db } from '../../../shared/config';
+import { BOT_ADMIN_ID, db } from '../../../shared/config';
 import {
 	DatabaseEntities,
 	DatabaseUser,
@@ -22,7 +22,7 @@ export async function getUsers(
 		if (appType) return response[appType];
 		return response;
 	} catch (error) {
-		console.log(error, 'GETTING DB USERS FAILED');
+		console.error(error, 'GETTING DB USERS FAILED');
 	}
 }
 
@@ -36,7 +36,7 @@ export async function saveUser(
 	newUser: DatabaseUser,
 	appType: SocialMediaType
 ) {
-	if (newUser.id !== BOT_AUTHOR_ID) {
+	if (newUser.id !== BOT_ADMIN_ID) {
 		const usersRef = doc(db, 'users', 'list');
 		const updatedUsers = [...oldUsers, updatable(newUser)];
 		try {
@@ -45,7 +45,7 @@ export async function saveUser(
 			});
 			console.log('USER SAVED SUCCESSFULLY');
 		} catch (error) {
-			console.log(error, 'SAVING USER IN DB FAILED');
+			console.error(error, 'SAVING USER IN DB FAILED');
 		}
 	}
 };

src/entities/twitter/model/processTweetJson.ts

@@ -20,7 +20,7 @@ export const processTweetJson = (
 	const { quoted_status_result } = tweetJson.data!.tweetResult.result;
 	if (quoted_status_result?.result) {
 		const quotedTweet = processQuotedTweet(tweetJson, originalLink);
-		fullCaption += `\n\n<strong>↩️ Reply to </strong>${quotedTweet}`;
+		fullCaption += `\n\n<strong>↩️ Replying to </strong>${quotedTweet}`;
 	}
 
 	return {

src/features/onBotUp.ts

@@ -25,12 +25,12 @@ export const onBotUp = async () => {
 					);
 					await timeout(500);
 				} catch (error) {
-					console.log(error, 'here');
+					console.error(error, 'onBotUp error');
 				}
 			}
 			toggleBotUpFlag();
 		}
 	} catch (error) {
-		console.log(error, 'wakeUp error');
+		console.error(error, 'onBotUp error');
 	}
 };

src/features/storage/saveFeedback.ts

@@ -20,6 +20,6 @@ export const saveFeedback = async (feedback: Feedback) => {
 		});
 		console.log('FEEDBACK SAVED SUCCESSFULLY');
 	} catch (error) {
-		console.log(error, 'SAVING FEEDBACK FAILED');
+		console.error(error, 'SAVING FEEDBACK FAILED');
 	}
 };

src/features/storage/saveServiceFinisher.ts

@@ -21,6 +21,6 @@ export async function saveServiceFinisher(
 		const oldUsers = await getUsers(socialMediaType);
 		if (oldUsers) await saveUser(oldUsers, newUser, socialMediaType);
 	} catch (error) {
-		console.log(error, 'ERROR saveServiceFinish');
+		console.error(error, 'ERROR saveServiceFinish');
 	}
 }

src/features/storage/saveServiceInitiator.ts

@@ -21,6 +21,6 @@ export const saveServiceInitiator = async (
 		const oldUsers = await getUsers(socialMediaType);
 		if (oldUsers) await saveUser(oldUsers, newUser, socialMediaType);
 	} catch (error) {
-		console.log(error, 'ERROR saveServiceInitiator');
+		console.error(error, 'ERROR saveServiceInitiator');
 	}
 };

src/features/storage/toggleBotUpFlag.ts

@@ -7,6 +7,6 @@ export const toggleBotUpFlag = async () => {
 	try {
 		await updateDoc(usersRef, { socialBotUpFlag: true });
 	} catch (error) {
-		console.log(error, 'SAVING USER FAILED');
+		console.error(error, 'SAVING USER FAILED');
 	}
 };

src/index.ts

@@ -24,7 +24,7 @@ bot.use(i18n.middleware());
 bot.use(stage.middleware());
 
 bot.catch((error) => {
-	console.log(error, 'INDEX.TS');
+	console.error(error, 'INDEX.TS');
 });
 
 onBotUp();

src/scenes/tiktok/index.ts

@@ -59,7 +59,7 @@ tiktokScene.enter((ctx) => {
 						await ctx.reply(ctx.i18n.t('incorrectLink'));
 						break;
 					default:
-						console.log(error, 'ERROR');
+						console.error(error, 'ERROR');
 						await ctx.reply(ctx.i18n.t('smthWentWrong'));
 				}
 				throw new Error(error.message);

src/scenes/twitter/index.ts

@@ -60,7 +60,7 @@ twitterScene.enter(async (ctx) => {
 				},
 			});
 		} catch (error) {
-			console.log(error, 'error message');
+			console.error(error, 'error message');
 			await ctx.reply(ctx.i18n.t('smthWentWrong'));
 			if (error instanceof Error) throw new Error(error.message);
 		}

src/scenes/youtube/index.ts

@@ -51,7 +51,7 @@ youtubeScene.enter((ctx) => {
 				);
 			}
 		} catch (error) {
-			console.log(error);
+			console.error(error);
 			await ctx.reply(ctx.i18n.t('smthWentWrong'));
 			if (error instanceof Error) throw new Error(error.message);
 		}

src/shared/config/config.service.ts

@@ -21,11 +21,10 @@ export const BOT_TOKEN = isDevEnv
 	? getEnvVar('DEV_BOT_TOKEN')
 	: getEnvVar('PROD_BOT_TOKEN');
 
-/** bot's author telegram id */
-export const BOT_AUTHOR_ID = Number(getEnvVar('BOT_AUTHOR_ID'));
+/** Telegram id of bot admin */
 export const BOT_ADMIN_ID = Number(getEnvVar('BOT_ADMIN_ID'));
 
-/** Pages url to scrape */
+/** Scraping page urls */
 export const TWITTER_PAGE_URL = getEnvVar('TWITTER_PAGE_URL');
 export const INSTA_PAGE_URL = getEnvVar('INSTA_PAGE_URL');
 export const TIKTOK_PAGE_URL = getEnvVar('TIKTOK_PAGE_URL');

src/shared/notifyAdmin.ts

@@ -1,7 +1,7 @@
 import { User } from 'typegram';
 
 import { bot } from '../index';
-import { BOT_ADMIN_ID, BOT_AUTHOR_ID } from './config';
+import { BOT_ADMIN_ID } from './config';
 
 interface NotifyAdminFullArgs {
 	user?: User;
@@ -20,7 +20,7 @@ export const notifyAdmin = ({
 	if (user) {
 		const formattedUser = JSON.stringify(user, null, 2);
 		bot.telegram.sendMessage(
-			BOT_AUTHOR_ID,
+			BOT_ADMIN_ID,
 			`From: ${formattedUser}${formattedText}${formattedLink}`
 		);
 		return;

src/shared/utils/index.ts

@@ -24,7 +24,7 @@ export const retryGettingPage = async <T>(
 		try {
 			content = await Promise.race([timeout(timeoutNum), getPage(link)]);
 		} catch (error) {
-			console.log(error, 'puppeeter page preparing failed');
+			console.error(error, 'puppeeter page preparing failed');
 		}
 		attemptsCount++;
 	}