Merge branch 'develop'

Author: wojpawlik

.gitignore

@@ -1,4 +1,5 @@
 node_modules
-data/*
+data/
 config.json
-.env
+.env
+.idea/

README.md

@@ -32,6 +32,7 @@ Command  | Role   | Description
 `/ban <reason>` | _Admin_ | Bans the user from groups.
 `/unban` | _Admin_ | Removes the user from ban list.
 `/staff` | _All_ | Shows a list of admins.
+`/link` | _All_ | Show the current group's link.
 `/groups` | _All_ | Show a list of groups which the bot is admin in.
 `/report` | _All_ | Reports the replied-to message to admins.
 
@@ -41,6 +42,8 @@ If used by reply, `/ban` and `/warn` remove the replied-to message.
 
 The bot is still in alpha phase so feel free to open issues and ask for a _feature_.
 
+[**Roadmap**](https://github.com/TheDevs-Network/the-guard-bot/projects/1)
+
 ---
 
 The Guard icon from [Entypo+](http://entypo.com/) by Daniel Bruce.

TODO.md

@@ -0,0 +1,24 @@
+'use strict';
+
+// DB
+const { isAdmin } = require('../../stores/user');
+const { addCommand } = require('../../stores/command');
+
+// Bot
+const { replyOptions } = require('../../bot/options');
+
+const addCommandHandler = async ({ chat, message, reply }) => {
+	const user = message.from;
+	if (chat.type !== 'private') {
+		return null;
+	}
+	if (!await isAdmin(user)) {
+		return reply('ℹ️ <b>Sorry, only admins access this command.</b>',
+			replyOptions);
+	}
+	await addCommand({ id: user.id });
+	return reply('Enter a name for the command.\n\nFor example: <b>rules</b>',
+		replyOptions);
+};
+
+module.exports = addCommandHandler;

handlers/commands/addCommand.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/ban.js

@@ -1,5 +1,8 @@
 'use strict';
 
+// DB
+const { listCommands } = require('../../stores/command');
+
 const commandReference = `\
 <b>Master commands</b>:
 <code>/admin</code> - Makes the user admin.
@@ -16,15 +19,30 @@ const commandReference = `\
 
 <b>Commands for everyone</b>:
 <code>/staff</code> - Shows a list of admins.
+<code>/link</code> - Show the current group's link.
 <code>/groups</code> - Show a list of groups which the bot is admin in.
 <code>/report</code> - Reports the replied-to message to admins.
 `;
 
-const commandReferenceHandler = ({ chat, replyWithHTML }) => {
+const actions = `\n
+/addcommand - to create custom commands.
+/removecommand <code>&lt;name&gt;</code> - to remove a custom command.`;
+
+const commandReferenceHandler = async ({ chat, replyWithHTML }) => {
 	if (chat.type !== 'private') {
 		return null;
 	}
-	return replyWithHTML(commandReference);
+	const customCommands = await listCommands();
+	const customCommandsText = customCommands.length
+		? '\n<b>Custom commands:</b>\n' +
+		customCommands
+			.filter(command => command.isActive)
+			.sort((a, b) => a.role < b.role)
+			.map(command => `[${command.role}] <code>/${command.name}</code>`)
+			.join('\n')
+		: '';
+
+	return replyWithHTML(commandReference + customCommandsText + actions);
 };
 
 module.exports = commandReferenceHandler;

handlers/commands/commands.js

@@ -3,6 +3,9 @@
 // Utils
 const { escapeHtml } = require('../../utils/tg');
 
+// Bot
+const bot = require('../../bot');
+
 // DB
 const { listGroups } = require('../../stores/group');
 
@@ -16,19 +19,23 @@ const entry = group => group.username
 	? `- @${group.username}`
 	: `- <a href="${group.link}">${escapeHtml(group.title)}</a>`;
 
-const groupsHandler = async ctx => {
+const groupsHandler = async ({ chat, replyWithHTML }) => {
 	if (config.groupsString) {
-		return ctx.replyWithHTML(config.groupsString);
+		return replyWithHTML(config.groupsString);
 	}
 
 	const groups = await listGroups();
 
 	const entries = groups.map(entry).join('\n');
 
-	return ctx.replyWithHTML(`🛠 <b>Groups I manage</b>:\n\n${entries}`, {
-		disable_web_page_preview: true,
-		reply_markup,
-	});
+	const { message_id } = await replyWithHTML(
+		`🛠 <b>Groups I manage</b>:\n\n${entries}`, {
+			disable_web_page_preview: true,
+			reply_markup,
+		});
+
+	return setTimeout(() =>
+		bot.telegram.deleteMessage(chat.id, message_id), 5 * 60 * 1000);
 
 };
 

handlers/commands/groups.js

@@ -0,0 +1,20 @@
+'use strict';
+
+// Bot
+const bot = require('../../bot');
+
+// DB
+const { managesGroup } = require('../../stores/group');
+
+const linkHandler = async ({ chat, replyWithHTML }) => {
+	const group = await managesGroup(chat);
+
+	const { message_id } = await replyWithHTML(
+		'ℹ️ <b>Group\'s link:</b>\n\n' +
+		`<a href="${group.link}">${group.title}</a>`
+	);
+	return setTimeout(() =>
+		bot.telegram.deleteMessage(chat.id, message_id), 5 * 60 * 1000);
+};
+
+module.exports = linkHandler;

handlers/commands/link.js

@@ -0,0 +1,52 @@
+'use strict';
+
+// Utils
+const { loadJSON } = require('../../utils/json');
+
+// Config
+const { masterID } = loadJSON('config.json');
+
+// DB
+const { isAdmin } = require('../../stores/user');
+const { getCommand, removeCommand } = require('../../stores/command');
+
+// Bot
+const { replyOptions } = require('../../bot/options');
+
+const removeCommandHandler = async ({ chat, message, reply }) => {
+	const user = message.from;
+	const { text } = message;
+	if (chat.type !== 'private') {
+		return null;
+	}
+	if (!await isAdmin(user)) {
+		return reply('ℹ️ <b>Sorry, only admins access this command.</b>',
+			replyOptions);
+	}
+	const [ , commandName ] = text.split(' ');
+	if (!commandName) {
+		return reply(
+			'Enter a command name to remove.\n\n' +
+			'For example:\n/removecommand <b>rules</b>',
+			replyOptions);
+	}
+
+	const command = await getCommand({ name: commandName });
+	if (!command) {
+		return reply('ℹ️ <b>Command couldn\'t be found.</b>',
+			replyOptions);
+	}
+
+	if (command.role === 'Master' && user.id !== masterID) {
+		return reply('ℹ️ <b>Sorry, only master can remove this command.</b>',
+			replyOptions);
+	}
+
+	await removeCommand({ name: commandName });
+	return reply(
+		`✅ <code>/${commandName}</code> ` +
+		'<b>has been removed successfully.</b>',
+		replyOptions);
+};
+
+module.exports = removeCommandHandler;

handlers/commands/removeCommand.js

@@ -37,7 +37,7 @@ const unwarnHandler = async ({ message, reply }) => {
 	return reply(
 		`❎ ${link(message.from)} <b>pardoned</b> ${link(userToUnwarn)} ` +
 		`<b>for:</b>\n\n${allWarns[allWarns.length - 1]}` +
-		`(${allWarns.length}/3)`,
+		`(${allWarns.length - 1}/3)`,
 		replyOptions);
 };