From b78030337d873b9ed024cd28754179b824e3bb18 Mon Sep 17 00:00:00 2001
From: NovemLinguae <novemlinguae@gmail.com>
Date: Thu, 21 Nov 2024 01:51:20 -0800
Subject: [PATCH] arrow-body-style

---
 modules/twinklearv.js           | 32 ++++++----------------
 modules/twinklebatchdelete.js   | 40 +++++++--------------------
 modules/twinklebatchprotect.js  | 18 +++++--------
 modules/twinklebatchundelete.js | 12 +++------
 modules/twinkleblock.js         | 32 ++++++----------------
 modules/twinkledeprod.js        |  4 +--
 modules/twinkleprotect.js       | 38 ++++++++++++--------------
 modules/twinklespeedy.js        | 36 +++++++------------------
 modules/twinkletag.js           | 20 ++++----------
 modules/twinklewarn.js          |  4 +--
 modules/twinklewelcome.js       |  6 ++---
 morebits.js                     | 48 +++++++++------------------------
 12 files changed, 83 insertions(+), 207 deletions(-)

diff --git a/modules/twinklearv.js b/modules/twinklearv.js
index 6dbdc266b..9c62fa7ea 100644
--- a/modules/twinklearv.js
+++ b/modules/twinklearv.js
@@ -669,9 +669,7 @@ Twinkle.arv.callback.evaluate = function(e) {
 			}
 
 			sockParameters.uid = puppetReport ? form.sockmaster.value.trim() : uid;
-			sockParameters.sockpuppets = puppetReport ? [uid] : Morebits.array.uniq($.map($('input:text[name=sockpuppet]', form), (o) => {
-				return $(o).val() || null;
-			}));
+			sockParameters.sockpuppets = puppetReport ? [uid] : Morebits.array.uniq($.map($('input:text[name=sockpuppet]', form), (o) => $(o).val() || null));
 
 			Morebits.simpleWindow.setButtonsEnabled(false);
 			Morebits.status.init(form);
@@ -679,25 +677,19 @@ Twinkle.arv.callback.evaluate = function(e) {
 			break;
 
 		case 'an3':
-			var diffs = $.map($('input:checkbox[name=s_diffs]:checked', form), (o) => {
-				return $(o).data('revinfo');
-			});
+			var diffs = $.map($('input:checkbox[name=s_diffs]:checked', form), (o) => $(o).data('revinfo'));
 
 			if (diffs.length < 3 && !confirm('You have selected fewer than three offending edits. Do you wish to make the report anyway?')) {
 				return;
 			}
 
-			var warnings = $.map($('input:checkbox[name=s_warnings]:checked', form), (o) => {
-				return $(o).data('revinfo');
-			});
+			var warnings = $.map($('input:checkbox[name=s_warnings]:checked', form), (o) => $(o).data('revinfo'));
 
 			if (!warnings.length && !confirm('You have not selected any edits where you warned the offender. Do you wish to make the report anyway?')) {
 				return;
 			}
 
-			var resolves = $.map($('input:checkbox[name=s_resolves]:checked', form), (o) => {
-				return $(o).data('revinfo');
-			});
+			var resolves = $.map($('input:checkbox[name=s_resolves]:checked', form), (o) => $(o).data('revinfo'));
 			var free_resolves = $('input[name=s_resolves_free]').val();
 
 			var an3_next = function(free_resolves) {
@@ -817,9 +809,7 @@ Twinkle.arv.processSock = function(params) {
 
 	// prepare the SPI report
 	let text = '\n{{subst:SPI report|' +
-		params.sockpuppets.map((sock, index) => {
-			return (index + 1) + '=' + sock;
-		}).join('|') + '\n|evidence=' + params.evidence + ' \n';
+		params.sockpuppets.map((sock, index) => (index + 1) + '=' + sock).join('|') + '\n|evidence=' + params.evidence + ' \n';
 
 	if (params.checkuser) {
 		text += '|checkuser=yes';
@@ -914,17 +904,11 @@ Twinkle.arv.processAN3 = function(params) {
 				const label = 'Consecutive edits made from ' + new Morebits.date(first.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC) to ' + new Morebits.date(last.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)';
 				ret = '# {{diff|oldid=' + first.parentid + '|diff=' + last.revid + '|label=' + label + '}}\n';
 			}
-			ret += sub.reverse().map((v) => {
-				return (sub.length >= 2 ? '#' : '') + '# {{diff2|' + v.revid + '|' + new Morebits.date(v.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)}} ' + hasHiddenComment(v);
-			}).join('\n');
+			ret += sub.reverse().map((v) => (sub.length >= 2 ? '#' : '') + '# {{diff2|' + v.revid + '|' + new Morebits.date(v.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)}} ' + hasHiddenComment(v)).join('\n');
 			return ret;
 		}).reverse().join('\n');
-		const warningtext = params.warnings.reverse().map((v) => {
-			return '# ' + ' {{diff2|' + v.revid + '|' + new Morebits.date(v.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)}} ' + hasHiddenComment(v);
-		}).join('\n');
-		let resolvetext = params.resolves.reverse().map((v) => {
-			return '# ' + ' {{diff2|' + v.revid + '|' + new Morebits.date(v.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)}} ' + hasHiddenComment(v);
-		}).join('\n');
+		const warningtext = params.warnings.reverse().map((v) => '# ' + ' {{diff2|' + v.revid + '|' + new Morebits.date(v.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)}} ' + hasHiddenComment(v)).join('\n');
+		let resolvetext = params.resolves.reverse().map((v) => '# ' + ' {{diff2|' + v.revid + '|' + new Morebits.date(v.timestamp).format('HH:mm, D MMMM YYYY', 'utc') + ' (UTC)}} ' + hasHiddenComment(v)).join('\n');
 
 		if (params.free_resolves) {
 			const page = params.free_resolves;
diff --git a/modules/twinklebatchdelete.js b/modules/twinklebatchdelete.js
index 3eec0be3d..659fba7fc 100644
--- a/modules/twinklebatchdelete.js
+++ b/modules/twinklebatchdelete.js
@@ -169,9 +169,7 @@ Twinkle.batchdelete.callback = function twinklebatchdeleteCallback() {
 	const wikipedia_api = new Morebits.wiki.api('loading...', query, ((apiobj) => {
 		const response = apiobj.getResponse();
 		let pages = (response.query && response.query.pages) || [];
-		pages = pages.filter((page) => {
-			return !page.missing && page.imagerepository !== 'shared';
-		});
+		pages = pages.filter((page) => !page.missing && page.imagerepository !== 'shared');
 		pages.sort(Twinkle.sortByNamespace);
 		pages.forEach((page) => {
 			const metadata = [];
@@ -179,9 +177,7 @@ Twinkle.batchdelete.callback = function twinklebatchdeleteCallback() {
 				metadata.push('redirect');
 			}
 
-			const editProt = page.protection.filter((pr) => {
-				return pr.type === 'edit' && pr.level === 'sysop';
-			}).pop();
+			const editProt = page.protection.filter((pr) => pr.type === 'edit' && pr.level === 'sysop').pop();
 			if (editProt) {
 				metadata.push('fully protected' +
 				(editProt.expiry === 'infinity' ? ' indefinitely' : ', expires ' + new Morebits.date(editProt.expiry).calendar('utc') + ' (UTC)'));
@@ -231,9 +227,7 @@ Twinkle.batchdelete.callback = function twinklebatchdeleteCallback() {
 			name: 'pages',
 			id: 'tw-dbatch-pages',
 			shiftClickSupport: true,
-			list: $.map(Twinkle.batchdelete.pages, (e) => {
-				return e;
-			})
+			list: $.map(Twinkle.batchdelete.pages, (e) => e)
 		});
 		form.append({ type: 'submit' });
 
@@ -265,9 +259,7 @@ Twinkle.batchdelete.generateNewPageList = function(form) {
 		name: 'pages',
 		id: 'tw-dbatch-pages',
 		shiftClickSupport: true,
-		list: $.map(Twinkle.batchdelete.pages, (e) => {
-			return e;
-		})
+		list: $.map(Twinkle.batchdelete.pages, (e) => e)
 	}).render();
 };
 
@@ -306,9 +298,7 @@ Twinkle.batchdelete.callback.toggleSubpages = function twDbatchToggleSubpages(e)
 		const loadingText = '<strong id="dbatch-subpage-loading">Loading... </strong>';
 		$(e.target).after(loadingText);
 
-		const pages = $(form.pages).map((i, el) => {
-			return el.value;
-		}).get();
+		const pages = $(form.pages).map((i, el) => el.value).get();
 
 		const subpageLister = new Morebits.batchOperation();
 		subpageLister.setOption('chunkSize', Twinkle.getPref('batchChunks'));
@@ -343,9 +333,7 @@ Twinkle.batchdelete.callback.toggleSubpages = function twDbatchToggleSubpages(e)
 						metadata.push('redirect');
 					}
 
-					const editProt = page.protection.filter((pr) => {
-						return pr.type === 'edit' && pr.level === 'sysop';
-					}).pop();
+					const editProt = page.protection.filter((pr) => pr.type === 'edit' && pr.level === 'sysop').pop();
 					if (editProt) {
 						metadata.push('fully protected' +
 						(editProt.expiry === 'infinity' ? ' indefinitely' : ', expires ' + new Morebits.date(editProt.expiry).calendar('utc') + ' (UTC)'));
@@ -422,9 +410,7 @@ Twinkle.batchdelete.callback.evaluate = function twinklebatchdeleteCallbackEvalu
 
 	const form = event.target;
 
-	const numProtected = $(Morebits.quickForm.getElements(form, 'pages')).filter((index, element) => {
-		return element.checked && element.nextElementSibling.style.color === 'red';
-	}).length;
+	const numProtected = $(Morebits.quickForm.getElements(form, 'pages')).filter((index, element) => element.checked && element.nextElementSibling.style.color === 'red').length;
 	if (numProtected > 0 && !confirm('You are about to delete ' + mw.language.convertNumber(numProtected) + ' fully protected page(s). Are you sure?')) {
 		return;
 	}
@@ -572,9 +558,7 @@ Twinkle.batchdelete.callbacks = {
 	deleteRedirectsMain: function(apiobj) {
 		const response = apiobj.getResponse();
 		let pages = response.query.pages[0].redirects || [];
-		pages = pages.map((redirect) => {
-			return redirect.title;
-		});
+		pages = pages.map((redirect) => redirect.title);
 		if (!pages.length) {
 			return;
 		}
@@ -605,9 +589,7 @@ Twinkle.batchdelete.callbacks = {
 	unlinkBacklinksMain: function(apiobj) {
 		const response = apiobj.getResponse();
 		let pages = response.query.backlinks || [];
-		pages = pages.map((page) => {
-			return page.title;
-		});
+		pages = pages.map((page) => page.title);
 		if (!pages.length) {
 			return;
 		}
@@ -658,9 +640,7 @@ Twinkle.batchdelete.callbacks = {
 	unlinkImageInstancesMain: function(apiobj) {
 		const response = apiobj.getResponse();
 		let pages = response.query.imageusage || [];
-		pages = pages.map((page) => {
-			return page.title;
-		});
+		pages = pages.map((page) => page.title);
 		if (!pages.length) {
 			return;
 		}
diff --git a/modules/twinklebatchprotect.js b/modules/twinklebatchprotect.js
index b8630f473..b69072e8a 100644
--- a/modules/twinklebatchprotect.js
+++ b/modules/twinklebatchprotect.js
@@ -82,10 +82,10 @@ Twinkle.batchprotect.callback = function twinklebatchprotectCallback() {
 		name: 'movelevel',
 		label: 'Move protection:',
 		event: Twinkle.protect.formevents.movelevel,
-		list: Twinkle.protect.protectionLevels.filter((level) => {
+		list: Twinkle.protect.protectionLevels.filter((level) => 
 			// Autoconfirmed is required for a move, redundant
-			return level.value !== 'autoconfirmed';
-		})
+			 level.value !== 'autoconfirmed'
+		)
 	});
 	form.append({
 		type: 'select',
@@ -189,9 +189,7 @@ Twinkle.batchprotect.callback = function twinklebatchprotectCallback() {
 
 			if (missing) {
 				metadata.push('page does not exist');
-				editProt = page.protection.filter((pr) => {
-					return pr.type === 'create' && pr.level === 'sysop';
-				}).pop();
+				editProt = page.protection.filter((pr) => pr.type === 'create' && pr.level === 'sysop').pop();
 			} else {
 				if (page.redirect) {
 					metadata.push('redirect');
@@ -204,9 +202,7 @@ Twinkle.batchprotect.callback = function twinklebatchprotectCallback() {
 					metadata.push(mw.language.convertNumber(page.revisions[0].size) + ' bytes');
 				}
 
-				editProt = page.protection.filter((pr) => {
-					return pr.type === 'edit' && pr.level === 'sysop';
-				}).pop();
+				editProt = page.protection.filter((pr) => pr.type === 'edit' && pr.level === 'sysop').pop();
 			}
 			if (editProt) {
 				metadata.push('fully' + (missing ? ' create' : '') + ' protected' +
@@ -261,9 +257,7 @@ Twinkle.batchprotect.callback.evaluate = function twinklebatchprotectCallbackEva
 
 	const form = event.target;
 
-	const numProtected = $(Morebits.quickForm.getElements(form, 'pages')).filter((index, element) => {
-		return element.checked && element.nextElementSibling.style.color === 'red';
-	}).length;
+	const numProtected = $(Morebits.quickForm.getElements(form, 'pages')).filter((index, element) => element.checked && element.nextElementSibling.style.color === 'red').length;
 	if (numProtected > 0 && !confirm('You are about to act on ' + mw.language.convertNumber(numProtected) + ' fully protected page(s). Are you sure?')) {
 		return;
 	}
diff --git a/modules/twinklebatchundelete.js b/modules/twinklebatchundelete.js
index 5f79bc75d..d157f2430 100644
--- a/modules/twinklebatchundelete.js
+++ b/modules/twinklebatchundelete.js
@@ -67,15 +67,11 @@ Twinkle.batchundelete.callback = function twinklebatchundeleteCallback() {
 	const wikipedia_api = new Morebits.wiki.api('loading...', query, ((apiobj) => {
 		const response = apiobj.getResponse();
 		let pages = (response.query && response.query.pages) || [];
-		pages = pages.filter((page) => {
-			return page.missing;
-		});
+		pages = pages.filter((page) => page.missing);
 		const list = [];
 		pages.sort(Twinkle.sortByNamespace);
 		pages.forEach((page) => {
-			const editProt = page.protection.filter((pr) => {
-				return pr.type === 'create' && pr.level === 'sysop';
-			}).pop();
+			const editProt = page.protection.filter((pr) => pr.type === 'create' && pr.level === 'sysop').pop();
 
 			const title = page.title;
 			list.push({
@@ -122,9 +118,7 @@ Twinkle.batchundelete.callback = function twinklebatchundeleteCallback() {
 Twinkle.batchundelete.callback.evaluate = function(event) {
 	Morebits.wiki.actionCompleted.notice = 'Batch undeletion is now complete';
 
-	const numProtected = Morebits.quickForm.getElements(event.target, 'pages').filter((element) => {
-		return element.checked && element.nextElementSibling.style.color === 'red';
-	}).length;
+	const numProtected = Morebits.quickForm.getElements(event.target, 'pages').filter((element) => element.checked && element.nextElementSibling.style.color === 'red').length;
 	if (numProtected > 0 && !confirm('You are about to undelete ' + numProtected + ' fully create protected page(s). Are you sure?')) {
 		return;
 	}
diff --git a/modules/twinkleblock.js b/modules/twinkleblock.js
index 82f67036b..dba077be5 100644
--- a/modules/twinkleblock.js
+++ b/modules/twinkleblock.js
@@ -170,9 +170,7 @@ Twinkle.block.processUserInfo = function twinkleblockProcessUserInfo(data, fn) {
 
 	Twinkle.block.isRegistered = !!userinfo.userid;
 	if (Twinkle.block.isRegistered) {
-		Twinkle.block.userIsBot = !!userinfo.groupmemberships && userinfo.groupmemberships.map((e) => {
-			return e.group;
-		}).indexOf('bot') !== -1;
+		Twinkle.block.userIsBot = !!userinfo.groupmemberships && userinfo.groupmemberships.map((e) => e.group).indexOf('bot') !== -1;
 	} else {
 		Twinkle.block.userIsBot = false;
 	}
@@ -315,9 +313,7 @@ Twinkle.block.callback.change_action = function twinkleblockCallbackChangeAction
 		prior.list = [{ label: 'Prior block settings', value: 'prior', selected: true }];
 
 		// Arrays of objects are annoying to check
-		if (!blockGroup.some((bg) => {
-			return bg.label === prior.label;
-		})) {
+		if (!blockGroup.some((bg) => bg.label === prior.label)) {
 			blockGroup.push(prior);
 		}
 
@@ -333,9 +329,7 @@ Twinkle.block.callback.change_action = function twinkleblockCallbackChangeAction
 		}
 	} else {
 		// But first remove any prior prior
-		blockGroup = blockGroup.filter((bg) => {
-			return bg.label !== prior.label;
-		});
+		blockGroup = blockGroup.filter((bg) => bg.label !== prior.label);
 	}
 
 	// Can be in preset or template field, so the old one in the template
@@ -521,9 +515,7 @@ Twinkle.block.callback.change_action = function twinkleblockCallbackChangeAction
 
 	Twinkle.block.dsinfo.then((dsinfo) => {
 		const $select = $('[name="dstopic"]');
-		const $options = $.map(dsinfo, (value, key) => {
-			return $('<option>').val(value.code).text(key).prop('label', key);
-		});
+		const $options = $.map(dsinfo, (value, key) => $('<option>').val(value.code).text(key).prop('label', key));
 		$select.append($options);
 	});
 
@@ -1547,9 +1539,7 @@ Twinkle.block.callback.toggle_see_alsos = function twinkleblockCallbackToggleSee
 		new RegExp('( <!--|;) ' + 'see also ' + Twinkle.block.seeAlsos.join(' and ') + '( -->)?'), ''
 	);
 
-	Twinkle.block.seeAlsos = Twinkle.block.seeAlsos.filter((el) => {
-		return el !== this.value;
-	});
+	Twinkle.block.seeAlsos = Twinkle.block.seeAlsos.filter((el) => el !== this.value);
 
 	if (this.checked) {
 		Twinkle.block.seeAlsos.push(this.value);
@@ -1643,9 +1633,7 @@ Twinkle.block.callback.update_form = function twinkleblockCallbackUpdateForm(e,
 		// Add any preset options; in practice, just used for prior block settings
 		if (data.restrictions) {
 			if (data.restrictions.pages && !$pageSelect.val().length) {
-				const pages = data.restrictions.pages.map((pr) => {
-					return pr.title;
-				});
+				const pages = data.restrictions.pages.map((pr) => pr.title);
 				// since page restrictions use an ajax source, we
 				// short-circuit that and just add a new option
 				pages.forEach((page) => {
@@ -1974,16 +1962,12 @@ Twinkle.block.callback.getBlockNoticeWikitext = function(params) {
 				};
 				text += '|area=' + (params.indefinite ? 'certain ' : 'from certain ');
 				if (params.pagerestrictions.length) {
-					text += 'pages (' + makeSentence(params.pagerestrictions.map((p) => {
-						return '[[:' + p + ']]';
-					}));
+					text += 'pages (' + makeSentence(params.pagerestrictions.map((p) => '[[:' + p + ']]'));
 					text += params.namespacerestrictions.length ? ') and certain ' : ')';
 				}
 				if (params.namespacerestrictions.length) {
 					// 1 => Talk, 2 => User, etc.
-					const namespaceNames = params.namespacerestrictions.map((id) => {
-						return menuFormattedNamespaces[id];
-					});
+					const namespaceNames = params.namespacerestrictions.map((id) => menuFormattedNamespaces[id]);
 					text += '[[Wikipedia:Namespace|namespaces]] (' + makeSentence(namespaceNames) + ')';
 				}
 			} else if (params.area) {
diff --git a/modules/twinkledeprod.js b/modules/twinkledeprod.js
index e1629d868..91dd39ad2 100644
--- a/modules/twinkledeprod.js
+++ b/modules/twinkledeprod.js
@@ -72,9 +72,7 @@ Twinkle.deprod.callback = function() {
 				metadata.push(concerns[title]);
 			}
 
-			const editProt = page.protection.filter((pr) => {
-				return pr.type === 'edit' && pr.level === 'sysop';
-			}).pop();
+			const editProt = page.protection.filter((pr) => pr.type === 'edit' && pr.level === 'sysop').pop();
 			if (editProt) {
 				metadata.push('fully protected' +
 					(editProt.expiry === 'infinity' ? ' indefinitely' : ', expires ' + editProt.expiry));
diff --git a/modules/twinkleprotect.js b/modules/twinkleprotect.js
index dc70bddc0..99a0f2ced 100644
--- a/modules/twinkleprotect.js
+++ b/modules/twinkleprotect.js
@@ -129,9 +129,7 @@ Twinkle.protect.fetchProtectingAdmin = function twinkleprotectFetchProtectingAdm
 		letype: protType
 	}).then((data) => {
 		// don't check log entries that have already been checked (e.g. don't go into an infinite loop!)
-		const event = data.query ? $.grep(data.query.logevents, (le) => {
-			return $.inArray(le.logid, logIds);
-		})[0] : null;
+		const event = data.query ? $.grep(data.query.logevents, (le) => $.inArray(le.logid, logIds))[0] : null;
 		if (!event) {
 			// fail gracefully
 			return null;
@@ -358,10 +356,10 @@ Twinkle.protect.callback.changeAction = function twinkleprotectCallbackChangeAct
 					name: 'editlevel',
 					label: 'Who can edit:',
 					event: Twinkle.protect.formevents.editlevel,
-					list: Twinkle.protect.protectionLevels.filter((level) => {
+					list: Twinkle.protect.protectionLevels.filter((level) => 
 						// Filter TE outside of templates and modules
-						return isTemplate || level.value !== 'templateeditor';
-					})
+						 isTemplate || level.value !== 'templateeditor'
+					)
 				});
 				field2.append({
 					type: 'select',
@@ -392,10 +390,10 @@ Twinkle.protect.callback.changeAction = function twinkleprotectCallbackChangeAct
 					name: 'movelevel',
 					label: 'Who can move:',
 					event: Twinkle.protect.formevents.movelevel,
-					list: Twinkle.protect.protectionLevels.filter((level) => {
+					list: Twinkle.protect.protectionLevels.filter((level) => 
 						// Autoconfirmed is required for a move, redundant
-						return level.value !== 'autoconfirmed' && (isTemplate || level.value !== 'templateeditor');
-					})
+						 level.value !== 'autoconfirmed' && (isTemplate || level.value !== 'templateeditor')
+					)
 				});
 				field2.append({
 					type: 'select',
@@ -451,10 +449,10 @@ Twinkle.protect.callback.changeAction = function twinkleprotectCallbackChangeAct
 					name: 'createlevel',
 					label: 'Create protection:',
 					event: Twinkle.protect.formevents.createlevel,
-					list: Twinkle.protect.protectionLevels.filter((level) => {
+					list: Twinkle.protect.protectionLevels.filter((level) => 
 						// Filter TE always, and autoconfirmed in mainspace, redundant since WP:ACPERM
-						return level.value !== 'templateeditor' && (mw.config.get('wgNamespaceNumber') !== 0 || level.value !== 'autoconfirmed');
-					})
+						 level.value !== 'templateeditor' && (mw.config.get('wgNamespaceNumber') !== 0 || level.value !== 'autoconfirmed')
+					)
 				});
 				field2.append({
 					type: 'select',
@@ -758,10 +756,10 @@ Twinkle.protect.protectionTypes = [
 			{ label: 'Highly visible page (move)', value: 'pp-move-indef' }
 		]
 	}
-].filter((type) => {
+].filter((type) => 
 	// Filter for templates and flaggedrevs
-	return (isTemplate || type.label !== 'Template protection') && (hasFlaggedRevs || type.label !== 'Pending changes');
-});
+	 (isTemplate || type.label !== 'Template protection') && (hasFlaggedRevs || type.label !== 'Pending changes')
+);
 
 Twinkle.protect.protectionTypesCreate = [
 	{ label: 'Unprotection', value: 'unprotect' },
@@ -1001,10 +999,10 @@ Twinkle.protect.protectionTags = [
 			{ label: '{{pp-move}}: other', value: 'pp-move' }
 		]
 	}
-].filter((type) => {
+].filter((type) => 
 	// Filter FlaggedRevs
-	return hasFlaggedRevs || type.label !== 'Pending changes templates';
-});
+	 hasFlaggedRevs || type.label !== 'Pending changes templates'
+);
 
 Twinkle.protect.callback.changePreset = function twinkleprotectCallbackChangePreset(e) {
 	const form = e.target.form;
@@ -1415,9 +1413,7 @@ Twinkle.protect.callback.annotateProtectReason = function twinkleprotectCallback
 			$(form.protectReason_notes_rfppRevid).parent().hide();
 		}
 	} else if (this.name === 'protectReason_notes_rfppRevid') {
-		Twinkle.protect.protectReasonAnnotations = Twinkle.protect.protectReasonAnnotations.filter((el) => {
-			return el.indexOf('[[Special:Permalink') === -1;
-		});
+		Twinkle.protect.protectReasonAnnotations = Twinkle.protect.protectReasonAnnotations.filter((el) => el.indexOf('[[Special:Permalink') === -1);
 		if (e.target.value.length) {
 			const permalink = '[[Special:Permalink/' + e.target.value + '#' + Morebits.pageNameNorm + ']]';
 			Twinkle.protect.protectReasonAnnotations.push(permalink);
diff --git a/modules/twinklespeedy.js b/modules/twinklespeedy.js
index 043f94fd1..ba62bb859 100644
--- a/modules/twinklespeedy.js
+++ b/modules/twinklespeedy.js
@@ -1900,9 +1900,7 @@ Twinkle.speedy.callback.evaluateSysop = function twinklespeedyCallbackEvaluateSy
 		return;
 	}
 
-	const normalizeds = values.map((value) => {
-		return Twinkle.speedy.normalizeHash[value];
-	});
+	const normalizeds = values.map((value) => Twinkle.speedy.normalizeHash[value]);
 
 	// analyse each criterion to determine whether to watch the page, prompt for summary, or notify the creator
 	let watchPage, promptForSummary;
@@ -1915,14 +1913,10 @@ Twinkle.speedy.callback.evaluateSysop = function twinklespeedyCallbackEvaluateSy
 		}
 	});
 
-	const warnusertalk = form.warnusertalk.checked && normalizeds.some((norm, index) => {
-		return Twinkle.getPref('warnUserOnSpeedyDelete').indexOf(norm) !== -1 &&
-			!(norm === 'g6' && values[index] !== 'copypaste');
-	});
+	const warnusertalk = form.warnusertalk.checked && normalizeds.some((norm, index) => Twinkle.getPref('warnUserOnSpeedyDelete').indexOf(norm) !== -1 &&
+			!(norm === 'g6' && values[index] !== 'copypaste'));
 
-	const welcomeuser = warnusertalk && normalizeds.some((norm) => {
-		return Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1;
-	});
+	const welcomeuser = warnusertalk && normalizeds.some((norm) => Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1);
 
 	const params = {
 		values: values,
@@ -1961,25 +1955,15 @@ Twinkle.speedy.callback.evaluateUser = function twinklespeedyCallbackEvaluateUse
 
 	// var multiple = form.multiple.checked;
 
-	const normalizeds = values.map((value) => {
-		return Twinkle.speedy.normalizeHash[value];
-	});
+	const normalizeds = values.map((value) => Twinkle.speedy.normalizeHash[value]);
 
 	// analyse each criterion to determine whether to watch the page/notify the creator
-	const watchPage = normalizeds.some((csdCriteria) => {
-		return Twinkle.getPref('watchSpeedyPages').indexOf(csdCriteria) !== -1;
-	}) && Twinkle.getPref('watchSpeedyExpiry');
+	const watchPage = normalizeds.some((csdCriteria) => Twinkle.getPref('watchSpeedyPages').indexOf(csdCriteria) !== -1) && Twinkle.getPref('watchSpeedyExpiry');
 
-	const notifyuser = form.notify.checked && normalizeds.some((norm, index) => {
-		return Twinkle.getPref('notifyUserOnSpeedyDeletionNomination').indexOf(norm) !== -1 &&
-			!(norm === 'g6' && values[index] !== 'copypaste');
-	});
-	const welcomeuser = notifyuser && normalizeds.some((norm) => {
-		return Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1;
-	});
-	const csdlog = Twinkle.getPref('logSpeedyNominations') && normalizeds.some((norm) => {
-		return Twinkle.getPref('noLogOnSpeedyNomination').indexOf(norm) === -1;
-	});
+	const notifyuser = form.notify.checked && normalizeds.some((norm, index) => Twinkle.getPref('notifyUserOnSpeedyDeletionNomination').indexOf(norm) !== -1 &&
+			!(norm === 'g6' && values[index] !== 'copypaste'));
+	const welcomeuser = notifyuser && normalizeds.some((norm) => Twinkle.getPref('welcomeUserOnSpeedyDeletionNotification').indexOf(norm) !== -1);
+	const csdlog = Twinkle.getPref('logSpeedyNominations') && normalizeds.some((norm) => Twinkle.getPref('noLogOnSpeedyNomination').indexOf(norm) === -1);
 
 	const params = {
 		values: values,
diff --git a/modules/twinkletag.js b/modules/twinkletag.js
index 8e4bb6023..447636201 100644
--- a/modules/twinkletag.js
+++ b/modules/twinkletag.js
@@ -256,12 +256,8 @@ Twinkle.tag.callback = function twinkletagCallback() {
 						type: 'checkbox',
 						name: 'tags',
 						list: subgroup
-							.filter((item) => {
-								return !isRestricted(item);
-							})
-							.map((item) => {
-								return { value: item.tag, label: '{{' + item.tag + '}}: ' + item.description, subgroup: item.subgroup };
-							})
+							.filter((item) => !isRestricted(item))
+							.map((item) => ({ value: item.tag, label: '{{' + item.tag + '}}: ' + item.description, subgroup: item.subgroup }))
 					});
 				});
 			});
@@ -1568,9 +1564,7 @@ Twinkle.tag.callbacks = {
 				lhlimit: 'max', // 500 is max for normal users, 5000 for bots and sysops
 				format: 'json'
 			}, ((apiobj) => {
-				const pages = apiobj.getResponse().query.pages.filter((p) => {
-					return !p.missing && !!p.linkshere;
-				});
+				const pages = apiobj.getResponse().query.pages.filter((p) => !p.missing && !!p.linkshere);
 				pages.forEach((page) => {
 					let removed = false;
 					page.linkshere.concat({title: page.title}).forEach((el) => {
@@ -1789,9 +1783,7 @@ Twinkle.tag.callbacks = {
 				lhlimit: 'max', // 500 is max for normal users, 5000 for bots and sysops
 				format: 'json'
 			}, ((apiobj) => {
-				const pages = apiobj.getResponse().query.pages.filter((p) => {
-					return !p.missing && !!p.linkshere;
-				});
+				const pages = apiobj.getResponse().query.pages.filter((p) => !p.missing && !!p.linkshere);
 				pages.forEach((page) => {
 					let found = false;
 					page.linkshere.forEach((el) => {
@@ -2037,9 +2029,7 @@ Twinkle.tag.callback.evaluate = function twinkletagCallbackEvaluate(e) {
 
 	// Given an array of incompatible tags, check if we have two or more selected
 	const checkIncompatible = function(conflicts, extra) {
-		const count = conflicts.reduce((sum, tag) => {
-			return sum += params.tags.indexOf(tag) !== -1;
-		}, 0);
+		const count = conflicts.reduce((sum, tag) => sum += params.tags.indexOf(tag) !== -1, 0);
 		if (count > 1) {
 			let message = 'Please select only one of: {{' + conflicts.join('}}, {{') + '}}.';
 			message += extra ? ' ' + extra : '';
diff --git a/modules/twinklewarn.js b/modules/twinklewarn.js
index 17294427d..095d5407f 100644
--- a/modules/twinklewarn.js
+++ b/modules/twinklewarn.js
@@ -2003,9 +2003,7 @@ Twinkle.warn.callbacks = {
 				const dateHeaderRegex = now.monthHeaderRegex();
 				sectionNumber = 0;
 				// Find this month's section among L2 sections, preferring the bottom-most
-				sectionExists = sections.reverse().some((sec, idx) => {
-					return /^(==)[^=].+\1/m.test(sec) && dateHeaderRegex.test(sec) && typeof (sectionNumber = sections.length - 1 - idx) === 'number';
-				});
+				sectionExists = sections.reverse().some((sec, idx) => /^(==)[^=].+\1/m.test(sec) && dateHeaderRegex.test(sec) && typeof (sectionNumber = sections.length - 1 - idx) === 'number');
 			}
 		}
 
diff --git a/modules/twinklewelcome.js b/modules/twinklewelcome.js
index 51a308524..b54628f37 100644
--- a/modules/twinklewelcome.js
+++ b/modules/twinklewelcome.js
@@ -201,13 +201,11 @@ Twinkle.welcome.populateWelcomeList = function(e) {
 		container.append({
 			type: 'radio',
 			name: 'template',
-			list: $.map(templates, (properties, template) => {
-				return {
+			list: $.map(templates, (properties, template) => ({
 					value: template,
 					label: '{{' + template + '}}: ' + properties.description + (properties.linkedArticle ? '\u00A0*' : ''),  // U+00A0 NO-BREAK SPACE
 					tooltip: properties.tooltip  // may be undefined
-				};
-			}),
+				})),
 			event: function(ev) {
 				ev.target.form.article.disabled = !templates[ev.target.value].linkedArticle;
 			}
diff --git a/morebits.js b/morebits.js
index 2aa656253..8f1d45351 100644
--- a/morebits.js
+++ b/morebits.js
@@ -271,9 +271,7 @@ Morebits.namespaceRegex = function(namespaces) {
 			// Namespaces are completely agnostic as to case,
 			// and a regex string is more useful/compatible than a RegExp object,
 			// so we accept any casing for any letter.
-			aliases.push(name.split('').map((char) => {
-				return Morebits.pageNameRegex(char);
-			}).join(''));
+			aliases.push(name.split('').map((char) => Morebits.pageNameRegex(char)).join(''));
 		}
 	});
 	switch (aliases.length) {
@@ -1047,9 +1045,7 @@ Morebits.quickForm.getElements = function QuickFormGetElements(form, fieldName)
  * @returns {HTMLInputElement}
  */
 Morebits.quickForm.getCheckboxOrRadio = function QuickFormGetCheckboxOrRadio(elementArray, value) {
-	const found = $.grep(elementArray, (el) => {
-		return el.value === value;
-	});
+	const found = $.grep(elementArray, (el) => el.value === value);
 	if (found.length > 0) {
 		return found[0];
 	}
@@ -1598,9 +1594,7 @@ Morebits.array = {
 		if (!Array.isArray(arr)) {
 			throw 'A non-array object passed to Morebits.array.uniq';
 		}
-		return arr.filter((item, idx) => {
-			return arr.indexOf(item) === idx;
-		});
+		return arr.filter((item, idx) => arr.indexOf(item) === idx);
 	},
 
 	/**
@@ -1615,9 +1609,7 @@ Morebits.array = {
 		if (!Array.isArray(arr)) {
 			throw 'A non-array object passed to Morebits.array.dups';
 		}
-		return arr.filter((item, idx) => {
-			return arr.indexOf(item) !== idx;
-		});
+		return arr.filter((item, idx) => arr.indexOf(item) !== idx);
 	},
 
 
@@ -2091,9 +2083,7 @@ Morebits.date.prototype = {
 			 * Y{1,2}(Y{2})? matches exactly 1, 2 or 4 occurrences of 'Y'
 			 */
 			/H{1,2}|h{1,2}|m{1,2}|s{1,2}|SSS|d(d{2,3})?|D{1,2}|M{1,4}|Y{1,2}(Y{2})?|A/g,
-			(match) => {
-				return replacementMap[match];
-			}
+			(match) => replacementMap[match]
 		);
 		return unbinder.rebind().replace(/\[(.*?)\]/g, '$1');
 	},
@@ -2558,9 +2548,7 @@ Morebits.wiki.api.getToken = function() {
 		type: 'csrf',
 		format: 'json'
 	});
-	return tokenApi.post().then((apiobj) => {
-		return apiobj.response.query.tokens.csrftoken;
-	});
+	return tokenApi.post().then((apiobj) => apiobj.response.query.tokens.csrftoken);
 };
 
 
@@ -3895,9 +3883,7 @@ Morebits.wiki.page = function(pageName, status) {
 		// extract protection info, to alert admins when they are about to edit a protected page
 		// Includes cascading protection
 		if (Morebits.userIsSysop) {
-			const editProt = page.protection.filter((pr) => {
-				return pr.type === 'edit' && pr.level === 'sysop';
-			}).pop();
+			const editProt = page.protection.filter((pr) => pr.type === 'edit' && pr.level === 'sysop').pop();
 			if (editProt) {
 				ctx.fullyProtected = editProt.expiry;
 			} else {
@@ -4145,9 +4131,7 @@ Morebits.wiki.page = function(pageName, status) {
 		if (!text) { // no text - content empty or inaccessible (revdelled or suppressed)
 			return false;
 		}
-		return Morebits.l10n.redirectTagAliases.some((tag) => {
-			return new RegExp('^\\s*' + tag + '\\W', 'i').test(text);
-		});
+		return Morebits.l10n.redirectTagAliases.some((tag) => new RegExp('^\\s*' + tag + '\\W', 'i').test(text));
 	};
 
 	var fnLookupCreationSuccess = function() {
@@ -4279,13 +4263,9 @@ Morebits.wiki.page = function(pageName, status) {
 		// extract protection info
 		let editprot;
 		if (action === 'undelete') {
-			editprot = response.pages[0].protection.filter((pr) => {
-				return pr.type === 'create' && pr.level === 'sysop';
-			}).pop();
+			editprot = response.pages[0].protection.filter((pr) => pr.type === 'create' && pr.level === 'sysop').pop();
 		} else if (action === 'delete' || action === 'move') {
-			editprot = response.pages[0].protection.filter((pr) => {
-				return pr.type === 'edit' && pr.level === 'sysop';
-			}).pop();
+			editprot = response.pages[0].protection.filter((pr) => pr.type === 'edit' && pr.level === 'sysop').pop();
 		}
 		if (editprot && !ctx.suppressProtectWarning &&
 			!confirm('You are about to ' + action + ' the fully protected page "' + ctx.pageName +
@@ -4633,9 +4613,7 @@ Morebits.wiki.page = function(pageName, status) {
 
 		// Default to pre-existing cascading protection if unchanged (similar to above)
 		if (ctx.protectCascade === null) {
-			ctx.protectCascade = !!prs.filter((pr) => {
-				return pr.cascade;
-			}).length;
+			ctx.protectCascade = !!prs.filter((pr) => pr.cascade).length;
 		}
 		// Warn if cascading protection being applied with an invalid protection level,
 		// which for edit protection will cause cascading to be silently stripped
@@ -5793,9 +5771,7 @@ Morebits.taskManager = function(context) {
 	this.execute = function() {
 		const self = this; // proxy for `this` for use inside functions where `this` is something else
 		this.taskDependencyMap.forEach((deps, task) => {
-			const dependencyPromisesArray = deps.map((dep) => {
-				return self.deferreds.get(dep);
-			});
+			const dependencyPromisesArray = deps.map((dep) => self.deferreds.get(dep));
 			$.when.apply(self.context, dependencyPromisesArray).then(function() {
 				const result = task.apply(self.context, arguments);
 				if (result === undefined) { // maybe the function threw, or it didn't return anything