mir/the-guard-bot
2
0
Fork 0
mirror of https://github.com/thedevs-network/the-guard-bot synced 2025-08-31 14:15:25 +00:00
Code Issues Releases Wiki Activity

Improve and consistently use escapeHtml

Browse Source
This commit is contained in:
GingerPlusPlus
2019-04-06 20:58:56 +02:00
parent 5b9cea8103
commit b83e8bf42f
5 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actions/ban.js
View File

@@ -2,7 +2,7 @@
const dedent = require('dedent-js'); const dedent = require('dedent-js');
const { displayUser, link } = require('../utils/tg'); const { escapeHtml, displayUser, link } = require('../utils/tg');
const { telegram } = require('../bot'); const { telegram } = require('../bot');
const { listGroups } = require('../stores/group'); const { listGroups } = require('../stores/group');
@@ -24,5 +24,5 @@ module.exports = async ({ admin, reason, userToBan }) => {
return dedent(` return dedent(`
🚫 ${link(admin)} <b>banned</b> ${displayUser(userToBan)} <b>for:</b> 🚫 ${link(admin)} <b>banned</b> ${displayUser(userToBan)} <b>for:</b>
${reason}`); ${escapeHtml(reason)}`);
}; };

6
actions/warn.js
View File

@@ -4,7 +4,7 @@ const dedent = require('dedent-js');
const ms = require('millisecond'); const ms = require('millisecond');
const { context } = require('../bot'); const { context } = require('../bot');
const { link } = require('../utils/tg'); const { escapeHtml, link } = require('../utils/tg');
const { const {
expireWarnsAfter = Infinity, expireWarnsAfter = Infinity,
numberOfWarnsToBan, numberOfWarnsToBan,
@@ -24,10 +24,12 @@ module.exports = async ({ admin, reason, userToWarn }) => {
const isLastWarn = ', <b>last warning!</b>' const isLastWarn = ', <b>last warning!</b>'
.repeat(recentWarns.length === numberOfWarnsToBan - 1); .repeat(recentWarns.length === numberOfWarnsToBan - 1);
const count = `${recentWarns.length}/${numberOfWarnsToBan}${isLastWarn}`;
const warnMessage = dedent(` const warnMessage = dedent(`
⚠️ ${link(admin)} <b>warned</b> ${link(userToWarn)} <b>for</b>: ⚠️ ${link(admin)} <b>warned</b> ${link(userToWarn)} <b>for</b>:
${reason} (${recentWarns.length}/${numberOfWarnsToBan}${isLastWarn})`); ${escapeHtml(reason)} (${count})`);
if (recentWarns.length >= numberOfWarnsToBan) { if (recentWarns.length >= numberOfWarnsToBan) {
await ban({ await ban({

4
handlers/commands/unwarn.js
View File

@@ -3,7 +3,7 @@
const { last } = require('ramda'); const { last } = require('ramda');
// Utils // Utils
const { link, scheduleDeletion } = require('../../utils/tg'); const { escapeHtml, link, scheduleDeletion } = require('../../utils/tg');
const { parse, strip } = require('../../utils/parse'); const { parse, strip } = require('../../utils/parse');
// Config // Config
@@ -72,7 +72,7 @@ const unwarnHandler = async ({ from, message, reply, telegram }) => {
return reply( return reply(
`❎ ${link(from)} <b>pardoned</b> ${link(userToUnwarn)} ` + `❎ ${link(from)} <b>pardoned</b> ${link(userToUnwarn)} ` +
`<b>for:</b>\n\n${lastWarn.reason || lastWarn}` + `<b>for:</b>\n\n${escapeHtml(lastWarn.reason || lastWarn)}` +
` (${allWarns.length - 1}/${numberOfWarnsToBan})`, ` (${allWarns.length - 1}/${numberOfWarnsToBan})`,
replyOptions replyOptions
); );

10
handlers/commands/user.js
View File

@@ -2,7 +2,7 @@
// Utils // Utils
const { parse, strip } = require('../../utils/parse'); const { parse, strip } = require('../../utils/parse');
const { scheduleDeletion } = require('../../utils/tg'); const { escapeHtml, scheduleDeletion } = require('../../utils/tg');
// Bot // Bot
const { replyOptions } = require('../../bot/options'); const { replyOptions } = require('../../bot/options');
@@ -40,18 +40,20 @@ const getWarnsHandler = async ({ from, message, reply }) => {
const { first_name, id, last_name, status, username, warns } = theUser; const { first_name, id, last_name, status, username, warns } = theUser;
const userName = `<b>Name:</b> <code>${first_name} ${last_name}</code>\n`; const userName = '<b>Name:</b> ' +
`<code>${escapeHtml(first_name)} ${escapeHtml(last_name)}</code>\n`;
const userId = `<b>ID:</b> <code>${id}</code>\n`; const userId = `<b>ID:</b> <code>${id}</code>\n`;
const userStatus = `<b>Status:</b> <code>${status}</code>\n`; const userStatus = `<b>Status:</b> <code>${status}</code>\n`;
const userUsername = username const userUsername = username
? `<b>Username:</b> @${username}\n` ? `<b>Username:</b> @${username}\n`
: ''; : '';
const banReason = theUser.ban_reason const banReason = theUser.ban_reason
? `\n🚫 <b>Ban reason:</b>\n<code>${theUser.ban_reason}</code>` ? '\n🚫 <b>Ban reason:</b>\n' +
`<code>${escapeHtml(theUser.ban_reason)}</code>`
: ''; : '';
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.reason || warn}`) .map((warn, i) => `${i + 1}. ${escapeHtml(warn.reason || warn)}`)
.join('\n') + '\n' .join('\n') + '\n'
: ''; : '';

3
utils/tg.js
View File

@@ -13,6 +13,9 @@ const isCommand = R.pipe(
); );
const escapeHtml = s => s const escapeHtml = s => s
.replace(/&/g, '&amp;')
.replace(/"/g, '&quot;')
.replace(/'/g, '&#39;')
.replace(/</g, '&lt;'); .replace(/</g, '&lt;');
const msgLink = msg => const msgLink = msg =>