refactored middleware into their own handlers

Author: poeti8

handlers/middlewares/addedToGroup.js

@@ -14,7 +14,7 @@ const addedToGroupHandler = async (ctx, next) => {
 	const wasAdded = msg.new_chat_members.some(user =>
 		user.username === ctx.me);
 	if (wasAdded && ctx.from.id === masterID) {
-		admin(ctx.from);
+		await admin(ctx.from);
 		if (!await managesGroup(ctx.chat)) {
 			const link = await bot.telegram.exportChatInviteLink(ctx.chat.id);
 			ctx.chat.link = link ? link : '';

handlers/middlewares/middleware.js handlers/middlewares/kickBanned.jshandlers/middlewares/middleware.js renamed to handlers/middlewares/kickBanned.js

@@ -2,7 +2,7 @@
 
 // Utils
 const { link } = require('../../utils/tg');
-const { print, logError } = require('../../utils/log');
+const { logError } = require('../../utils/log');
 
 // Bot
 const bot = require('../../bot');
@@ -11,21 +11,7 @@ const { replyOptions } = require('../../bot/options');
 // DB
 const { isBanned } = require('../../stores/user');
 
-const middlewareHandler = async ({ chat, from, message, reply }, next) => {
-	process.env.NODE_ENV === 'development' && message && print(message);
-	if (
-		message &&
-		message.text &&
-		message.text[0] === '/' &&
-		message.text[1].match(/\w/) &&
-		chat.type !== 'private'
-	) {
-		try {
-			await bot.telegram.deleteMessage(chat.id, message.message_id);
-		} catch (err) {
-			logError(err);
-		}
-	}
+const kickbanned = async ({ chat, from, reply }, next) => {
 	const banned = await isBanned(from);
 	if (banned) {
 		return bot.telegram.kickChatMember(chat.id, from.id)
@@ -39,4 +25,4 @@ const middlewareHandler = async ({ chat, from, message, reply }, next) => {
 	return next();
 };
 
-module.exports = middlewareHandler;
+module.exports = kickbanned;

handlers/middlewares/removeCommands.js

@@ -0,0 +1,27 @@
+'use strict';
+
+// Utils
+const { print, logError } = require('../../utils/log');
+
+// Bot
+const bot = require('../../bot');
+
+// DB
+const middlewareHandler = async ({ chat, message }, next) => {
+	process.env.NODE_ENV === 'development' && message && print(message);
+	if (
+		message &&
+		message.text &&
+		/^\/\w+/.test(message.text) &&
+		chat.type !== 'private'
+	) {
+		try {
+			await bot.telegram.deleteMessage(chat.id, message.message_id);
+		} catch (err) {
+			logError(err);
+		}
+	}
+	return next();
+};
+
+module.exports = middlewareHandler;

index.js

@@ -13,7 +13,8 @@ bot.telegram.getMe().then((botInfo) => {
 
 // Middleware Handlers
 const leaveUnmanagedHandler = require('./handlers/middlewares/leaveUnmanaged');
-const middlewareHandler = require('./handlers/middlewares/middleware');
+const removeCommandsHandler = require('./handlers/middlewares/removeCommands');
+const kickBannedHandler = require('./handlers/middlewares/kickBanned');
 const addUserHandler = require('./handlers/middlewares/addUser');
 const removeLinksHandler = require('./handlers/middlewares/removeLinks');
 const checkUsernameHandler = require('./handlers/middlewares/checkUsername');
@@ -39,7 +40,8 @@ const helpHandler = require('./handlers/commands/help');
 
 bot.on('new_chat_members', addedToGroupHandler);
 bot.use(leaveUnmanagedHandler);
-bot.use(middlewareHandler);
+bot.use(removeCommandsHandler);
+bot.use(kickBannedHandler);
 bot.on('message', addUserHandler);
 bot.on('message', removeLinksHandler);
 bot.on('message', checkUsernameHandler);