Rework getting Fandom wiki id

cmds/rcscript.js

@@ -65,12 +65,12 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 				wikinew = input_to_wiki(input.replace( /^(?:https?:)?\/\//, 'https://' ));
 				if ( !wikinew ) return msg.replyMsg( wikiinvalid, {}, true );
 			}
-			return msg.reactEmoji('⏳', true).then( reaction => got.get( wikinew + 'api.php?&action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw|recentchanges&amenableparser=true&siprop=general&titles=Special:RecentChanges&format=json' ).then( response => {
+			return msg.reactEmoji('⏳', true).then( reaction => got.get( wikinew + 'api.php?&action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw|recentchanges&amenableparser=true&siprop=general' + ( wiki.isFandom() ? '|variables' : '' ) + '&titles=Special:RecentChanges&format=json' ).then( response => {
 				if ( response.statusCode === 404 && typeof response.body === 'string' ) {
 					let api = cheerio.load(response.body)('head link[rel="EditURI"]').prop('href');
 					if ( api ) {
 						wikinew = new Wiki(api.split('api.php?')[0], wikinew);
-						return got.get( wikinew + 'api.php?action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw|recentchanges&amenableparser=true&siprop=general&titles=Special:RecentChanges&format=json' );
+						return got.get( wikinew + 'api.php?action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw|recentchanges&amenableparser=true&siprop=general' + ( wiki.isFandom() ? '|variables' : '' ) + '&titles=Special:RecentChanges&format=json' );
 					}
 				}
 				return response;
@@ -104,32 +104,20 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 						if ( reaction ) reaction.removeEmoji();
 						return msg.replyMsg( ( row.reason ? lang.get('rcscript.blocked_reason', row.reason) : lang.get('rcscript.blocked') ), {}, true );
 					}
-					if ( wikinew.isFandom(false) ) return got.get( 'https://community.fandom.com/api/v1/Wikis/ByString?includeDomain=true&limit=10&string=' + body.query.general.servername + body.query.general.scriptpath + '&format=json&cache=' + Date.now() ).then( wiresponse => {
-						var wibody = wiresponse.body;
-						if ( wiresponse.statusCode !== 200 || !wibody || wibody.exception || !wibody.items || !wibody.items.length ) {
-							console.log( '- ' + wiresponse.statusCode + ': Error while getting the wiki id: ' + wibody?.exception?.details );
-							return createWebhook();
+					var wikiid = body.query.variables?.find?.( variable => variable?.id === 'wgCityId' )?.['*'];
+					if ( wikinew.isFandom(false) && wikiid ) return got.get( 'https://services.fandom.com/discussion/' + wikiid + '/posts?limit=1&format=json&cache=' + Date.now(), {
+						headers: {
+							Accept: 'application/hal+json'
 						}
-						var site = wibody.items.find( site => site.domain === body.query.general.servername + body.query.general.scriptpath );
-						if ( site ) return got.get( 'https://services.fandom.com/discussion/' + site.id + '/posts?limit=1&format=json&cache=' + Date.now(), {
-							headers: {
-								Accept: 'application/hal+json'
-							}
-						} ).then( dsresponse => {
-							var dsbody = dsresponse.body;
-							if ( dsresponse.statusCode !== 200 || !dsbody || dsbody.title ) {
-								if ( dsbody?.title !== 'site doesn\'t exists' ) console.log( '- ' + dsresponse.statusCode + ': Error while checking for discussions: ' + dsbody?.title );
-								return createWebhook();
-							}
-							return createWebhook(parseInt(site.id, 10));
-						}, error => {
-							console.log( '- Error while checking for discussions: ' + error );
+					} ).then( dsresponse => {
+						var dsbody = dsresponse.body;
+						if ( dsresponse.statusCode !== 200 || !dsbody || dsbody.title ) {
+							if ( dsbody?.title !== 'site doesn\'t exists' ) console.log( '- ' + dsresponse.statusCode + ': Error while checking for discussions: ' + dsbody?.title );
 							return createWebhook();
-						} );
-						console.log( '- No result while getting the wiki id.' );
-						return createWebhook();
+						}
+						return createWebhook(parseInt(wikiid, 10));
 					}, error => {
-						console.log( '- Error while getting the wiki id: ' + error );
+						console.log( '- Error while checking for discussions: ' + error );
 						return createWebhook();
 					} );
 					return createWebhook();
@@ -236,12 +224,12 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 				var wikiinvalid = lang.get('settings.wikiinvalid') + '\n`' + cmd + ' wiki ' + lang.get('rcscript.new_wiki') + '`\n' + lang.get('rcscript.help_wiki');
 				var wikinew = input_to_wiki(args[1].replace( /^(?:https?:)?\/\//, 'https://' ));
 				if ( !wikinew ) return msg.replyMsg( wikiinvalid, {}, true );
-				return msg.reactEmoji('⏳', true).then( reaction => got.get( wikinew + 'api.php?&action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw&amenableparser=true&siprop=general&titles=Special:RecentChanges&format=json' ).then( response => {
+				return msg.reactEmoji('⏳', true).then( reaction => got.get( wikinew + 'api.php?&action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw&amenableparser=true&siprop=general' + ( wiki.isFandom() ? '|variables' : '' ) + '&titles=Special:RecentChanges&format=json' ).then( response => {
 					if ( response.statusCode === 404 && typeof response.body === 'string' ) {
 						let api = cheerio.load(response.body)('head link[rel="EditURI"]').prop('href');
 						if ( api ) {
 							wikinew = new Wiki(api.split('api.php?')[0], wikinew);
-							return got.get( wikinew + 'api.php?action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw&amenableparser=true&siprop=general&titles=Special:RecentChanges&format=json' );
+							return got.get( wikinew + 'api.php?action=query&meta=allmessages|siteinfo&ammessages=custom-RcGcDw&amenableparser=true&siprop=general' + ( wiki.isFandom() ? '|variables' : '' ) + '&titles=Special:RecentChanges&format=json' );
 						}
 					}
 					return response;
@@ -275,32 +263,20 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 							if ( reaction ) reaction.removeEmoji();
 							return msg.replyMsg( ( row.reason ? lang.get('rcscript.blocked_reason', row.reason) : lang.get('rcscript.blocked') ), {}, true );
 						}
-						if ( wikinew.isFandom(false) ) return got.get( 'https://community.fandom.com/api/v1/Wikis/ByString?includeDomain=true&limit=10&string=' + body.query.general.servername + body.query.general.scriptpath + '&format=json&cache=' + Date.now() ).then( wiresponse => {
-							var wibody = wiresponse.body;
-							if ( wiresponse.statusCode !== 200 || !wibody || wibody.exception || !wibody.items || !wibody.items.length ) {
-								console.log( '- ' + wiresponse.statusCode + ': Error while getting the wiki id: ' + wibody?.exception?.details );
-								return updateWiki();
+						var wikiid = body.query.variables?.find?.( variable => variable?.id === 'wgCityId' )?.['*'];
+						if ( wikinew.isFandom(false) && wikiid ) return got.get( 'https://services.fandom.com/discussion/' + wikiid + '/posts?limit=1&format=json&cache=' + Date.now(), {
+							headers: {
+								Accept: 'application/hal+json'
 							}
-							var site = wibody.items.find( site => site.domain === body.query.general.servername + body.query.general.scriptpath );
-							if ( site ) return got.get( 'https://services.fandom.com/discussion/' + site.id + '/posts?limit=1&format=json&cache=' + Date.now(), {
-								headers: {
-									Accept: 'application/hal+json'
-								}
-							} ).then( dsresponse => {
-								var dsbody = dsresponse.body;
-								if ( dsresponse.statusCode !== 200 || !dsbody || dsbody.title ) {
-									if ( dsbody?.title !== 'site doesn\'t exists' ) console.log( '- ' + dsresponse.statusCode + ': Error while checking for discussions: ' + dsbody?.title );
-									return updateWiki();
-								}
-								return updateWiki(parseInt(site.id, 10));
-							}, error => {
-								console.log( '- Error while checking for discussions: ' + error );
+						} ).then( dsresponse => {
+							var dsbody = dsresponse.body;
+							if ( dsresponse.statusCode !== 200 || !dsbody || dsbody.title ) {
+								if ( dsbody?.title !== 'site doesn\'t exists' ) console.log( '- ' + dsresponse.statusCode + ': Error while checking for discussions: ' + dsbody?.title );
 								return updateWiki();
-							} );
-							console.log( '- No result while getting the wiki id.' );
-							return updateWiki();
+							}
+							return updateWiki(parseInt(wikiid, 10));
 						}, error => {
-							console.log( '- Error while getting the wiki id: ' + error );
+							console.log( '- Error while checking for discussions: ' + error );
 							return updateWiki();
 						} );
 						return updateWiki();
@@ -430,16 +406,15 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 					} );
 				}
 
-				let scriptPath = selected_row.wiki.replace( /^https:\/\/(.*)\/$/, '$1' );
-				return msg.reactEmoji('⏳', true).then( reaction => got.get( 'https://community.fandom.com/api/v1/Wikis/ByString?includeDomain=true&limit=10&string=' + scriptPath + '&format=json&cache=' + Date.now() ).then( wiresponse => {
+				return msg.reactEmoji('⏳', true).then( reaction => got.get( selected_row.wiki + 'api.php?action=query&meta=siteinfo&siprop=general|variables&format=json' ).then( wiresponse => {
 					var wibody = wiresponse.body;
-					if ( wiresponse.statusCode !== 200 || !wibody || wibody.exception || !wibody.items || !wibody.items.length ) {
-						console.log( '- ' + wiresponse.statusCode + ': Error while getting the wiki id: ' + wibody?.exception?.details );
+					if ( wiresponse.statusCode !== 200 || !wibody?.query?.variables?.some?.( variable => variable?.id === 'wgCityId' )?.['*'] ) {
+						console.log( '- ' + wiresponse.statusCode + ': Error while getting the wiki id: ' + wibody?.error?.info );
 						if ( reaction ) reaction.removeEmoji();
 						return msg.replyMsg( lang.get('rcscript.no_feeds'), {}, true );
 					}
-					var site = wibody.items.find( site => site.domain === scriptPath );
-					if ( site ) return got.get( 'https://services.fandom.com/discussion/' + site.id + '/posts?limit=1&format=json&cache=' + Date.now(), {
+					var wikiid = wibody.query.variables.find( variable => variable.id === 'wgCityId' )['*'];
+					return got.get( 'https://services.fandom.com/discussion/' + wikiid + '/posts?limit=1&format=json&cache=' + Date.now(), {
 						headers: {
 							Accept: 'application/hal+json'
 						}
@@ -451,9 +426,9 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 							return msg.replyMsg( lang.get('rcscript.no_feeds'), {}, true );
 						}
 						msg.client.fetchWebhook(...selected_row.webhook.split('/')).then( webhook => {
-							webhook.send( webhook_lang.get('enabled_feeds', site.name) + '\n<' + selected_row.wiki + 'f>' ).catch(log_error);
+							webhook.send( webhook_lang.get('enabled_feeds', body.query.general.sitename) + '\n<' + selected_row.wiki + 'f>' ).catch(log_error);
 						}, log_error );
-						db.run( 'UPDATE rcgcdw SET wikiid = ?, postid = ? WHERE webhook = ?', [parseInt(site.id, 10), null, selected_row.webhook], function (error) {
+						db.run( 'UPDATE rcgcdw SET wikiid = ?, postid = ? WHERE webhook = ?', [parseInt(wikiid, 10), null, selected_row.webhook], function (error) {
 							if ( error ) {
 								console.log( '- Error while updating the RcGcDw: ' + error );
 								if ( reaction ) reaction.removeEmoji();
@@ -469,9 +444,6 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 						if ( reaction ) reaction.removeEmoji();
 						return msg.replyMsg( lang.get('rcscript.no_feeds'), {}, true );
 					} );
-					console.log( '- No result while getting the wiki id.' );
-					if ( reaction ) reaction.removeEmoji();
-					return msg.replyMsg( lang.get('rcscript.no_feeds'), {}, true );
 				}, error => {
 					console.log( '- Error while getting the wiki id: ' + error );
 					if ( reaction ) reaction.removeEmoji();

cmds/verify.js

@@ -139,7 +139,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 						return Promise.reject();
 					}
 					queryuser.editcount = ucbody.userData.localEdits;
-					discordname = ucbody.userData.discordHandle.escapeFormatting().replace( /^\s*([^@#:]{2,32}?)\s*#(\d{4,6})\s*$/, '$1#$2' );
+					if ( ucbody.userData.discordHandle ) discordname = ucbody.userData.discordHandle.escapeFormatting().replace( /^\s*([^@#:]{2,32}?)\s*#(\d{4,6})\s*$/, '$1#$2' );
 					
 					if ( wiki.isGamepedia() ) return got.get( wiki + 'api.php?action=profile&do=getPublicProfile&user_name=' + encodeURIComponent( username ) + '&format=json&cache=' + Date.now() ).then( presponse => {
 						var pbody = presponse.body;
@@ -173,6 +173,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 								console.log( '- ' + presponse.statusCode + ': Error while getting the Discord tag: ' + ( pbody && ( pbody.error && pbody.error.info || pbody.errormsg || pbody.title ) ) );
 								return Promise.reject();
 							}
+							return;
 						}
 						if ( pbody.profile ) discordname = pbody.profile['link-discord'].escapeFormatting().replace( /^\s*([^@#:]{2,32}?)\s*#(\d{4,6})\s*$/, '$1#$2' );
 						else if ( pbody.value ) discordname = pbody.value.escapeFormatting().replace( /^\s*([^@#:]{2,32}?)\s*#(\d{4,6})\s*$/, '$1#$2' );
@@ -255,7 +256,8 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 					msg.replyMsg( lang.get('verify.user_matches_reply', username.escapeFormatting(), queryuser.gender), {embed}, false, false );
 					
 					if ( reaction ) reaction.removeEmoji();
-				}, () => {
+				}, error => {
+					if ( error ) console.log( '- Error while getting the Discord tag: ' + error );
 					embed.setColor('#000000').setDescription( lang.get('verify.error') );
 					msg.replyMsg( lang.get('verify.error_reply'), {embed}, false, false ).then( message => message.reactEmoji('error') );
 					

cmds/wiki/general.js

@@ -85,7 +85,7 @@ function gamepedia_check_wiki(lang, msg, title, wiki, cmd, reaction, spoiler = '
 		return fn.diff(lang, msg, args, wiki, reaction, spoiler);
 	}
 	var noRedirect = ( querystring.getAll('redirect').pop() === 'no' || ( querystring.has('action') && querystring.getAll('action').pop() !== 'view' ) );
-	got.get( wiki + 'api.php?action=query&meta=siteinfo&siprop=general|namespaces|specialpagealiases&iwurl=true' + ( noRedirect ? '' : '&redirects=true' ) + '&prop=pageimages|categoryinfo|pageprops|extracts&piprop=original|name&ppprop=description|displaytitle|page_image_free|infoboxes&explaintext=true&exsectionformat=raw&exlimit=1&converttitles=true&titles=%1F' + encodeURIComponent( title.replace( /\x1F/g, '\ufffd' ) ) + '&format=json' ).then( response => {
+	got.get( wiki + 'api.php?action=query&meta=siteinfo&siprop=general|namespaces|specialpagealiases' + ( wiki.isFandom() ? '|variables' : '' ) + '&iwurl=true' + ( noRedirect ? '' : '&redirects=true' ) + '&prop=pageimages|categoryinfo|pageprops|extracts&piprop=original|name&ppprop=description|displaytitle|page_image_free|infoboxes&explaintext=true&exsectionformat=raw&exlimit=1&converttitles=true&titles=%1F' + encodeURIComponent( title.replace( /\x1F/g, '\ufffd' ) ) + '&format=json' ).then( response => {
 		var body = response.body;
 		if ( body && body.warnings ) log_warn(body.warnings);
 		if ( response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query ) {
@@ -113,6 +113,9 @@ function gamepedia_check_wiki(lang, msg, title, wiki, cmd, reaction, spoiler = '
 			return fn.diff(lang, msg, args, wiki, reaction, spoiler);
 		}
 		if ( aliasInvoke === 'discussion' && wiki.isFandom(false) && !querystring.toString() && !fragment ) {
+			body.query.wikidesc = {
+				id: body.query.variables?.find?.( variable => variable?.id === 'wgCityId' )?.['*']
+			};
 			return fn.discussion(lang, msg, wiki, args.join(' '), body.query, reaction, spoiler);
 		}
 		if ( body.query.pages ) {

cmds/wiki/overview.js

@@ -17,7 +17,7 @@ getAllSites.then( sites => allSites = sites );
  */
 function gamepedia_overview(lang, msg, wiki, reaction, spoiler) {
 	if ( !allSites.length ) getAllSites.update();
-	got.get( wiki + 'api.php?action=query&meta=allmessages|siteinfo&ammessages=custom-Wiki_Manager|custom-GamepediaNotice|custom-FandomMergeNotice&amenableparser=true&siprop=general|statistics|languages|rightsinfo&siinlanguagecode=' + lang.lang + '&list=logevents&ledir=newer&lelimit=1&leprop=timestamp&titles=Special:Statistics&format=json' ).then( response => {
+	got.get( wiki + 'api.php?action=query&meta=allmessages|siteinfo&ammessages=custom-Wiki_Manager|custom-GamepediaNotice|custom-FandomMergeNotice&amenableparser=true&siprop=general|statistics|languages|rightsinfo' + ( wiki.isFandom() ? '|variables' : '' ) + '&siinlanguagecode=' + lang.lang + '&list=logevents&ledir=newer&lelimit=1&leprop=timestamp&titles=Special:Statistics&format=json' ).then( response => {
 		var body = response.body;
 		if ( body && body.warnings ) log_warn(body.warnings);
 		if ( response.statusCode !== 200 || !body || body.batchcomplete === undefined || !body.query || !body.query.pages ) {
@@ -37,23 +37,6 @@ function gamepedia_overview(lang, msg, wiki, reaction, spoiler) {
 		}
 		else {
 			wiki.updateWiki(body.query.general);
-			var site = null;
-			if ( allSites.some( site => site.wiki_domain === wiki.hostname ) ) {
-				site = allSites.find( site => site.wiki_domain === wiki.hostname );
-				
-				var name = [lang.get('overview.name'), site.wiki_display_name];
-				var manager = [lang.get('overview.manager'), site.wiki_managers];
-				var official = [lang.get('overview.official'), lang.get('overview.' + ( site.official_wiki ? 'yes' : 'no' ))];
-				var crossover = [lang.get('overview.crossover'), ( site.wiki_crossover ? '<https://' + site.wiki_crossover + '/>' : '' )];
-				var description = [lang.get('overview.description'), site.wiki_description];
-				var image = [lang.get('overview.image'), site.wiki_image];
-				
-				if ( description[1] ) {
-					description[1] = description[1].escapeFormatting();
-					if ( description[1].length > 1000 ) description[1] = description[1].substring(0, 1000) + '\u2026';
-				}
-				if ( image[1] && image[1].startsWith( '/' ) ) image[1] = new URL(image[1], wiki).href;
-			}
 			var version = [lang.get('overview.version'), body.query.general.generator];
 			var creation_date = null;
 			var created = [lang.get('overview.created'), lang.get('overview.unknown')];
@@ -106,70 +89,71 @@ function gamepedia_overview(lang, msg, wiki, reaction, spoiler) {
 			}
 			else {
 				var embed = {};
-				var text = '<' + pagelink + '>\n\n';
+				var text = '<' + pagelink + '>\n';
 			}
 			
-			if ( wiki.isFandom(false) ) got.get( 'https://community.fandom.com/api/v1/Wikis/ByString?expand=true&includeDomain=true&limit=10&string=' + body.query.general.servername + body.query.general.scriptpath + '&format=json&cache=' + Date.now() ).then( ovresponse => {
+			var wikiid = body.query.variables?.find?.( variable => variable?.id === 'wgCityId' )?.['*'];
+			if ( wiki.isFandom() && wikiid ) {
+				var vertical = [lang.get('overview.vertical')];
+				var topic = [lang.get('overview.topic')];
+				var official = [lang.get('overview.official')];
+				var posts = [lang.get('overview.posts')];
+				var walls = [lang.get('overview.walls')];
+				var comments = [lang.get('overview.comments')];
 				var manager = [lang.get('overview.manager'), body.query.allmessages[0]['*']];
+				var founder = [lang.get('overview.founder')];
 				var crossover = [lang.get('overview.crossover')];
 				if ( body.query.allmessages[1]['*'] ) {
-					crossover.push('<https://' + body.query.allmessages[1]['*'] + '.gamepedia.com/>');
+					crossover[1] = '<https://' + body.query.allmessages[1]['*'] + '.gamepedia.com/>';
 				}
 				else if ( body.query.allmessages[2]['*'] ) {
 					let merge = body.query.allmessages[2]['*'].split('/');
-					crossover.push('<https://' + merge[0] + '.fandom.com/' + ( merge[1] ? merge[1] + '/' : '' ) + '>');
+					crossover[1] = '<https://' + merge[0] + '.fandom.com/' + ( merge[1] ? merge[1] + '/' : '' ) + '>';
 				}
-				var ovbody = ovresponse.body;
-				if ( ovresponse.statusCode !== 200 || !ovbody || ovbody.exception || !ovbody.items || !ovbody.items.length ) {
-					console.log( '- ' + ovresponse.statusCode + ': Error while getting the wiki details: ' + ( ovbody && ovbody.exception && ovbody.exception.details ) );
-
-					if ( msg.showEmbed() ) {
-						embed.addField( version[0], version[1], true ).addField( created[0], created[1], true ).addField( language[0], language[1], true );
-						if ( rtl[1] ) embed.addField( rtl[0], rtl[1], true );
-						embed.addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true ).addField( users[0], users[1], true ).addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') );
-						if ( readonly[1] ) embed.addField( readonly[0], readonly[1] );
+				var description = [lang.get('overview.description')];
+				var image = [lang.get('overview.image')];
+				if ( allSites.some( site => site.wiki_domain === wiki.hostname ) ) {
+					let site = allSites.find( site => site.wiki_domain === wiki.hostname );
+					
+					manager[1] = ( site.wiki_managers[0] || lang.get('overview.none') );
+					official[1] = lang.get('overview.' + ( site.official_wiki ? 'yes' : 'no' ));
+					if ( site.created && creation_date > new Date(parseInt(site.created + '000', 10)) ) {
+						creation_date = new Date(parseInt(site.created + '000', 10));
+						created[1] = creation_date.toLocaleString(lang.get('dateformat'), timeoptions);
 					}
-					else {
-						text += version.join(' ') + '\n' + created.join(' ') + '\n' + language.join(' ') + '\n';
-						if ( rtl[1] ) text += rtl.join(' ') + '\n';
-						text += articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ') + '\n' + users.join(' ') + '\n' + license.join(' ') + '\n' + misermode.join(' ');
-						if ( readonly[1] ) text += '\n\n' + ( readonly[0] === '\u200b' ? readonly[1] : readonly.join('\n') );
-						text += '\n\n*' + lang.get('overview.inaccurate') + '*';
+					if ( site.wiki_crossover ) crossover[1] = '<https://' + site.wiki_crossover + '/>';
+					if ( site.wiki_description ) {
+						description[1] = site.wiki_description.escapeFormatting();
+						if ( description[1].length > 1000 ) {
+							description[1] = description[1].substring(0, 1000) + '\u2026';
+						}
 					}
-	
-					msg.sendChannelError( spoiler + text + spoiler, {embed} );
-					
-					if ( reaction ) reaction.removeEmoji();
+					if ( site.wiki_image ) image[1] = new URL(site.wiki_image, wiki).href;
 				}
-				else if ( ovbody.items.some( site => new URL(site.url).href === wiki.href ) ) {
-					site = ovbody.items.find( site => new URL(site.url).href === wiki.href );
+				return got.get( 'https://community.fandom.com/api/v1/Wikis/Details?ids=' + wikiid + '&format=json&cache=' + Date.now() ).then( ovresponse => {
+					var ovbody = ovresponse.body;
+					if ( ovresponse.statusCode !== 200 || !ovbody || ovbody.exception || !ovbody.items || !ovbody.items[wikiid] ) {
+						console.log( '- ' + ovresponse.statusCode + ': Error while getting the wiki details: ' + ( ovbody && ovbody.exception && ovbody.exception.details ) );
+						return;
+					}
+					var site = ovbody.items[wikiid];
 					
-					var vertical = [lang.get('overview.vertical'), site.hub];
-					var topic = [lang.get('overview.topic'), site.topic];
-					var founder = [lang.get('overview.founder'), site.founding_user_id];
+					vertical[1] = site.hub;
+					topic[1] = site.topic;
+					founder[1] = site.founding_user_id;
 					if ( site.creation_date && creation_date > new Date(site.creation_date) ) {
 						creation_date = new Date(site.creation_date);
 						created[1] = creation_date.toLocaleString(lang.get('dateformat'), timeoptions);
 					}
-					var posts = [lang.get('overview.posts')];
-					var walls = [lang.get('overview.walls')];
-					var comments = [lang.get('overview.comments')];
-					var description = [lang.get('overview.description'), site.desc];
-					var image = [lang.get('overview.image'), site.image];
-					
-					if ( description[1] ) {
-						description[1] = description[1].escapeFormatting();
-						if ( description[1].length > 1000 ) description[1] = description[1].substring(0, 1000) + '\u2026';
-					}
-					if ( image[1] && image[1].startsWith( '/' ) ) image[1] = new URL(image[1], wiki).href;
-					
-					if ( msg.showEmbed() ) {
-						embed.addField( vertical[0], vertical[1], true );
-						if ( topic[1] ) embed.addField( topic[0], topic[1], true );
+					if ( site.desc ) {
+						description[1] = site.desc.escapeFormatting();
+						if ( description[1].length > 1000 ) {
+							description[1] = description[1].substring(0, 1000) + '\u2026';
+						}
 					}
-					else text += vertical.join(' ') + ( topic[1] ? '\n' + topic.join(' ') : '' );
+					if ( site.image ) image[1] = new URL(site.image, wiki).href;
 					
-					Promise.all([
+					return Promise.all([
 						( founder[1] > 0 ? got.get( wiki + 'api.php?action=query&list=users&usprop=&ususerids=' + founder[1] + '&format=json' ).then( usresponse => {
 							var usbody = usresponse.body;
 							if ( usbody && usbody.warnings ) log_warn(usbody.warnings);
@@ -185,8 +169,8 @@ function gamepedia_overview(lang, msg, wiki, reaction, spoiler) {
 						}, error => {
 							console.log( '- Error while getting the wiki founder: ' + error );
 							founder[1] = 'ID: ' + founder[1];
-						} ) : founder[1] = lang.get('overview.none') ),
-						got.get( 'https://services.fandom.com/discussion/' + site.id + '/posts?limit=1&format=json&cache=' + Date.now(), {
+						} ) : founder[1] = ( wiki.isGamepedia() ? null : lang.get('overview.none') ) ),
+						got.get( 'https://services.fandom.com/discussion/' + wikiid + '/posts?limit=1&format=json&cache=' + Date.now(), {
 							headers: {
 								Accept: 'application/hal+json'
 							}
@@ -207,70 +191,54 @@ function gamepedia_overview(lang, msg, wiki, reaction, spoiler) {
 						}, error => {
 							console.log( '- Error while getting discussions stats: ' + error );
 						} )
-					]).finally( () => {
-						if ( msg.showEmbed() ) {
-							embed.addField( founder[0], founder[1], true );
-							if ( manager[1] ) embed.addField( manager[0], '[' + manager[1] + '](' + wiki.toLink('User:' + manager[1], '', '', true) + ') ([' + lang.get('overview.talk') + '](' + wiki.toLink('User talk:' + manager[1], '', '', true) + '))', true );
-							embed.addField( version[0], version[1], true ).addField( created[0], created[1], true ).addField( language[0], language[1], true );
-							if ( rtl[1] ) embed.addField( rtl[0], rtl[1], true );
-							embed.addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true );
-							if ( posts[1] ) embed.addField( posts[0], posts[1], true );
-							if ( walls[1] ) embed.addField( walls[0], walls[1], true );
-							if ( comments[1] ) embed.addField( comments[0], comments[1], true );
-							embed.addField( users[0], users[1], true ).addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') + ' • ' + lang.get('overview.wikiid') + ' ' + site.id );
-							if ( crossover[1] ) {
-								var crossoverSite = allSites.find( site => '<https://' + site.wiki_domain + '/>' === crossover[1] );
-								if ( crossoverSite ) embed.addField( crossover[0], '[' + crossoverSite.wiki_display_name + '](' + crossover[1] + ')', true );
-								else embed.addField( crossover[0], crossover[1], true );
-							}
-							if ( description[1] ) embed.addField( description[0], description[1] );
-							if ( image[1] ) embed.addField( image[0], image[1] ).setImage( image[1] );
-							if ( readonly[1] ) embed.addField( readonly[0], readonly[1] );
-						}
-						else {
-							text += '\n' + founder.join(' ');
-							if ( manager[1] ) text += '\n' + manager.join(' ');
-							text += '\n' + version.join(' ') + '\n' + created.join(' ') + '\n' + language.join(' ');
-							if ( rtl[1] ) text += '\n' + rtl.join(' ');
-							text += '\n' + articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ');
-							if ( posts[1] ) text += '\n' + posts.join(' ');
-							if ( walls[1] ) text += '\n' + walls.join(' ');
-							if ( comments[1] ) text += '\n' + comments.join(' ');
-							text += '\n' + users.join(' ') + '\n' + license.join(' ') + '\n' + misermode.join(' ');
-							if ( crossover[1] ) text += '\n' + crossover.join(' ');
-							if ( description[1] ) text += '\n' + description.join(' ');
-							if ( image[1] ) {
-								text += '\n' + image.join(' ');
-								if ( msg.uploadFiles() ) embed.files = [{attachment:image[1],name:( spoiler ? 'SPOILER ' : '' ) + body.query.general.sitename + image[1].substring(image[1].lastIndexOf('.'))}];
-							}
-							if ( readonly[1] ) text += '\n\n' + ( readonly[0] === '\u200b' ? readonly[1] : readonly.join('\n') );
-							text += '\n\n*' + lang.get('overview.inaccurate') + '*';
-						}
-						
-						msg.sendChannel( spoiler + text + spoiler, {embed} );
-						
-						if ( reaction ) reaction.removeEmoji();
-					} );
-				}
-				else {
+					]);
+				}, error => {
+					console.log( '- Error while getting the wiki details: ' + error );
+					return;
+				} ).finally( () => {
 					if ( msg.showEmbed() ) {
-						if ( manager[1] ) embed.addField( manager[0], '[' + manager[1] + '](' + wiki.toLink('User:' + manager[1], '', '', true) + ') ([' + lang.get('overview.talk') + '](' + wiki.toLink('User talk:' + manager[1], '', '', true) + '))', true );
-						embed.addField( version[0], version[1], true ).addField( created[0], created[1], true ).addField( language[0], language[1], true );
+						if ( vertical[1] ) embed.addField( vertical[0], vertical[1], true );
+						if ( topic[1] ) embed.addField( topic[0], topic[1], true );
+						if ( official[1] ) embed.addField( official[0], official[1], true );
+						embed.addField( version[0], version[1], true ).addField( language[0], language[1], true );
 						if ( rtl[1] ) embed.addField( rtl[0], rtl[1], true );
-						embed.addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true ).addField( users[0], users[1], true ).addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') );
+						embed.addField( created[0], created[1], true ).addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true );
+						if ( posts[1] ) embed.addField( posts[0], posts[1], true );
+						if ( walls[1] ) embed.addField( walls[0], walls[1], true );
+						if ( comments[1] ) embed.addField( comments[0], comments[1], true );
+						embed.addField( users[0], users[1], true );
+						if ( manager[1] ) embed.addField( manager[0], '[' + manager[1] + '](' + wiki.toLink('User:' + manager[1], '', '', true) + ') ([' + lang.get('overview.talk') + '](' + wiki.toLink('User talk:' + manager[1], '', '', true) + '))', true );
+						if ( founder[1] ) embed.addField( founder[0], founder[1], true );
 						if ( crossover[1] ) {
-							var crossoverSite = allSites.find( site => '<https://' + site.wiki_domain + '/>' === crossover[1] );
+							let crossoverSite = allSites.find( site => '<https://' + site.wiki_domain + '/>' === crossover[1] );
 							if ( crossoverSite ) embed.addField( crossover[0], '[' + crossoverSite.wiki_display_name + '](' + crossover[1] + ')', true );
 							else embed.addField( crossover[0], crossover[1], true );
 						}
+						embed.addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') + ( wikiid ? ' • ' + lang.get('overview.wikiid') + ' ' + wikiid : '' ) );
+						if ( description[1] ) embed.addField( description[0], description[1] );
+						if ( image[1] ) embed.addField( image[0], image[1] ).setImage( image[1] );
 						if ( readonly[1] ) embed.addField( readonly[0], readonly[1] );
 					}
 					else {
-						if ( manager[1] ) text += manager.join(' ') + '\n';
-						text += version.join(' ') + '\n' + created.join(' ') + '\n' + language.join(' ') + '\n';
-						if ( rtl[1] ) text += rtl.join(' ') + '\n';
-						text += articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ') + '\n' + users.join(' ') + '\n' + license.join(' ') + '\n' + misermode.join(' ');
+						if ( vertical[1] ) text += '\n' + vertical.join(' ');
+						if ( topic[1] ) text += '\n' + topic.join(' ');
+						if ( official[1] ) text += '\n' + official.join(' ');
+						text += '\n' + version.join(' ') + '\n' + language.join(' ');
+						if ( rtl[1] ) text += '\n' + rtl.join(' ');
+						text += '\n' + created.join(' ') + '\n' + articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ');
+						if ( posts[1] ) text += '\n' + posts.join(' ');
+						if ( walls[1] ) text += '\n' + walls.join(' ');
+						if ( comments[1] ) text += '\n' + comments.join(' ');
+						text += '\n' + users.join(' ');
+						if ( manager[1] ) text += '\n' + manager.join(' ');
+						if ( founder[1] ) text += '\n' + founder.join(' ');
 						if ( crossover[1] ) text += '\n' + crossover.join(' ');
+						text += '\n' + license.join(' ') + '\n' + misermode.join(' ');
+						if ( description[1] ) text += '\n' + description.join(' ');
+						if ( image[1] ) {
+							text += '\n' + image.join(' ');
+							if ( msg.uploadFiles() ) embed.files = [{attachment:image[1],name:( spoiler ? 'SPOILER ' : '' ) + body.query.general.sitename + image[1].substring(image[1].lastIndexOf('.'))}];
+						}
 						if ( readonly[1] ) text += '\n\n' + ( readonly[0] === '\u200b' ? readonly[1] : readonly.join('\n') );
 						text += '\n\n*' + lang.get('overview.inaccurate') + '*';
 					}
@@ -278,65 +246,25 @@ function gamepedia_overview(lang, msg, wiki, reaction, spoiler) {
 					msg.sendChannel( spoiler + text + spoiler, {embed} );
 					
 					if ( reaction ) reaction.removeEmoji();
-				}
-			}, error => {
-				console.log( '- Error while getting the wiki details: ' + error );
-
-				if ( msg.showEmbed() ) {
-					embed.addField( version[0], version[1], true ).addField( created[0], created[1], true ).addField( language[0], language[1], true );
-					if ( rtl[1] ) embed.addField( rtl[0], rtl[1], true );
-					embed.addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true ).addField( users[0], users[1], true ).addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') );
-					if ( readonly[1] ) embed.addField( readonly[0], readonly[1] );
-				}
-				else {
-					text += version.join(' ') + '\n' + created.join(' ') + '\n' + language.join(' ') + '\n';
-					if ( rtl[1] ) text += rtl.join(' ') + '\n';
-					text += articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ') + '\n' + users.join(' ') + '\n' + license.join(' ') + '\n' + misermode.join(' ');
-					if ( readonly[1] ) text += '\n\n' + ( readonly[0] === '\u200b' ? readonly[1] : readonly.join('\n') );
-					text += '\n\n*' + lang.get('overview.inaccurate') + '*';
-				}
-
-				msg.sendChannelError( spoiler + text + spoiler, {embed} );
-				
-				if ( reaction ) reaction.removeEmoji();
-			} );
+				} );
+			}
+			if ( msg.showEmbed() ) {
+				embed.addField( version[0], version[1], true ).addField( language[0], language[1], true );
+				if ( rtl[1] ) embed.addField( rtl[0], rtl[1], true );
+				embed.addField( created[0], created[1], true ).addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true ).addField( users[0], users[1], true ).addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') );
+				if ( readonly[1] ) embed.addField( readonly[0], readonly[1] );
+			}
 			else {
-				if ( msg.showEmbed() ) {
-					if ( site ) {
-						var managerlist = manager[1].map( wm => '[' + wm + '](' + wiki.toLink('User:' + wm, '', '', true) + ') ([' + lang.get('overview.talk') + '](' + wiki.toLink('User talk:' + wm, '', '', true) + '))' ).join('\n');
-						embed.addField( name[0], name[1], true ).addField( manager[0], ( managerlist || lang.get('overview.none') ), true ).addField( official[0], official[1], true ).setTimestamp( msg.client.readyTimestamp );
-					}
-					embed.addField( version[0], version[1], true ).addField( created[0], created[1], true ).addField( language[0], language[1], true );
-					if ( rtl[1] ) embed.addField( rtl[0], rtl[1], true );
-					embed.addField( articles[0], articles[1], true ).addField( pages[0], pages[1], true ).addField( edits[0], edits[1], true ).addField( users[0], users[1], true ).addField( license[0], license[1], true ).addField( misermode[0], misermode[1], true ).setFooter( lang.get('overview.inaccurate') );
-					if ( site ) {
-						if ( crossover[1] ) embed.addField( crossover[0], crossover[1], true );
-						if ( description[1] ) embed.addField( description[0], description[1] );
-						if ( image[1] ) embed.addField( image[0], image[1] ).setImage( image[1] );
-					}
-					if ( readonly[1] ) embed.addField( readonly[0], readonly[1] );
-				}
-				else {
-					if ( site ) text += name.join(' ') + '\n' + manager[0] + ' ' + ( manager[1].join(', ') || lang.get('overview.none') ) + '\n' + official.join(' ') + '\n';
-					text += version.join(' ') + '\n' + created.join(' ') + '\n' + language.join(' ') + '\n';
-					if ( rtl[1] ) text += rtl.join(' ') + '\n';
-					text += articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ') + '\n' + users.join(' ') + '\n' + license.join(' ') + '\n' + misermode.join(' ');
-					if ( site ) {
-						if ( crossover[1] ) text += '\n' + crossover.join(' ');
-						if ( description[1] ) text += '\n' + description.join(' ');
-						if ( image[1] ) {
-							text += '\n' + image.join(' ');
-							if ( msg.uploadFiles() ) embed.files = [{attachment:image[1],name:( spoiler ? 'SPOILER ' : '' ) + name[1] + image[1].substring(image[1].lastIndexOf('.'))}];
-						}
-					}
-					if ( readonly[1] ) text += '\n\n' + ( readonly[0] === '\u200b' ? readonly[1] : readonly.join('\n') );
-					text += '\n\n*' + lang.get('overview.inaccurate') + '*';
-				}
-				
-				msg.sendChannel( spoiler + text + spoiler, {embed} );
-				
-				if ( reaction ) reaction.removeEmoji();
+				text += '\n' + version.join(' ') + '\n' + language.join(' ');
+				if ( rtl[1] ) text += '\n' + rtl.join(' ');
+				text += '\n' + created.join(' ') + '\n' + articles.join(' ') + '\n' + pages.join(' ') + '\n' + edits.join(' ') + '\n' + users.join(' ') + '\n' + license.join(' ') + '\n' + misermode.join(' ');
+				if ( readonly[1] ) text += '\n\n' + ( readonly[0] === '\u200b' ? readonly[1] : readonly.join('\n') );
+				text += '\n\n*' + lang.get('overview.inaccurate') + '*';
 			}
+			
+			msg.sendChannel( spoiler + text + spoiler, {embed} );
+			
+			if ( reaction ) reaction.removeEmoji();
 		}
 	}, error => {
 		if ( wiki.noWiki(error.message) ) {

functions/discussion.js

@@ -49,30 +49,12 @@ function fandom_discussion(lang, msg, wiki, title, query, reaction, spoiler) {
 			if ( reaction ) reaction.removeEmoji();
 		} );
 	}
-	else if ( !query.wikidesc ) {
-		return got.get( 'https://community.fandom.com/api/v1/Wikis/ByString?includeDomain=true&limit=10&string=' + query.general.servername + query.general.scriptpath + '&format=json&cache=' + Date.now() ).then( wvresponse => {
-			var wvbody = wvresponse.body;
-			if ( wvresponse.statusCode !== 200 || !wvbody || wvbody.exception || !wvbody.items || !wvbody.items.length ) {
-				console.log( '- ' + wvresponse.statusCode + ': Error while getting the wiki id: ' + ( wvbody && wvbody.exception && wvbody.exception.details ) );
-				msg.sendChannelError( spoiler + '<' + wiki + 'f' + '>' + spoiler );
-				
-				if ( reaction ) reaction.removeEmoji();
-			}
-			else if ( wvbody.items.some( site => site.domain === query.general.servername + query.general.scriptpath ) ) {
-				query.wikidesc = {id: wvbody.items.find( site => site.domain === query.general.servername + query.general.scriptpath ).id};
-				fandom_discussion(lang, msg, wiki, title, query, reaction, spoiler);
-			}
-			else {
-				msg.sendChannelError( spoiler + '<' + wiki + 'f' + '>' + spoiler );
-				
-				if ( reaction ) reaction.removeEmoji();
-			}
-		}, error => {
-			console.log( '- Error while getting the wiki id: ' + error );
-			msg.sendChannelError( spoiler + '<' + wiki + 'f' + '>' + spoiler );
-			
-			if ( reaction ) reaction.removeEmoji();
-		} );
+	else if ( !query.wikidesc?.id ) {
+		console.log( '- Error while getting the wiki id.' );
+		msg.sendChannelError( spoiler + '<' + wiki + 'f' + '>' + spoiler );
+		
+		if ( reaction ) reaction.removeEmoji();
+		return;
 	}
 	else if ( title.split(' ')[0].toLowerCase() === 'post' || title.split(' ')[0].toLowerCase() === lang.get('discussion.post') ) {
 		title = title.split(' ').slice(1).join(' ');

i18n/bn.json

@@ -407,7 +407,6 @@
         "inaccurate": "পরিসংখ্যান ভুলও হতে পারে",
         "lang": "ভাষা:",
         "manager": "উইকি ম্যানেজার:",
-        "name": "পুরা নাম:",
         "no": "না",
         "none": "*নেই*",
         "official": "আধিকারিক উইকি:",

i18n/de.json

@@ -408,8 +408,7 @@
         "lang": "Sprache:",
         "license": "Lizenz:",
         "manager": "Wiki-Manager:",
-        "misermode": "Geiz-Modus:",
-        "name": "Vollständiger Name:",
+        "misermode": "Geiz-Modus (Miser Mode):",
         "no": "Nein",
         "none": "*Niemand*",
         "official": "Offizielles Wiki:",

i18n/en.json

@@ -409,7 +409,6 @@
         "license": "License:",
         "manager": "Wiki manager:",
         "misermode": "Miser mode:",
-        "name": "Full name:",
         "no": "No",
         "none": "*none*",
         "official": "Official wiki:",

i18n/fr.json

@@ -307,7 +307,6 @@
         "image": "Image :",
         "inaccurate": "Les statistiques peuvent être inexactes",
         "manager": "Gestionnaire de wiki :",
-        "name": "Nom complet :",
         "no": "Non",
         "none": "*aucun*",
         "official": "Wiki officiel :",

i18n/hi.json

@@ -407,7 +407,6 @@
         "inaccurate": "आँकड़ें गलत भी हो सकते हैं",
         "lang": "भाषा:",
         "manager": "विकी मैनेजर:",
-        "name": "पूरा नाम:",
         "no": "नहीं",
         "none": "*नहीं है*",
         "official": "आधिकारिक विकी:",

i18n/nl.json

@@ -311,7 +311,6 @@
         "image": "Afbeelding:",
         "inaccurate": "Statistieken zijn mogelijk inaccuraat",
         "manager": "Wiki beheerder:",
-        "name": "Volledige naam:",
         "no": "Nee",
         "none": "*niemand*",
         "official": "Officiële wiki:",

i18n/pl.json

@@ -409,7 +409,6 @@
         "license": "Licencja:",
         "manager": "Menedżerzy wiki:",
         "misermode": "Tryb oszczędny (Miser mode):",
-        "name": "Pełna nazwa:",
         "no": "Nie",
         "none": "*brak*",
         "official": "Oficjalna wiki:",

i18n/pt-br.json

@@ -409,7 +409,6 @@
         "license": "Licença:",
         "manager": "Gerenciador da Wiki:",
         "misermode": "Modo avarento:",
-        "name": "Nome completo:",
         "no": "Não",
         "none": "*nenhum*",
         "official": "Wiki oficial:",

i18n/ru.json

@@ -407,7 +407,6 @@
         "inaccurate": "Статистика может быть неточной",
         "lang": "Язык:",
         "manager": "Руководитель вики:",
-        "name": "Полное название:",
         "no": "Нет",
         "none": "*нет*",
         "official": "Официальная вики:",

i18n/tr.json

@@ -407,7 +407,6 @@
         "lang": "Dil:",
         "license": "Lisans:",
         "manager": "Wiki yöneticisi:",
-        "name": "Tam isim:",
         "no": "Hayır",
         "none": "*hiçbiri*",
         "official": "Resmi wiki:",

i18n/zh-hans.json

@@ -405,7 +405,6 @@
         "image": "图像：",
         "inaccurate": "统计信息可能出错",
         "manager": "Wiki 经理 / 主管：",
-        "name": "全名：",
         "no": "否",
         "none": "*无*",
         "official": "官方 wiki：",

i18n/zh-hant.json

@@ -404,7 +404,6 @@
         "image": "圖片：",
         "inaccurate": "統計資料可能出錯",
         "manager": "Wiki 經理 / 主管：",
-        "name": "全名：",
         "no": "否",
         "none": "*無*",
         "official": "官方 wiki：",