Browse Source

minor fixes

Markus-Rost 4 years ago
parent
commit
f26ca72028
3 changed files with 8 additions and 4 deletions
  1. 4 0
      cmds/verify.js
  2. 2 2
      cmds/wiki/fandom/user.js
  3. 2 2
      cmds/wiki/gamepedia/user.js

+ 4 - 0
cmds/verify.js

@@ -54,6 +54,10 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 					console.log( '- This wiki doesn\'t exist!' );
 					msg.reactEmoji('nowiki');
 				}
+				else if ( body?.error?.code === 'us400' ) { // special catch for Fandom
+					embed.setTitle( ( old_username || username ).escapeFormatting() ).setColor('#0000FF').setDescription( lang.get('verify.user_missing', ( old_username || username ).escapeFormatting()) );
+					msg.replyMsg( lang.get('verify.user_missing_reply', ( old_username || username ).escapeFormatting()), {embed}, false, false );
+				}
 				else {
 					console.log( '- ' + response.statusCode + ': Error while getting the user: ' + ( body && body.error && body.error.info ) );
 					embed.setColor('#000000').setDescription( lang.get('verify.error') );

+ 2 - 2
cmds/wiki/fandom/user.js

@@ -78,7 +78,7 @@ function fandom_user(lang, msg, namespace, username, wiki, querystring, fragment
 					var isBlocked = false;
 					var blockedtimestamp = new Date(block.timestamp).toLocaleString(lang.get('dateformat'), timeoptions);
 					var blockexpiry = block.expiry;
-					if ( blockexpiry === 'infinity' ) {
+					if ( ['infinity', 'infinite'].includes(blockexpiry) ) {
 						blockexpiry = lang.get('user.block.until_infinity');
 						isBlocked = true;
 					} else if ( blockexpiry ) {
@@ -249,7 +249,7 @@ function fandom_user(lang, msg, namespace, username, wiki, querystring, fragment
 					}
 					var isBlocked = false;
 					var blockexpiry = queryuser.blockexpiry;
-					if ( blockexpiry === 'infinity' ) {
+					if ( ['infinity', 'infinite'].includes(blockexpiry) ) {
 						blockexpiry = lang.get('user.block.until_infinity');
 						isBlocked = true;
 					} else if ( blockexpiry ) {

+ 2 - 2
cmds/wiki/gamepedia/user.js

@@ -72,7 +72,7 @@ function gamepedia_user(lang, msg, namespace, username, wiki, querystring, fragm
 					var isBlocked = false;
 					var blockedtimestamp = new Date(block.timestamp).toLocaleString(lang.get('dateformat'), timeoptions);
 					var blockexpiry = block.expiry;
-					if ( blockexpiry === 'infinity' ) {
+					if ( ['infinity', 'infinite'].includes(blockexpiry) ) {
 						blockexpiry = lang.get('user.block.until_infinity');
 						isBlocked = true;
 					} else if ( blockexpiry ) {
@@ -246,7 +246,7 @@ function gamepedia_user(lang, msg, namespace, username, wiki, querystring, fragm
 					var isBlocked = false;
 					var blockedtimestamp = new Date(queryuser.blockedtimestamp).toLocaleString(lang.get('dateformat'), timeoptions);
 					var blockexpiry = queryuser.blockexpiry;
-					if ( blockexpiry === 'infinity' ) {
+					if ( ['infinity', 'infinite'].includes(blockexpiry) ) {
 						blockexpiry = lang.get('user.block.until_infinity');
 						isBlocked = true;
 					} else if ( blockexpiry ) {