|
@@ -496,7 +496,7 @@ function cmd_test(lang, msg, args, line) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
var ping = ( then - now ) + 'ms';
|
|
var ping = ( then - now ) + 'ms';
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !( body instanceof Object ) ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !( body instanceof Object ) ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
ping += ' <:unknown_wiki:505887262077353984>';
|
|
ping += ' <:unknown_wiki:505887262077353984>';
|
|
}
|
|
}
|
|
@@ -637,7 +637,7 @@ function check_wiki(lang, msg, title, wiki, cmd, reaction, spoiler = '', queryst
|
|
}, function( error, response, body ) {
|
|
}, function( error, response, body ) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -964,7 +964,7 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
|
|
}, function( error, response, body ) {
|
|
}, function( error, response, body ) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.blocks ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.blocks ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -1016,7 +1016,7 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
|
|
if ( Date.parse(blockexpiry) > Date.now() ) isBlocked = true;
|
|
if ( Date.parse(blockexpiry) > Date.now() ) isBlocked = true;
|
|
blockexpiry = new Date(blockexpiry).toLocaleString(lang.dateformat, timeoptions);
|
|
blockexpiry = new Date(blockexpiry).toLocaleString(lang.dateformat, timeoptions);
|
|
}
|
|
}
|
|
- if ( isBlocked ) return [lang.user.block.header.replaceSave( '%s', block.user ), lang.user.block[( block.reason ? 'text' : 'noreason' )].replaceSave( '%1$s', blockedtimestamp ).replaceSave( '%2$s', blockexpiry ).replaceSave( '%3$s', '[[User:' + block.by + '|' + block.by + ']]' ).replaceSave( '%4$s', block.reason )];
|
|
|
|
|
|
+ if ( isBlocked ) return [lang.user.block.header.replaceSave( '%s', block.user ).escapeFormatting(), lang.user.block[( block.reason ? 'text' : 'noreason' )].replaceSave( '%1$s', blockedtimestamp ).replaceSave( '%2$s', blockexpiry ).replaceSave( '%3$s', '[[User:' + block.by + '|' + block.by + ']]' ).replaceSave( '%4$s', block.reason )];
|
|
} ).filter( block => block !== undefined );
|
|
} ).filter( block => block !== undefined );
|
|
if ( username.includes( '/' ) ) {
|
|
if ( username.includes( '/' ) ) {
|
|
var rangeprefix = username;
|
|
var rangeprefix = username;
|
|
@@ -1082,7 +1082,7 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
|
|
}, function( error, response, body ) {
|
|
}, function( error, response, body ) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.users[0] ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.users[0] ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -1156,13 +1156,13 @@ function cmd_user(lang, msg, namespace, username, wiki, linksuffix, querypage, c
|
|
blockexpiry = lang.user.block.until_infinity;
|
|
blockexpiry = lang.user.block.until_infinity;
|
|
isBlocked = true;
|
|
isBlocked = true;
|
|
} else if ( blockexpiry ) {
|
|
} else if ( blockexpiry ) {
|
|
- var blockexpirydate = blockexpiry.replace(/(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2,3})/, '$1-$2-$3T$4:$5:$6Z');
|
|
|
|
|
|
+ var blockexpirydate = blockexpiry.replace( /(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2,3})/, '$1-$2-$3T$4:$5:$6Z' );
|
|
blockexpiry = new Date(blockexpirydate).toLocaleString(lang.dateformat, timeoptions);
|
|
blockexpiry = new Date(blockexpirydate).toLocaleString(lang.dateformat, timeoptions);
|
|
if ( Date.parse(blockexpirydate) > Date.now() ) isBlocked = true;
|
|
if ( Date.parse(blockexpirydate) > Date.now() ) isBlocked = true;
|
|
}
|
|
}
|
|
var blockedby = '[[User:' + body.query.users[0].blockedby + '|' + body.query.users[0].blockedby + ']]';
|
|
var blockedby = '[[User:' + body.query.users[0].blockedby + '|' + body.query.users[0].blockedby + ']]';
|
|
var blockreason = body.query.users[0].blockreason;
|
|
var blockreason = body.query.users[0].blockreason;
|
|
- var block = [lang.user.block.header.replaceSave( '%s', username ), lang.user.block[( blockreason ? 'text' : 'noreason' )].replaceSave( '%1$s', blockedtimestamp ).replaceSave( '%2$s', blockexpiry ).replaceSave( '%3$s', blockedby ).replaceSave( '%4$s', blockreason )];
|
|
|
|
|
|
+ var block = [lang.user.block.header.replaceSave( '%s', username ).escapeFormatting(), lang.user.block[( blockreason ? 'text' : 'noreason' )].replaceSave( '%1$s', blockedtimestamp ).replaceSave( '%2$s', blockexpiry ).replaceSave( '%3$s', blockedby ).replaceSave( '%4$s', blockreason )];
|
|
|
|
|
|
var pagelink = wiki.toLink() + namespace + username.toTitle() + linksuffix;
|
|
var pagelink = wiki.toLink() + namespace + username.toTitle() + linksuffix;
|
|
if ( msg.showEmbed() ) {
|
|
if ( msg.showEmbed() ) {
|
|
@@ -1284,7 +1284,7 @@ function cmd_diff(lang, msg, args, wiki, reaction, spoiler, embed) {
|
|
noerror = false;
|
|
noerror = false;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -1416,7 +1416,7 @@ function cmd_diffsend(lang, msg, args, wiki, reaction, spoiler, compare) {
|
|
}, function( error, response, body ) {
|
|
}, function( error, response, body ) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -1643,7 +1643,7 @@ function cmd_random(lang, msg, wiki, reaction, spoiler) {
|
|
}, function( error, response, body ) {
|
|
}, function( error, response, body ) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.pages ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.pages ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -1690,7 +1690,7 @@ function cmd_overview(lang, msg, wiki, reaction, spoiler) {
|
|
}, function( error, response, body ) {
|
|
}, function( error, response, body ) {
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( body && body.warnings ) log_warn(body.warnings);
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.pages ) {
|
|
if ( error || !response || response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.pages ) {
|
|
- if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' ) {
|
|
|
|
|
|
+ if ( response && response.request && response.request.uri && response.request.uri.href === 'https://www.gamepedia.com/' || response.statusCode === 410 ) {
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
console.log( '- This wiki doesn\'t exist!' );
|
|
msg.reactEmoji('nowiki');
|
|
msg.reactEmoji('nowiki');
|
|
}
|
|
}
|
|
@@ -2191,7 +2191,7 @@ Discord.Message.prototype.allowDelete = function(author) {
|
|
};
|
|
};
|
|
|
|
|
|
String.prototype.hasPrefix = function(flags = '') {
|
|
String.prototype.hasPrefix = function(flags = '') {
|
|
- return RegExp( '^' + process.env.prefix + '(?: |$)', flags ).test(this.replace(/\u200b/g, '').toLowerCase());
|
|
|
|
|
|
+ return RegExp( '^' + process.env.prefix + '(?: |$)', flags ).test(this.replace( /\u200b/g, '' ).toLowerCase());
|
|
};
|
|
};
|
|
|
|
|
|
client.on( 'message', msg => {
|
|
client.on( 'message', msg => {
|
|
@@ -2227,7 +2227,7 @@ client.on( 'message', msg => {
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
var count = 0;
|
|
var count = 0;
|
|
- msg.cleanContent.replace(/\u200b/g, '').split('\n').forEach( function(line) {
|
|
|
|
|
|
+ msg.cleanContent.replace( /\u200b/g, '' ).split('\n').forEach( function(line) {
|
|
if ( line.hasPrefix() && count < 10 ) {
|
|
if ( line.hasPrefix() && count < 10 ) {
|
|
count++;
|
|
count++;
|
|
invoke = ( line.split(' ')[1] ? line.split(' ')[1].toLowerCase() : '' );
|
|
invoke = ( line.split(' ')[1] ? line.split(' ')[1].toLowerCase() : '' );
|