Add Fandom post count to verification

cmds/eval.js

@@ -70,7 +70,7 @@ function checkWiki(wiki) {
 		return response;
 	} ).then( response => {
 		var body = response.body;
-		if ( response.statusCode !== 200 || !body?.query?.recentchanges ) {
+		if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.recentchanges ) {
 			return response.statusCode + ': Error while getting the recent changes: ' + body?.error?.info;
 		}
 		wiki.updateWiki(body.query.general);

cmds/rcscript.js

@@ -74,7 +74,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 				return response;
 			} ).then( response => {
 				var body = response.body;
-				if ( response.statusCode !== 200 || !body?.query?.allmessages || !body?.query?.general || !body?.query?.pages?.['-1'] ) {
+				if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages || !body?.query?.general || !body?.query?.pages?.['-1'] ) {
 					console.log( '- ' + response.statusCode + ': Error while testing the wiki: ' + body?.error?.info );
 					if ( reaction ) reaction.removeEmoji();
 					msg.reactEmoji('nowiki', true);
@@ -231,7 +231,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 					return response;
 				} ).then( response => {
 					var body = response.body;
-					if ( response.statusCode !== 200 || !body?.query?.allmessages || !body?.query?.general || !body?.query?.pages?.['-1'] ) {
+					if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages || !body?.query?.general || !body?.query?.pages?.['-1'] ) {
 						console.log( '- ' + response.statusCode + ': Error while testing the wiki: ' + body?.error?.info );
 						if ( reaction ) reaction.removeEmoji();
 						msg.reactEmoji('nowiki', true);

cmds/settings.js

@@ -100,7 +100,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 					return response;
 				} ).then( response => {
 					var body = response.body;
-					if ( response.statusCode !== 200 || !body?.query?.general || !body?.query?.extensions ) {
+					if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.general || !body?.query?.extensions ) {
 						console.log( '- ' + response.statusCode + ': Error while testing the wiki: ' + body?.error?.info );
 						if ( reaction ) reaction.removeEmoji();
 						msg.reactEmoji('nowiki', true);

cmds/verification.js

@@ -22,7 +22,7 @@ function cmd_verification(lang, msg, args, line, wiki) {
 		return msg.replyMsg( lang.get('general.missingperm') + ' `MANAGE_ROLES`' );
 	}
 	
-	db.all( 'SELECT configid, channel, role, editcount, usergroup, accountage, rename FROM verification WHERE guild = ? ORDER BY configid ASC', [msg.guild.id], (error, rows) => {
+	db.all( 'SELECT configid, channel, role, editcount, postcount, usergroup, accountage, rename FROM verification WHERE guild = ? ORDER BY configid ASC', [msg.guild.id], (error, rows) => {
 		if ( error || !rows ) {
 			console.log( '- Error while getting the verifications: ' + error );
 			msg.reactEmoji('error', true);
@@ -161,9 +161,12 @@ function cmd_verification(lang, msg, args, line, wiki) {
 					msg.sendChannel( '<@' + msg.author.id + '>, ' + lang.get('verification.updated') + formatVerification(), {split:true}, true );
 				} );
 			}
-			if ( ( args[1] === 'editcount' || args[1] === 'accountage' ) && /^\d+$/.test(args[2]) ) {
+			if ( ( ( args[1] === 'editcount' || args[1] === 'accountage' ) && /^\d+$/.test(args[2]) ) || ( args[1] === 'postcount' && /^(?:-?\d+|null)$/.test(args[2]) ) ) {
 				args[2] = parseInt(args[2], 10);
-				if ( args[2] > 1000000 ) return msg.replyMsg( lang.get('verification.value_too_high'), {}, true );
+				if ( isNaN(args[2]) ) args[2] = null;
+				if ( args[2] > 1000000 || args[2] < -1000000 ) {
+					return msg.replyMsg( lang.get('verification.value_too_high'), {}, true );
+				}
 				return db.run( 'UPDATE verification SET ' + args[1] + ' = ? WHERE guild = ? AND configid = ?', [args[2], msg.guild.id, row.configid], function (dberror) {
 					if ( dberror ) {
 						console.log( '- Error while updating the verification: ' + dberror );
@@ -187,7 +190,7 @@ function cmd_verification(lang, msg, args, line, wiki) {
 				if ( usergroups.length ) return msg.reactEmoji('⏳').then( reaction => got.get( wiki + 'api.php?action=query&meta=allmessages&amprefix=group-&amincludelocal=true&amenableparser=true&format=json' ).then( response => {
 					var body = response.body;
 					if ( body && body.warnings ) log_warn(body.warnings);
-					if ( response.statusCode !== 200 || !body || !body.query || !body.query.allmessages ) {
+					if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages ) {
 						if ( wiki.noWiki(response.url, response.statusCode) ) console.log( '- This wiki doesn\'t exist!' );
 						else console.log( '- ' + response.statusCode + ': Error while getting the usergroups: ' + ( body && body.error && body.error.info ) );
 						return;
@@ -238,6 +241,7 @@ function cmd_verification(lang, msg, args, line, wiki) {
 			channel = '|' + msg.channel.id + '|',
 			role,
 			editcount = 0,
+			postcount = 0,
 			usergroup = 'user',
 			accountage = 0,
 			rename = 0
@@ -247,8 +251,14 @@ function cmd_verification(lang, msg, args, line, wiki) {
 			if ( showCommands ) verification_text += '\n`' + prefix + 'verification ' + row.configid + ' channel ' + lang.get('verification.new_channel') + '`\n';
 			verification_text += '\n' + lang.get('verification.role') + ' <@&' + role.split('|').join('>, <@&') + '>';
 			if ( showCommands ) verification_text += '\n`' + prefix + 'verification ' + row.configid + ' role ' + lang.get('verification.new_role') + '`\n';
-			verification_text += '\n' + lang.get('verification.editcount') + ' `' + editcount + '`';
+			if ( postcount === null ) verification_text += '\n' + lang.get('verification.posteditcount') + ' `' + editcount + '`';
+			else verification_text += '\n' + lang.get('verification.editcount') + ' `' + editcount + '`';
 			if ( showCommands ) verification_text += '\n`' + prefix + 'verification ' + row.configid + ' editcount ' + lang.get('verification.new_editcount') + '`\n';
+			if ( postcount !== null ) {
+				verification_text += '\n' + lang.get('verification.postcount') + ' `' + Math.abs(postcount) + '`';
+				if ( postcount < 0 ) verification_text += ' ' + lang.get('verification.postcount_or');
+				if ( showCommands ) verification_text += '\n`' + prefix + 'verification ' + row.configid + ' postcount ' + ( postcount < 0 ? '-' : '' ) + lang.get('verification.new_postcount') + '`\n';
+			}
 			verification_text += '\n' + lang.get('verification.usergroup') + ' `' + ( usergroup.startsWith( 'AND|' ) ? usergroup.split('|').slice(1).join('` ' + lang.get('verification.and') + ' `') : usergroup.split('|').join('` ' + lang.get('verification.or') + ' `') ) + '`';
 			if ( showCommands ) verification_text += '\n`' + prefix + 'verification ' + row.configid + ' usergroup ' + lang.get('verification.new_usergroup') + '`\n';
 			verification_text += '\n' + lang.get('verification.accountage') + ' `' + accountage + '` ' + lang.get('verification.indays');

cmds/verify.js

@@ -31,7 +31,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 	if ( wiki.isGamepedia() ) username = username.replace( /^userprofile\s*:/i, '' );
 	
 	var embed = new MessageEmbed().setFooter( lang.get('verify.footer') ).setTimestamp();
-	db.all( 'SELECT role, editcount, usergroup, accountage, rename FROM verification WHERE guild = ? AND channel LIKE ? ORDER BY configid ASC', [msg.guild.id, '%|' + msg.channel.id + '|%'], (dberror, rows) => {
+	db.all( 'SELECT role, editcount, postcount, usergroup, accountage, rename FROM verification WHERE guild = ? AND channel LIKE ? ORDER BY configid ASC', [msg.guild.id, '%|' + msg.channel.id + '|%'], (dberror, rows) => {
 		if ( dberror || !rows ) {
 			console.log( '- Error while getting the verifications: ' + dberror );
 			embed.setColor('#000000').setDescription( lang.get('verify.error') );
@@ -51,7 +51,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 		msg.reactEmoji('⏳').then( reaction => got.get( wiki + 'api.php?action=query&meta=siteinfo&siprop=general&list=users&usprop=blockinfo|groups|editcount|registration&ususers=' + encodeURIComponent( username ) + '&format=json' ).then( response => {
 			var body = response.body;
 			if ( body && body.warnings ) log_warn(body.warnings);
-			if ( response.statusCode !== 200 || !body || !body.query || !body.query.users ) {
+			if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.users ) {
 				if ( wiki.noWiki(response.url, response.statusCode) ) {
 					console.log( '- This wiki doesn\'t exist!' );
 					msg.reactEmoji('nowiki');
@@ -137,15 +137,14 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 				comment.push(lang.get('verify.failed_gblock'));
 			} ).then( () => {
 				var discordname = '';
-				got.get( wiki + 'wikia.php?controller=UserProfile&method=getUserData&userId=' + queryuser.userid + '&format=json&cache=' + Date.now(), {
-					throwHttpErrors: true
-				} ).then( ucresponse => {
+				got.get( wiki + 'wikia.php?controller=UserProfile&method=getUserData&userId=' + queryuser.userid + '&format=json&cache=' + Date.now() ).then( ucresponse => {
 					var ucbody = ucresponse.body;
 					if ( ucresponse.statusCode !== 200 || !ucbody?.userData?.id ) {
-						console.log( '- ' + ucresponse.statusCode + ': Error while working around the edit count.' );
+						console.log( '- ' + ucresponse.statusCode + ': Error while getting the user profile.' );
 						return Promise.reject();
 					}
 					queryuser.editcount = ucbody.userData.localEdits;
+					queryuser.postcount = ucbody.userData.posts;
 					if ( ucbody.userData.discordHandle ) discordname = ucbody.userData.discordHandle.escapeFormatting().replace( /^\s*([^@#:]{2,32}?)\s*#(\d{4,6})\s*$/u, '$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 => {
@@ -160,34 +159,8 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 						return Promise.reject();
 					} );
 				}, ucerror => {
-					if ( body.query.general.generator.startsWith( 'MediaWiki 1.3' ) ) {
-						console.log( '- Error while working around the edit count: ' + ucerror );
-					}
-
-					var url = '';
-					var options = {};
-					if ( wiki.isGamepedia() ) {
-						url = wiki + 'api.php?action=profile&do=getPublicProfile&user_name=' + encodeURIComponent( username ) + '&format=json&cache=' + Date.now();
-					}
-					else if ( wiki.isFandom() ) {
-						url = 'https://services.fandom.com/user-attribute/user/' + queryuser.userid + '/attr/discordHandle?format=json&cache=' + Date.now();
-						options.headers = {Accept: 'application/hal+json'};
-					}
-					return got.get( url, options ).then( presponse => {
-						var pbody = presponse.body;
-						if ( presponse.statusCode !== 200 || !pbody || pbody.error || pbody.errormsg || pbody.title || !( pbody?.userData?.id || pbody.profile || pbody.value !== undefined ) ) {
-							if ( !( pbody && pbody.status === 404 ) ) {
-								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*$/u, '$1#$2' );
-						else if ( pbody.value ) discordname = pbody.value.escapeFormatting().replace( /^\s*([^@#:]{2,32}?)\s*#(\d{4,6})\s*$/u, '$1#$2' );
-					}, error => {
-						console.log( '- Error while getting the Discord tag: ' + error );
-						return Promise.reject();
-					} );
+					console.log( '- Error while getting the user profile: ' + ucerror );
+					return Promise.reject();
 				} ).then( () => {
 					if ( discordname.length > 100 ) discordname = discordname.substring(0, 100) + '\u2026';
 					embed.addField( lang.get('verify.discord', ( msg.author.tag.escapeFormatting() === discordname ? queryuser.gender : 'unknown' )), msg.author.tag.escapeFormatting(), true ).addField( lang.get('verify.wiki', queryuser.gender), ( discordname || lang.get('verify.empty') ), true );
@@ -209,12 +182,16 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 					var rename = false;
 					var accountage = ( Date.now() - new Date(queryuser.registration) ) / 86400000;
 					rows.forEach( row => {
-						var and_or = 'some';
+						let and_or = 'some';
 						if ( row.usergroup.startsWith( 'AND|' ) ) {
 							row.usergroup = row.usergroup.replace( 'AND|', '' );
 							and_or = 'every';
 						}
-						if ( queryuser.editcount >= row.editcount && row.usergroup.split('|')[and_or]( usergroup => queryuser.groups.includes( usergroup ) ) && accountage >= row.accountage && row.role.split('|').some( role => !roles.includes( role ) ) ) {
+						let matchEditcount = false;
+						if ( row.postcount === null ) matchEditcount = ( ( queryuser.editcount + queryuser.postcount ) >= row.editcount );
+						else if ( row.postcount < 0 ) matchEditcount = ( queryuser.editcount >= row.editcount || queryuser.postcount >= Math.abs(row.postcount) );
+						else matchEditcount = ( queryuser.editcount >= row.editcount && queryuser.postcount >= row.postcount );
+						if ( matchEditcount && row.usergroup.split('|')[and_or]( usergroup => queryuser.groups.includes( usergroup ) ) && accountage >= row.accountage && row.role.split('|').some( role => !roles.includes( role ) ) ) {
 							verified = true;
 							if ( row.rename ) rename = true;
 							row.role.split('|').forEach( role => {
@@ -280,7 +257,7 @@ function cmd_verify(lang, msg, args, line, wiki, old_username = '') {
 			got.get( wiki + 'api.php?action=query' + ( wiki.hasCentralAuth() ? '&meta=globaluserinfo&guiprop=groups&guiuser=' + encodeURIComponent( username ) : '' ) + '&prop=revisions&rvprop=content|user&rvslots=main&titles=User:' + encodeURIComponent( username ) + '/Discord&format=json' ).then( mwresponse => {
 				var mwbody = mwresponse.body;
 				if ( mwbody && mwbody.warnings ) log_warn(mwbody.warnings);
-				if ( mwresponse.statusCode !== 200 || !mwbody || mwbody.batchcomplete === undefined || !mwbody.query || !mwbody.query.pages ) {
+				if ( mwresponse.statusCode !== 200 || mwbody?.batchcomplete === undefined || !mwbody?.query?.pages ) {
 					console.log( '- ' + mwresponse.statusCode + ': Error while getting the Discord tag: ' + ( mwbody && mwbody.error && mwbody.error.info ) );
 					embed.setColor('#000000').setDescription( lang.get('verify.error') );
 					msg.replyMsg( lang.get('verify.error_reply'), {embed}, false, false ).then( message => message.reactEmoji('error') );

dashboard/i18n/en.json

@@ -182,6 +182,11 @@
             "entry": "Verification #$1",
             "more": "Add more",
             "new": "New Verification",
+            "postcount": "Minimal post count:",
+            "postcount_and": "Require both edit and post count.",
+            "postcount_both": "Require combined edit and post count.",
+            "postcount_fandom": "Only Fandom wikis:",
+            "postcount_or": "Require either edit or post count.",
             "rename": "Rename users:",
             "role": "Role:",
             "select_channel": "-- Select a Channel --",

dashboard/oauth.js

@@ -246,7 +246,7 @@ function dashboard_api(res, input) {
 		return response;
 	} ).then( response => {
 		var body = response.body;
-		if ( response.statusCode !== 200 || !body?.query?.allmessages || !body?.query?.general || !body?.query?.extensions ) {
+		if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages || !body?.query?.general || !body?.query?.extensions ) {
 			console.log( '- Dashboard: ' + response.statusCode + ': Error while checking the wiki: ' + body?.error?.info );
 			result.error = true;
 			return;

dashboard/rcscript.js

@@ -342,7 +342,7 @@ function update_rcscript(res, userSettings, guild, type, settings) {
 				return fresponse;
 			} ).then( fresponse => {
 				var body = fresponse.body;
-				if ( fresponse.statusCode !== 200 || !body?.query?.allmessages || !body?.query?.general || !body?.query?.pages?.['-1'] ) {
+				if ( fresponse.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages || !body?.query?.general || !body?.query?.pages?.['-1'] ) {
 					console.log( '- Dashboard: ' + fresponse.statusCode + ': Error while testing the wiki: ' + body?.error?.info );
 					return res(`/guild/${guild}/rcscript/new`, 'savefail');
 				}
@@ -556,7 +556,7 @@ function update_rcscript(res, userSettings, guild, type, settings) {
 					return fresponse;
 				} ).then( fresponse => {
 					var body = fresponse.body;
-					if ( fresponse.statusCode !== 200 || !body?.query?.allmessages || !body?.query?.general ) {
+					if ( fresponse.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages || !body?.query?.general ) {
 						console.log( '- Dashboard: ' + fresponse.statusCode + ': Error while testing the wiki: ' + body?.error?.info );
 						return res(`/guild/${guild}/rcscript/${type}`, 'savefail');
 					}

dashboard/settings.js

@@ -371,7 +371,7 @@ function update_settings(res, userSettings, guild, type, settings) {
 						return reject();
 					}
 					var body = fresponse.body;
-					if ( fresponse.statusCode !== 200 || !body?.query?.general || !body?.query?.extensions ) {
+					if ( fresponse.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.general || !body?.query?.extensions ) {
 						console.log( '- Dashboard: ' + fresponse.statusCode + ': Error while testing the wiki: ' + body?.error?.info );
 						if ( row?.wiki === wiki.href ) return resolve(row);
 						return reject();

dashboard/src/index.css

@@ -365,6 +365,7 @@ fieldset input:invalid {
 }
 .wb-settings-display:not(:first-of-type),
 .wb-settings-additional-select,
+.wb-settings-postcount:not(:nth-of-type(2)),
 #wb-settings-wiki-check-notice,
 button.addmore:not([hidden]) {
 	display: block;

dashboard/src/index.js

@@ -288,6 +288,21 @@ if ( usergroup ) {
 	} );
 }
 
+const postcount = document.querySelectorAll('.wb-settings-postcount input');
+if ( postcount.length ) {
+	const postcountinput = document.getElementById('wb-settings-postcount-input');
+	postcount.forEach( function(radio) {
+		radio.addEventListener( 'change', function() {
+			if ( radio.id === 'wb-settings-postcount-both' ) {
+				postcountinput.setAttribute('style', 'display: none;');
+			}
+			else {
+				postcountinput.removeAttribute('style');
+			}
+		} );
+	} );
+}
+
 const prefix = document.getElementById('wb-settings-prefix');
 if ( prefix ) prefix.addEventListener( 'input', function() {
 	if ( prefix.validity.patternMismatch ) {

dashboard/verification.js

@@ -24,9 +24,23 @@ const fieldset = {
 	+ '<input type="checkbox" id="wb-settings-usergroup-and" name="usergroup_and">'
 	+ '</div>',
 	editcount: '<label for="wb-settings-editcount">Minimal edit count:</label>'
-	+ '<input type="number" id="wb-settings-editcount" name="editcount" min="0" required>',
+	+ '<input type="number" id="wb-settings-editcount" name="editcount" min="0" max="1000000" required>',
+	postcount: '<div id="wb-settings-postcount-input">'
+	+ '<label for="wb-settings-postcount">Minimal post count:</label>'
+	+ '<input type="number" id="wb-settings-postcount" name="postcount" min="0" max="1000000" required>'
+	+ '</div><div class="wb-settings-postcount">'
+	+ '<span>Only Fandom wikis:</span>'
+	+ '<input type="radio" id="wb-settings-postcount-and" name="posteditcount" value="and" required>'
+	+ '<label for="wb-settings-postcount-and">Require both edit and post count.</label>'
+	+ '</div><div class="wb-settings-postcount">'
+	+ '<input type="radio" id="wb-settings-postcount-or" name="posteditcount" value="or" required>'
+	+ '<label for="wb-settings-postcount-or">Require either edit or post count.</label>'
+	+ '</div><div class="wb-settings-postcount">'
+	+ '<input type="radio" id="wb-settings-postcount-both" name="posteditcount" value="both" required>'
+	+ '<label for="wb-settings-postcount-both">Require combined edit and post count.</label>'
+	+ '</div>',
 	accountage: '<label for="wb-settings-accountage">Account age (in days):</label>'
-	+ '<input type="number" id="wb-settings-accountage" name="accountage" min="0" required>',
+	+ '<input type="number" id="wb-settings-accountage" name="accountage" min="0" max="1000000" required>',
 	rename: '<label for="wb-settings-rename">Rename users:</label>'
 	+ '<input type="checkbox" id="wb-settings-rename" name="rename">',
 	save: '<input type="submit" id="wb-settings-save" name="save_settings">',
@@ -43,6 +57,7 @@ const fieldset = {
  * @param {String} settings.role
  * @param {String} settings.usergroup
  * @param {Number} settings.editcount
+ * @param {Number} settings.postcount
  * @param {Number} settings.accountage
  * @param {Boolean} settings.rename
  * @param {String} [settings.defaultrole]
@@ -157,6 +172,20 @@ function createForm($, header, dashboardLang, settings, guildChannels, guildRole
 	editcount.find('label').text(dashboardLang.get('verification.form.editcount'));
 	editcount.find('#wb-settings-editcount').val(settings.editcount);
 	fields.push(editcount);
+	let postcount = $('<div>').append(fieldset.postcount);
+	postcount.find('label').eq(0).text(dashboardLang.get('verification.form.postcount'));
+	postcount.find('span').text(dashboardLang.get('verification.form.postcount_fandom'));
+	postcount.find('label').eq(1).text(dashboardLang.get('verification.form.postcount_and'));
+	postcount.find('label').eq(2).text(dashboardLang.get('verification.form.postcount_or'));
+	postcount.find('label').eq(3).text(dashboardLang.get('verification.form.postcount_both'));
+	postcount.find('#wb-settings-postcount').val(Math.abs(settings.postcount));
+	if ( settings.postcount === null ) {
+		postcount.find('#wb-settings-postcount-both').attr('checked', '');
+		postcount.find('#wb-settings-postcount-input').attr('style', 'display: none;');
+	}
+	else if ( settings.postcount < 0 ) postcount.find('#wb-settings-postcount-or').attr('checked', '');
+	else postcount.find('#wb-settings-postcount-and').attr('checked', '');
+	fields.push(postcount);
 	let accountage = $('<div>').append(fieldset.accountage);
 	accountage.find('label').text(dashboardLang.get('verification.form.accountage'));
 	accountage.find('#wb-settings-accountage').val(settings.accountage);
@@ -195,7 +224,7 @@ function createForm($, header, dashboardLang, settings, guildChannels, guildRole
  * @param {import('./i18n.js')} dashboardLang - The user language
  */
 function dashboard_verification(res, $, guild, args, dashboardLang) {
-	db.all( 'SELECT wiki, discord.role defaultrole, prefix, configid, verification.channel, verification.role, editcount, usergroup, accountage, rename FROM discord LEFT JOIN verification ON discord.guild = verification.guild WHERE discord.guild = ? AND discord.channel IS NULL ORDER BY configid ASC', [guild.id], function(dberror, rows) {
+	db.all( 'SELECT wiki, discord.role defaultrole, prefix, configid, verification.channel, verification.role, editcount, postcount, usergroup, accountage, rename FROM discord LEFT JOIN verification ON discord.guild = verification.guild WHERE discord.guild = ? AND discord.channel IS NULL ORDER BY configid ASC', [guild.id], function(dberror, rows) {
 		if ( dberror ) {
 			console.log( '- Dashboard: Error while getting the verifications: ' + dberror );
 			createNotice($, 'error', dashboardLang);
@@ -254,7 +283,8 @@ function dashboard_verification(res, $, guild, args, dashboardLang) {
 			$('.channel#channel-new').addClass('selected');
 			createForm($, dashboardLang.get('verification.form.new'), dashboardLang, {
 				channel: '', role: '', usergroup: 'user',
-				editcount: 0, accountage: 0, rename: false, defaultrole
+				editcount: 0, postcount: 0, accountage: 0,
+				rename: false, defaultrole
 			}, guild.channels, guild.roles).attr('action', `/guild/${guild.id}/verification/new`).appendTo('#text');
 		}
 		else if ( rows.some( row => row.configid.toString() === args[4] ) ) {
@@ -286,6 +316,8 @@ function dashboard_verification(res, $, guild, args, dashboardLang) {
  * @param {String[]} [settings.usergroup]
  * @param {String} [settings.usergroup_and]
  * @param {Number} settings.editcount
+ * @param {Number} [settings.postcount]
+ * @param {String} settings.posteditcount
  * @param {Number} settings.accountage
  * @param {String} [settings.rename]
  * @param {String} [settings.save_settings]
@@ -305,6 +337,9 @@ function update_verification(res, userSettings, guild, type, settings) {
 		if ( !/^\d+ \d+$/.test(`${settings.editcount} ${settings.accountage}`) ) {
 			return res(`/guild/${guild}/verification/${type}`, 'savefail');
 		}
+		if ( !( ['and','or','both'].includes( settings.posteditcount ) && ( /^\d+$/.test(settings.postcount) || settings.posteditcount === 'both' ) ) ) {
+			return res(`/guild/${guild}/verification/${type}`, 'savefail');
+		}
 		settings.channel = settings.channel.split('|').filter( (channel, i, self) => {
 			return ( channel.length && self.indexOf(channel) === i );
 		} );
@@ -331,6 +366,15 @@ function update_verification(res, userSettings, guild, type, settings) {
 		} ) ) return res(`/guild/${guild}/verification/${type}`, 'invalidusergroup');
 		settings.editcount = parseInt(settings.editcount, 10);
 		settings.accountage = parseInt(settings.accountage, 10);
+		if ( settings.editcount > 1000000 || settings.accountage > 1000000 ) {
+			return res(`/guild/${guild}/verification/${type}`, 'savefail');
+		}
+		if ( settings.posteditcount === 'both' ) settings.postcount = null;
+		else settings.postcount = parseInt(settings.postcount, 10);
+		if ( settings.posteditcount === 'or' ) settings.postcount = settings.postcount * -1;
+		if ( settings.postcount > 1000000 || settings.postcount < -1000000 ) {
+			return res(`/guild/${guild}/verification/${type}`, 'savefail');
+		}
 		if ( type === 'new' ) {
 			let curGuild = userSettings.guilds.isMember.get(guild);
 			if ( settings.channel.some( channel => {
@@ -362,7 +406,7 @@ function update_verification(res, userSettings, guild, type, settings) {
 			userSettings.guilds.isMember.delete(guild);
 			return res('/', 'savefail');
 		}
-		if ( settings.delete_settings ) return db.get( 'SELECT lang, verification.channel, verification.role, editcount, usergroup, accountage, rename FROM discord LEFT JOIN verification ON discord.guild = verification.guild AND configid = ? WHERE discord.guild = ? AND discord.channel IS NULL', [type, guild], function(dberror, row) {
+		if ( settings.delete_settings ) return db.get( 'SELECT lang, verification.channel, verification.role, editcount, postcount, usergroup, accountage, rename FROM discord LEFT JOIN verification ON discord.guild = verification.guild AND configid = ? WHERE discord.guild = ? AND discord.channel IS NULL', [type, guild], function(dberror, row) {
 			if ( !dberror && !row?.channel ) return res(`/guild/${guild}/verification`, 'save');
 			db.run( 'DELETE FROM verification WHERE guild = ? AND configid = ?', [guild, type], function (delerror) {
 				if ( delerror ) {
@@ -380,7 +424,14 @@ function update_verification(res, userSettings, guild, type, settings) {
 				if ( row ) {
 					text += '\n' + lang.get('verification.channel') + ' <#' + row.channel.split('|').filter( channel => channel.length ).join('>, <#') + '>';
 					text += '\n' + lang.get('verification.role') + ' <@&' + row.role.split('|').join('>, <@&') + '>';
-					text += '\n' + lang.get('verification.editcount') + ' `' + row.editcount + '`';
+					if ( row.postcount === null ) {
+						text += '\n' + lang.get('verification.posteditcount') + ' `' + row.editcount + '`';
+					}
+					else {
+						text += '\n' + lang.get('verification.editcount') + ' `' + row.editcount + '`';
+						text += '\n' + lang.get('verification.postcount') + ' `' + Math.abs(row.postcount) + '`';
+						if ( row.postcount < 0 ) text += ' ' + lang.get('verification.postcount_or');
+					}
 					text += '\n' + lang.get('verification.usergroup') + ' `' + ( row.usergroup.startsWith( 'AND|' ) ? row.usergroup.split('|').slice(1).join('` ' + lang.get('verification.and') + ' `') : row.usergroup.split('|').join('` ' + lang.get('verification.or') + ' `') ) + '`';
 					text += '\n' + lang.get('verification.accountage') + ' `' + row.accountage + '` ' + lang.get('verification.indays');
 					text += '\n' + lang.get('verification.rename') + ' *`' + lang.get('verification.' + ( row.rename ? 'enabled' : 'disabled')) + '`*';
@@ -409,7 +460,7 @@ function update_verification(res, userSettings, guild, type, settings) {
 			}
 			return got.get( row.wiki + 'api.php?action=query&meta=allmessages&amprefix=group-&amincludelocal=true&amenableparser=true&format=json' ).then( gresponse => {
 				var body = gresponse.body;
-				if ( gresponse.statusCode !== 200 || !body || !body.query || !body.query.allmessages ) {
+				if ( gresponse.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages ) {
 					console.log( '- Dashboard: ' + gresponse.statusCode + ': Error while getting the usergroups: ' + body?.error?.info );
 					return;
 				}
@@ -442,7 +493,7 @@ function update_verification(res, userSettings, guild, type, settings) {
 					if ( configid === i ) configid++;
 					else break;
 				}
-				db.run( 'INSERT INTO verification(guild, configid, channel, role, editcount, usergroup, accountage, rename) VALUES(?, ?, ?, ?, ?, ?, ?, ?)', [guild, configid, '|' + settings.channel.join('|') + '|', settings.role.join('|'), settings.editcount, settings.usergroup.join('|'), settings.accountage, ( settings.rename ? 1 : 0 )], function (dberror) {
+				db.run( 'INSERT INTO verification(guild, configid, channel, role, editcount, postcount, usergroup, accountage, rename) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?)', [guild, configid, '|' + settings.channel.join('|') + '|', settings.role.join('|'), settings.editcount, settings.postcount, settings.usergroup.join('|'), settings.accountage, ( settings.rename ? 1 : 0 )], function (dberror) {
 					if ( dberror ) {
 						console.log( '- Dashboard: Error while adding the verification: ' + dberror );
 						return res(`/guild/${guild}/verification/new`, 'savefail');
@@ -453,7 +504,14 @@ function update_verification(res, userSettings, guild, type, settings) {
 					var text = lang.get('verification.dashboard.added', `<@${userSettings.user.id}>`, configid);
 					text += '\n' + lang.get('verification.channel') + ' <#' + settings.channel.join('>, <#') + '>';
 					text += '\n' + lang.get('verification.role') + ' <@&' + settings.role.join('>, <@&') + '>';
-					text += '\n' + lang.get('verification.editcount') + ' `' + settings.editcount + '`';
+					if ( settings.postcount === null ) {
+						text += '\n' + lang.get('verification.posteditcount') + ' `' + settings.editcount + '`';
+					}
+					else {
+						text += '\n' + lang.get('verification.editcount') + ' `' + settings.editcount + '`';
+						text += '\n' + lang.get('verification.postcount') + ' `' + Math.abs(settings.postcount) + '`';
+						if ( settings.postcount < 0 ) text += ' ' + lang.get('verification.postcount_or');
+					}
 					text += '\n' + lang.get('verification.usergroup') + ' `' + ( settings.usergroup_and ? settings.usergroup.slice(1).join('` ' + lang.get('verification.and') + ' `') : settings.usergroup.join('` ' + lang.get('verification.or') + ' `') ) + '`';
 					text += '\n' + lang.get('verification.accountage') + ' `' + settings.accountage + '` ' + lang.get('verification.indays');
 					text += '\n' + lang.get('verification.rename') + ' *`' + lang.get('verification.' + ( settings.rename ? 'enabled' : 'disabled')) + '`*';
@@ -488,7 +546,7 @@ function update_verification(res, userSettings, guild, type, settings) {
 				} );
 			} );
 		} );
-		return db.get( 'SELECT wiki, lang, verification.channel, verification.role, editcount, usergroup, accountage, rename FROM discord LEFT JOIN verification ON discord.guild = verification.guild AND verification.configid = ? WHERE discord.guild = ? AND discord.channel IS NULL', [type, guild], function(curerror, row) {
+		return db.get( 'SELECT wiki, lang, verification.channel, verification.role, editcount, postcount, usergroup, accountage, rename FROM discord LEFT JOIN verification ON discord.guild = verification.guild AND verification.configid = ? WHERE discord.guild = ? AND discord.channel IS NULL', [type, guild], function(curerror, row) {
 			if ( curerror ) {
 				console.log( '- Dashboard: Error while checking for verifications: ' + curerror );
 				return res(`/guild/${guild}/verification/${type}`, 'savefail');
@@ -514,7 +572,7 @@ function update_verification(res, userSettings, guild, type, settings) {
 			}
 			( newUsergroup.length ? got.get( row.wiki + 'api.php?action=query&meta=allmessages&amprefix=group-&amincludelocal=true&amenableparser=true&format=json' ).then( gresponse => {
 				var body = gresponse.body;
-				if ( gresponse.statusCode !== 200 || !body || !body.query || !body.query.allmessages ) {
+				if ( gresponse.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query?.allmessages ) {
 					console.log( '- Dashboard: ' + gresponse.statusCode + ': Error while getting the usergroups: ' + body?.error?.info );
 					return;
 				}
@@ -554,8 +612,29 @@ function update_verification(res, userSettings, guild, type, settings) {
 				} ) ) {
 					diff.push(lang.get('verification.role') + ` ~~<@&${row.role.join('>, <@&')}>~~ → <@&${settings.role.join('>, <@&')}>`);
 				}
-				if ( row.editcount !== settings.editcount ) {
-					diff.push(lang.get('verification.editcount') + ` ~~\`${row.editcount}\`~~ → \`${settings.editcount}\``);
+				if ( row.postcount !== settings.postcount && ( row.postcount === null || settings.postcount === null ) ) {
+					if ( row.postcount === null ) {
+						diff.push('~~' + lang.get('verification.posteditcount') + ` \`${row.editcount}\`~~`);
+						diff.push('→ ' + lang.get('verification.editcount') + ` \`${settings.editcount}\``);
+						diff.push('→ ' + lang.get('verification.postcount') + ` \`${Math.abs(settings.postcount)}\`` + ( settings.postcount < 0 ? ' ' + lang.get('verification.postcount_or') : '' ));
+					}
+					if ( settings.postcount === null ) {
+						diff.push('~~' + lang.get('verification.editcount') + ` \`${row.editcount}\`~~`);
+						diff.push('~~' + lang.get('verification.postcount') + ` \`${Math.abs(row.postcount)}\`` + ( row.postcount < 0 ? ' ' + lang.get('verification.postcount_or') : '' ) + '~~');
+						diff.push('→ ' + lang.get('verification.posteditcount') + ` \`${settings.editcount}\``);
+					}
+				}
+				else {
+					if ( row.editcount !== settings.editcount ) {
+						diff.push(lang.get('verification.editcount') + ` ~~\`${row.editcount}\`~~ → \`${settings.editcount}\``);
+					}
+					if ( row.postcount !== settings.postcount ) {
+						if ( ( row.postcount >= 0 && settings.postcount < 0 ) || ( row.postcount < 0 && settings.postcount >= 0 ) ) {
+							diff.push('~~' + lang.get('verification.postcount') + ` \`${Math.abs(row.postcount)}\`` + ( row.postcount < 0 ? ' ' + lang.get('verification.postcount_or') : '' ) + '~~');
+							diff.push('→ ' + lang.get('verification.postcount') + ` \`${Math.abs(settings.postcount)}\`` + ( settings.postcount < 0 ? ' ' + lang.get('verification.postcount_or') : '' ));
+						}
+						else diff.push(lang.get('verification.postcount') + ` ~~\`${Math.abs(row.postcount)}\`~~ → \`${Math.abs(settings.postcount)}\`` + ( settings.postcount < 0 ? ' ' + lang.get('verification.postcount_or') : '' ));
+					}
 				}
 				if ( newUsergroup.length || row.usergroup.some( usergroup => {
 					return !settings.usergroup.includes( usergroup );
@@ -569,7 +648,7 @@ function update_verification(res, userSettings, guild, type, settings) {
 					diff.push(lang.get('verification.rename') + ` ~~*\`${lang.get('verification.' + ( row.rename ? 'enabled' : 'disabled'))}\`*~~ → *\`${lang.get('verification.' + ( settings.rename ? 'enabled' : 'disabled'))}\`*`);
 				}
 				if ( !diff.length ) return res(`/guild/${guild}/verification/${type}`, 'save');
-				db.run( 'UPDATE verification SET channel = ?, role = ?, editcount = ?, usergroup = ?, accountage = ?, rename = ? WHERE guild = ? AND configid = ?', ['|' + settings.channel.join('|') + '|', settings.role.join('|'), settings.editcount, settings.usergroup.join('|'), settings.accountage, ( settings.rename ? 1 : 0 ), guild, type], function (dberror) {
+				db.run( 'UPDATE verification SET channel = ?, role = ?, editcount = ?, postcount = ?, usergroup = ?, accountage = ?, rename = ? WHERE guild = ? AND configid = ?', ['|' + settings.channel.join('|') + '|', settings.role.join('|'), settings.editcount, settings.postcount, settings.usergroup.join('|'), settings.accountage, ( settings.rename ? 1 : 0 ), guild, type], function (dberror) {
 					if ( dberror ) {
 						console.log( '- Dashboard: Error while updating the verification: ' + dberror );
 						return res(`/guild/${guild}/verification/${type}`, 'savefail');

database.js

@@ -61,6 +61,7 @@ CREATE TABLE verification (
     role       TEXT    NOT NULL,
     editcount  INTEGER NOT NULL
                        DEFAULT [0],
+    postcount  INTEGER DEFAULT [0],
     usergroup  TEXT    NOT NULL
                        DEFAULT [user],
     accountage INTEGER NOT NULL
@@ -122,8 +123,9 @@ CREATE INDEX idx_blocklist_wiki ON blocklist (
 );
 
 COMMIT TRANSACTION;
-PRAGMA user_version = 2;
-`, `
+PRAGMA user_version = 3;
+`,
+`
 BEGIN TRANSACTION;
 
 PRAGMA foreign_keys = OFF;
@@ -190,6 +192,67 @@ CREATE INDEX idx_rcgcdw_config ON rcgcdw (
 
 COMMIT TRANSACTION;
 PRAGMA user_version = 2;
+`,
+`
+BEGIN TRANSACTION;
+
+PRAGMA foreign_keys = OFF;
+
+CREATE TABLE verification_temp_table AS SELECT * FROM verification;
+
+DROP TABLE verification;
+
+CREATE TABLE verification (
+    guild      TEXT    NOT NULL
+                       REFERENCES discord (main) ON DELETE CASCADE,
+    configid   INTEGER NOT NULL,
+    channel    TEXT    NOT NULL,
+    role       TEXT    NOT NULL,
+    editcount  INTEGER NOT NULL
+                       DEFAULT [0],
+    postcount  INTEGER DEFAULT [0],
+    usergroup  TEXT    NOT NULL
+                       DEFAULT [user],
+    accountage INTEGER NOT NULL
+                       DEFAULT [0],
+    rename     INTEGER NOT NULL
+                       DEFAULT [0],
+    UNIQUE (
+        guild,
+        configid
+    )
+);
+
+INSERT INTO verification (
+    guild,
+    configid,
+    channel,
+    role,
+    editcount,
+    usergroup,
+    accountage,
+    rename
+)
+SELECT guild,
+       configid,
+       channel,
+       role,
+       editcount,
+       usergroup,
+       accountage,
+       rename
+FROM verification_temp_table;
+
+DROP TABLE verification_temp_table;
+
+CREATE INDEX idx_verification_config ON verification (
+    guild,
+    configid ASC,
+    channel
+);
+
+COMMIT TRANSACTION;
+PRAGMA user_version = 3;
 `];
 
 module.exports = new Promise( (resolve, reject) => {

functions/special_page.js

@@ -145,7 +145,7 @@ function special_page(lang, msg, title, specialpage, embed, wiki, reaction, spoi
 	got.get( wiki + 'api.php?action=query&meta=allmessages|siteinfo&siprop=general&amenableparser=true&amtitle=' + encodeURIComponent( title ) + '&ammessages=' + ( descriptions.hasOwnProperty(specialpage) ? descriptions[specialpage] : encodeURIComponent( specialpage ) + '-summary' ) + ( querypages.hasOwnProperty(specialpage) ? querypages[specialpage][0] : '' ) + '&format=json' ).then( response => {
 		var body = response.body;
 		if ( body && body.warnings ) log_warn(body.warnings);
-		if ( response.statusCode !== 200 || !body ) {
+		if ( response.statusCode !== 200 || body?.batchcomplete === undefined ) {
 			console.log( '- ' + response.statusCode + ': Error while getting the special page: ' + ( body && body.error && body.error.info ) );
 		}
 		else {

i18n/en.json

@@ -754,10 +754,14 @@
         "new_accountage": "<new account age>",
         "new_channel": "<new channel>",
         "new_editcount": "<new edit count>",
+        "new_postcount": "<new post count>",
         "new_role": "<new role>",
         "new_usergroup": "<new user group>",
         "no_role": "please provide a role for the new verification.",
         "or": "or",
+        "postcount": "Post count (only Fandom wikis):",
+        "postcount_or": "(alternative to edit count)",
+        "posteditcount": "Edit and post count combined:",
         "rename": "Change nickname:",
         "rename_no_permission": "**$1 is missing the `Manage Nicknames` permission to force wiki usernames!**",
         "role": "Role:",

util/newMessage.js

@@ -156,7 +156,7 @@ function newMessage(msg, lang, wiki = defaultSettings.wiki, prefix = process.env
 	
 		if ( links.length ) got.get( wiki + 'api.php?action=query&meta=siteinfo&siprop=general&iwurl=true&titles=' + encodeURIComponent( links.map( link => link.title ).join('|') ) + '&format=json' ).then( response => {
 			var body = response.body;
-			if ( response.statusCode !== 200 || !body || !body.query ) {
+			if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query ) {
 				if ( wiki.noWiki(response.url, response.statusCode) ) {
 					console.log( '- This wiki doesn\'t exist!' );
 					msg.reactEmoji('nowiki');
@@ -209,7 +209,7 @@ function newMessage(msg, lang, wiki = defaultSettings.wiki, prefix = process.env
 		
 		if ( embeds.length ) got.get( wiki + 'api.php?action=query&meta=siteinfo&siprop=general' + ( wiki.isFandom() ? '' : '|variables' ) + '&titles=' + encodeURIComponent( embeds.map( embed => embed.title + '|Template:' + embed.title ).join('|') ) + '&format=json' ).then( response => {
 			var body = response.body;
-			if ( response.statusCode !== 200 || !body || !body.query ) {
+			if ( response.statusCode !== 200 || body?.batchcomplete === undefined || !body?.query ) {
 				if ( wiki.noWiki(response.url, response.statusCode) ) {
 					console.log( '- This wiki doesn\'t exist!' );
 					msg.reactEmoji('nowiki');