mir/the-guard-bot
2
0
Fork 0
mirror of https://github.com/thedevs-network/the-guard-bot synced 2025-09-01 06:35:23 +00:00
Code Issues Releases Wiki Activity

Ignore queryString when checking if link is whitelisted, closes #73

Browse Source
This commit is contained in:
GingerPlusPlus
2018-06-01 19:57:26 +02:00
parent 0462f8330e
commit c7771ff262
1 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
handlers/middlewares/checkLinks.js
View File

@@ -29,7 +29,11 @@ const normalizeTme = R.replace(
: `https://t.me/${username.toLowerCase()}${rest || ''}` : `https://t.me/${username.toLowerCase()}${rest || ''}`
); );
const customWhitelist = new Set(excludeLinks.map(normalizeTme)); const stripQuery = s => s.split('?', 1)[0];
const customWhitelist = new Set(excludeLinks
.map(normalizeTme)
.map(stripQuery));
const Action = taggedSum('Action', { const Action = taggedSum('Action', {
Nothing: [], Nothing: [],
@@ -85,7 +89,9 @@ const dh = {
nothing: R.always(Action.Nothing), nothing: R.always(Action.Nothing),
tme: async url => { tme: async url => {
if (url.pathname === '/') return Action.Nothing; if (url.pathname === '/') return Action.Nothing;
if (url.pathname.toLowerCase().startsWith('/addstickers/')) return Action.Nothing; if (url.pathname.toLowerCase().startsWith('/addstickers/')) {
return Action.Nothing;
}
if (url.searchParams.has('start')) return Action.Warn('Bot reflink'); if (url.searchParams.has('start')) return Action.Warn('Bot reflink');
if (await managesGroup({ link: url.toString() })) return Action.Nothing; if (await managesGroup({ link: url.toString() })) return Action.Nothing;
const [ , username ] = R.match(/^\/(\w+)(?:\/\d*)?$/, url.pathname); const [ , username ] = R.match(/^\/(\w+)(?:\/\d*)?$/, url.pathname);
@@ -104,7 +110,7 @@ const domainHandlers = new Map([
[ 'your-sweet-dating.com', dh.blacklistedDomain ], [ 'your-sweet-dating.com', dh.blacklistedDomain ],
]); ]);
const isWhitelisted = (url) => customWhitelist.has(url.toString()); const isWhitelisted = (url) => customWhitelist.has(stripQuery(url.toString()));
class CodeError extends Error { class CodeError extends Error {
constructor(code) { constructor(code) {