Don't ban / warn in PM, don't ban / warn itself

Author: wojpawlik

handlers/commands/ban.js

@@ -12,7 +12,7 @@ const { replyOptions } = require('../../bot/options');
 const { listGroups } = require('../../stores/group');
 const { isAdmin, isBanned, ban } = require('../../stores/user');
 
-const banHandler = async ({ chat, message, reply, telegram }) => {
+const banHandler = async ({ chat, message, reply, telegram, me }) => {
 	if (!await isAdmin(message.from)) {
 		return null;
 	}
@@ -29,6 +29,10 @@ const banHandler = async ({ chat, message, reply, telegram }) => {
 			replyOptions);
 	}
 
+	if (message.chat.type === 'private' || userToBan.username === me) {
+		return null;
+	}
+
 	if (reason.length === 0) {
 		return reply('ℹ️ <b>Need a reason to ban.</b>', replyOptions);
 	}

handlers/commands/warn.js

@@ -15,7 +15,7 @@ const { replyOptions } = require('../../bot/options');
 // DB
 const { isAdmin, ban, getWarns, warn } = require('../../stores/user');
 
-const warnHandler = async ({ message, chat, reply }) => {
+const warnHandler = async ({ message, chat, reply, me }) => {
 	if (!await isAdmin(message.from)) {
 		return null;
 	}
@@ -31,6 +31,10 @@ const warnHandler = async ({ message, chat, reply }) => {
 			replyOptions);
 	}
 
+	if (message.chat.type === 'private' || userToWarn.username === me) {
+		return null;
+	}
+
 	const reason = message.text.split(' ').slice(1).join(' ').trim();
 
 	if (reason.length === 0) {