Browse Source

remove Fandom global edit count

Markus-Rost 4 years ago
parent
commit
da35cd2bce
2 changed files with 7 additions and 33 deletions
  1. 3 3
      cmds/verify.js
  2. 4 30
      functions/global_block.js

+ 3 - 3
cmds/verify.js

@@ -77,7 +77,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 			if ( body.query.users.length !== 1 || queryuser.missing !== undefined || queryuser.invalid !== undefined ) {
 			if ( body.query.users.length !== 1 || queryuser.missing !== undefined || queryuser.invalid !== undefined ) {
 				username = ( body.query.users.length === 1 ? queryuser.name : username );
 				username = ( body.query.users.length === 1 ? queryuser.name : username );
 				embed.setTitle( ( old_username || username ).escapeFormatting() ).setColor('#0000FF').setDescription( lang.get('verify.user_missing', ( old_username || username ).escapeFormatting()) );
 				embed.setTitle( ( old_username || username ).escapeFormatting() ).setColor('#0000FF').setDescription( lang.get('verify.user_missing', ( old_username || username ).escapeFormatting()) );
-				if ( wiki.isFandom() && !old_username ) return got.get( 'https://community.fandom.com/api/v1/User/UsersByName?limit=1&query=' + encodeURIComponent( username ) + '&format=json' ).then( wsresponse => {
+				if ( wiki.isFandom() && !old_username ) return got.get( wiki + 'api/v1/User/UsersByName?limit=1&query=' + encodeURIComponent( username ) + '&format=json' ).then( wsresponse => {
 					var wsbody = wsresponse.body;
 					var wsbody = wsresponse.body;
 					if ( wsresponse.statusCode !== 200 || wsbody?.exception || wsbody?.users?.[0]?.name?.length !== username.length ) {
 					if ( wsresponse.statusCode !== 200 || wsbody?.exception || wsbody?.users?.[0]?.name?.length !== username.length ) {
 						if ( !wsbody?.users ) console.log( '- ' + wsresponse.statusCode + ': Error while searching the user: ' + wsbody?.exception?.details );
 						if ( !wsbody?.users ) console.log( '- ' + wsresponse.statusCode + ': Error while searching the user: ' + wsbody?.exception?.details );
@@ -110,7 +110,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 			}
 			}
 			
 			
 			var comment = [];
 			var comment = [];
-			if ( wiki.isFandom() ) return got.get( 'https://community.fandom.com/Special:Contributions/' + encodeURIComponent( username ) + '?limit=1&cache=' + Date.now(), {
+			if ( wiki.isFandom() ) return got.get( 'https://ucp.fandom.com/Special:Contributions/' + encodeURIComponent( username ) + '?limit=1&cache=' + Date.now(), {
 				responseType: 'text'
 				responseType: 'text'
 			} ).then( gbresponse => {
 			} ).then( gbresponse => {
 				if ( gbresponse.statusCode !== 200 || !gbresponse.body ) {
 				if ( gbresponse.statusCode !== 200 || !gbresponse.body ) {
@@ -125,7 +125,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 							reply: lang.get('verify.user_disabled_reply', username.escapeFormatting())
 							reply: lang.get('verify.user_disabled_reply', username.escapeFormatting())
 						});
 						});
 					}
 					}
-					if ( $('.mw-warning-with-logexcerpt').length && !$(".mw-warning-with-logexcerpt .mw-logline-block").length ) {
+					else if ( $('script').eq(1).html().includes( '"isBlockedInPhalanx":true' ) ) {
 						return Promise.reject({
 						return Promise.reject({
 							desc: lang.get('verify.user_gblocked', '[' + username.escapeFormatting() + '](' + pagelink + ')', queryuser.gender),
 							desc: lang.get('verify.user_gblocked', '[' + username.escapeFormatting() + '](' + pagelink + ')', queryuser.gender),
 							reply: lang.get('verify.user_gblocked_reply', username.escapeFormatting(), queryuser.gender)
 							reply: lang.get('verify.user_gblocked_reply', username.escapeFormatting(), queryuser.gender)

+ 4 - 30
functions/global_block.js

@@ -28,7 +28,7 @@ function global_block(lang, msg, username, text, embed, wiki, spoiler, gender) {
 	}
 	}
 	
 	
 	Promise.all([
 	Promise.all([
-		got.get( 'https://community.fandom.com/Special:Contributions/' + encodeURIComponent( username ) + '?limit=1', {
+		got.get( 'https://ucp.fandom.com/Special:Contributions/' + encodeURIComponent( username ) + '?limit=1', {
 			responseType: 'text'
 			responseType: 'text'
 		} ).then( response => {
 		} ).then( response => {
 			var body = response.body;
 			var body = response.body;
@@ -41,7 +41,7 @@ function global_block(lang, msg, username, text, embed, wiki, spoiler, gender) {
 					if ( msg.showEmbed() ) embed.addField( '\u200b', '**' + lang.get('user.gblock.disabled') + '**' );
 					if ( msg.showEmbed() ) embed.addField( '\u200b', '**' + lang.get('user.gblock.disabled') + '**' );
 					else text += '\n\n**' + lang.get('user.gblock.disabled') + '**';
 					else text += '\n\n**' + lang.get('user.gblock.disabled') + '**';
 				}
 				}
-				else if ( $('.mw-warning-with-logexcerpt').length && !$(".mw-warning-with-logexcerpt .mw-logline-block").length ) {
+				else if ( $('head script').eq(1).html().includes( '"isBlockedInPhalanx":true' ) ) {
 					if ( msg.showEmbed() ) embed.addField( '\u200b', '**' + lang.get('user.gblock.header', username, gender).escapeFormatting() + '**' );
 					if ( msg.showEmbed() ) embed.addField( '\u200b', '**' + lang.get('user.gblock.header', username, gender).escapeFormatting() + '**' );
 					else text += '\n\n**' + lang.get('user.gblock.header', username, gender).escapeFormatting() + '**';
 					else text += '\n\n**' + lang.get('user.gblock.header', username, gender).escapeFormatting() + '**';
 				}
 				}
@@ -49,7 +49,7 @@ function global_block(lang, msg, username, text, embed, wiki, spoiler, gender) {
 		}, error => {
 		}, error => {
 			console.log( '- Error while getting the global block: ' + error );
 			console.log( '- Error while getting the global block: ' + error );
 		} ),
 		} ),
-		( isUser ? ( wiki.isGamepedia() ? got.get( 'https://help.gamepedia.com/UserProfile:' + encodeURIComponent( username ) + '?cache=' + Date.now(), {
+		( isUser && wiki.isGamepedia() ? got.get( 'https://help.gamepedia.com/UserProfile:' + encodeURIComponent( username ) + '?cache=' + Date.now(), {
 			responseType: 'text'
 			responseType: 'text'
 		} ).then( gresponse => {
 		} ).then( gresponse => {
 			var gbody = gresponse.body;
 			var gbody = gresponse.body;
@@ -95,33 +95,7 @@ function global_block(lang, msg, username, text, embed, wiki, spoiler, gender) {
 			}
 			}
 		}, error => {
 		}, error => {
 			console.log( '- Error while getting the global edit count: ' + error );
 			console.log( '- Error while getting the global edit count: ' + error );
-		} ) : got.get( 'https://community.fandom.com/wiki/Special:Editcount/' + encodeURIComponent( username ), {
-			responseType: 'text'
-		} ).then( gresponse => {
-			var gbody = gresponse.body;
-			if ( gresponse.statusCode !== 200 || !gbody ) {
-				console.log( '- ' + gresponse.statusCode + ': Error while getting the global edit count.' );
-			}
-			else {
-				let $ = cheerio.load(gbody);
-				var globaledits = $('#editcount .TablePager th').eq(7).text().replace( /[,\.]/g, '' );
-				if ( globaledits ) {
-					globaledits = parseInt(globaledits, 10).toLocaleString(lang.get('dateformat'));
-					if ( msg.showEmbed() ) embed.spliceFields(1, 0, {
-						name: lang.get('user.info.globaleditcount'),
-						value: globaledits,
-						inline: true
-					});
-					else {
-						let splittext = text.split('\n');
-						splittext.splice(5, 0, lang.get('user.info.globaleditcount') + ' ' + globaledits);
-						text = splittext.join('\n');
-					}
-				}
-			}
-		}, error => {
-			console.log( '- Error while getting the global edit count: ' + error );
-		} ) ) : undefined )
+		} ) : undefined )
 	]).finally( () => {
 	]).finally( () => {
 		msg.edit( spoiler + text + spoiler, {embed,allowedMentions:{parse:[]}} ).catch(log_error);
 		msg.edit( spoiler + text + spoiler, {embed,allowedMentions:{parse:[]}} ).catch(log_error);
 	} );
 	} );