mir/the-guard-bot
2
0
Fork 0
mirror of https://github.com/thedevs-network/the-guard-bot synced 2025-08-30 13:47:54 +00:00
Code Issues Releases Wiki Activity

Change warn schema to array of objects (#47)

Browse Source
This commit is contained in:
GingerPlusPlus 2018-04-18 21:47:35 +02:00
parent 47d33ad025
commit 53b37e9dfa
3 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
actions/warn.js
View File

@ -10,7 +10,10 @@ const ban = require('./ban');
module.exports = async ({ admin, userToWarn, reason }) => { module.exports = async ({ admin, userToWarn, reason }) => {
const { warns } = await warn(userToWarn, reason); const by_id = admin.id;
const date = new Date();
const { warns } = await warn(userToWarn, { by_id, date, reason });
const isLastWarn = ', <b>last warning!</b>' const isLastWarn = ', <b>last warning!</b>'
.repeat(warns.length === numberOfWarnsToBan - 1); .repeat(warns.length === numberOfWarnsToBan - 1);

6
handlers/commands/unwarn.js
View File

@ -1,5 +1,7 @@
'use strict'; 'use strict';
const { last } = require('ramda');
// Utils // Utils
const { link, scheduleDeletion } = require('../../utils/tg'); const { link, scheduleDeletion } = require('../../utils/tg');
@ -63,9 +65,11 @@ const unwarnHandler = async ({ message, reply, state, telegram }) => {
// (it's an expected, non-critical failure) // (it's an expected, non-critical failure)
} }
const lastWarn = last(allWarns);
return reply( return reply(
`❎ ${link(user)} <b>pardoned</b> ${link(userToUnwarn)} ` + `❎ ${link(user)} <b>pardoned</b> ${link(userToUnwarn)} ` +
`<b>for:</b>\n\n${allWarns[allWarns.length - 1]}` + `<b>for:</b>\n\n${lastWarn.reason || lastWarn}` +
` (${allWarns.length - 1}/${numberOfWarnsToBan})`, ` (${allWarns.length - 1}/${numberOfWarnsToBan})`,
replyOptions replyOptions
); );

3
handlers/commands/user.js
View File

@ -34,7 +34,7 @@ const getWarnsHandler = async ({ message, reply, state }) => {
: ''; : '';
const userWarns = warns.length const userWarns = warns.length
? '\n<b>⚠️ Warns:</b>\n' + warns ? '\n<b>⚠️ Warns:</b>\n' + warns
.map((warn, i) => `${i + 1}. ${warn}`) .map((warn, i) => `${i + 1}. ${warn.reason || warn}`)
.join('\n') + '\n' .join('\n') + '\n'
: ''; : '';
@ -50,4 +50,3 @@ const getWarnsHandler = async ({ message, reply, state }) => {
}; };
module.exports = getWarnsHandler; module.exports = getWarnsHandler;