mir/the-guard-bot
2
0
Fork 0
mirror of https://github.com/thedevs-network/the-guard-bot synced 2025-10-17 14:35:56 +00:00
Code Issues Releases Wiki Activity

added try...catch on some async/awaits

Browse Source
This commit is contained in:
Pouria Ezzati
2017-09-23 21:49:23 +03:30
parent 34f34420bf
commit d525b4a37b
8 changed files with 61 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
handlers/commands/admin.js
View File

@@ -3,6 +3,7 @@
// Utils
const { loadJSON } = require('../../utils/json');
const { link } = require('../../utils/tg');
const { logError } = require('../../utils/log');
// Config
const { masterID } = loadJSON('config.json');
@@ -25,7 +26,11 @@ const adminHandler = async ({ message, reply }) => {
return reply('Already admin');
}
try {
await admin(userToAdmin);
} catch (err) {
logError(process.env.DEBUG)(err);
}
return reply(`${link(userToAdmin)} is now <b>admin</b>.`, replyOptions);
};

9
handlers/commands/ban.js
View File

@@ -2,6 +2,7 @@
// Utils
const { link } = require('../utils/tg');
const { logError } = require('../../utils/log');
// Bot
const bot = require('../bot');
@@ -38,14 +39,22 @@ const banHandler = async ({ chat, message, reply, telegram }) => {
return reply('User is already banned.');
}
try {
await ban(userToBan, reason);
} catch (err) {
logError(process.env.DEBUG)(err);
}
const groups = await listGroups();
const bans = groups.map(group =>
telegram.kickChatMember(group.id, userToBan.id));
try {
await Promise.all(bans);
} catch (err) {
logError(process.env.DEBUG)(err);
}
return reply(`${link(userToBan)} has been <b>banned</b>.\n\n` +
`Reason: ${reason}`, replyOptions);

5
handlers/commands/nowarns.js
View File

@@ -2,6 +2,7 @@
// Utils
const { link } = require('../../utils/tg');
const { logError } = require('../../utils/log');
// Bot
const { replyOptions } = require('../../bot/options');
@@ -21,7 +22,11 @@ const nowarnsHandler = async ({ message, reply }) => {
const messageToUnwarn = message.reply_to_message;
const userToUnwarn = messageToUnwarn.from;
try {
await nowarns(userToUnwarn);
} catch (err) {
logError(process.env.DEBUG)(err);
}
return reply(
`${link(userToUnwarn)} was pardoned for all of their warnings.`,

5
handlers/commands/unadmin.js
View File

@@ -3,6 +3,7 @@
// Utils
const { loadJSON } = require('../../utils/json');
const { link } = require('../../utils/tg');
const { logError } = require('../../utils/log');
// Config
const { masterID } = loadJSON('config.json');
@@ -28,7 +29,11 @@ const unAdminHandler = async ({ message, reply }) => {
return reply(`${link(userToUnadmin)} is not admin.`, replyOptions);
}
try {
await unadmin(userToUnadmin);
} catch (err) {
logError(process.env.DEBUG)(err);
}
return reply(`${link(userToUnadmin)} is no longer admin.`, replyOptions);
};

9
handlers/commands/unban.js
View File

@@ -2,6 +2,7 @@
// Utils
const { link } = require('../../utils/tg');
const { logError } = require('../../utils/log');
// Bot
const { replyOptions } = require('../../bot/options');
@@ -31,9 +32,17 @@ const unbanHandler = async ({ message, reply, telegram }) => {
const unbans = groups.map(group =>
telegram.unbanChatMember(group.id, userToUnban.id));
try {
await Promise.all(unbans);
} catch (err) {
logError(process.env.DEBUG)(err);
}
try {
await unban(userToUnban);
} catch (err) {
logError(process.env.DEBUG)(err);
}
return reply(`${link(userToUnban)} has been unbanned.`, replyOptions);
};

3
handlers/middlewares/addedToGroup.js
View File

@@ -6,7 +6,8 @@ const { masterID } = require('../../config.json');
const addedToGroupHandler = (ctx, next) => {
const msg = ctx.message;
const wasAdded = msg.new_chat_members.some(user => user.username === ctx.me);
const wasAdded = msg.new_chat_members.some(user =>
user.username === ctx.me);
if (wasAdded && ctx.from.id === masterID) {
addGroup(ctx.chat);
ctx.reply('Ok, I\'ll help you manage this group from now.');

8
handlers/middlewares/leaveUnmanaged.js
View File

@@ -1,5 +1,8 @@
'use strict';
// Utils
const { logError } = require('../../utils/log');
const { managesGroup } = require('../../stores/groups');
const pkg = require('../../package.json');
@@ -34,7 +37,12 @@ const leaveUnmanagedHandler = async (ctx, next) => {
return next();
}
try {
await ctx.replyWithVideo(randomChoice(gifs), { caption, reply_markup });
} catch (err) {
logError(process.env.DEBUG)(err);
}
return ctx.telegram.leaveChat(ctx.chat.id);
};

8
handlers/middlewares/middleware.js
View File

@@ -15,7 +15,11 @@ const { isBanned } = require('../../stores/ban');
const middlewareHandler = async ({ chat, from, message, reply }, next) => {
process.env.DEBUG === 'true' && message && print(message);
if (message && message.from && !await isUser(message.from)) {
try {
await addUser(message.from);
} catch (err) {
logError(process.env.DEBUG)(err);
}
}
if (
message &&
@@ -23,7 +27,11 @@ const middlewareHandler = async ({ chat, from, message, reply }, next) => {
message.text[0] === '/' &&
message.text[1].match(/\w/)
) {
try {
await bot.telegram.deleteMessage(chat.id, message.message_id);
} catch (err) {
logError(process.env.DEBUG)(err);
}
}
const banned = await isBanned(from);
if (banned) {