Merge branch 'develop' into activitypub

install/package.json

@@ -34,10 +34,10 @@
         "@fortawesome/fontawesome-free": "6.5.1",
         "@isaacs/ttlcache": "1.4.1",
         "@popperjs/core": "2.11.8",
-        "ace-builds": "1.32.7",
+        "ace-builds": "1.32.8",
         "archiver": "7.0.1",
         "async": "3.2.5",
-        "autoprefixer": "10.4.18",
+        "autoprefixer": "10.4.19",
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.5.1",
         "body-parser": "1.20.2",
@@ -64,7 +64,7 @@
         "daemon": "1.1.0",
         "diff": "5.2.0",
         "esbuild": "0.20.2",
-        "express": "4.18.3",
+        "express": "4.19.2",
         "express-session": "1.18.0",
         "express-useragent": "1.0.15",
         "fetch-cookie": "3.0.1",
@@ -115,7 +115,7 @@
         "passport-local": "1.0.0",
         "pg": "8.11.3",
         "pg-cursor": "2.10.3",
-        "postcss": "8.4.37",
+        "postcss": "8.4.38",
         "postcss-clean": "1.2.0",
         "progress-webpack-plugin": "1.0.16",
         "prompt": "1.3.0",
@@ -123,7 +123,7 @@
         "rimraf": "5.0.5",
         "rss": "1.2.2",
         "rtlcss": "4.1.1",
-        "sanitize-html": "2.12.1",
+        "sanitize-html": "2.13.0",
         "sass": "1.72.0",
         "semver": "7.6.0",
         "serve-favicon": "2.5.0",
@@ -143,9 +143,9 @@
         "toobusy-js": "0.5.1",
         "tough-cookie": "4.1.3",
         "validator": "13.11.0",
-        "webpack": "5.90.3",
+        "webpack": "5.91.0",
         "webpack-merge": "5.10.0",
-        "winston": "3.12.0",
+        "winston": "3.13.0",
         "workerpool": "9.1.0",
         "xml": "1.0.1",
         "xregexp": "5.1.1",

src/topics/sorted.js

@@ -159,18 +159,24 @@ module.exports = function (Topics) {
 			return tids;
 		}
 
-		const topicData = await Topics.getTopicsFields(tids, [
-			'tid', 'timestamp', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned',
-		]);
-		const sortMap = {
-			recent: sortRecent,
-			old: sortOld,
-			create: sortCreate,
-			posts: sortPopular,
-			votes: sortVotes,
-			views: sortViews,
-		};
-		const sortFn = sortMap[params.sort] || sortRecent;
+		const { sortMap, fields } = await plugins.hooks.fire('filter:topics.sortOptions', {
+			params,
+			fields: [
+				'tid', 'timestamp', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned',
+			],
+			sortMap: {
+				recent: sortRecent,
+				old: sortOld,
+				create: sortCreate,
+				posts: sortPopular,
+				votes: sortVotes,
+				views: sortViews,
+			},
+		});
+
+		const topicData = await Topics.getTopicsFields(tids, fields);
+		const sortFn = sortMap.hasOwnProperty(params.sort) && sortMap[params.sort] ?
+			sortMap[params.sort] : sortRecent;
 
 		if (params.floatPinned) {
 			floatPinned(topicData, sortFn);

src/views/partials/acceptTos.tpl

@@ -1,9 +1,8 @@
 <div>
 	<label for="agree-terms">[[register:terms-of-use]]</label>
 	<div class="tos">{termsOfUse}</div>
-	<div class="checkbox">
-		<label>
-			<input type="checkbox" name="agree-terms" id="agree-terms"> [[register:agree-to-terms-of-use]]
-		</label>
+	<div class="form-check">
+		<input class="form-check-input" type="checkbox" name="agree-terms" id="agree-terms">
+		<label class="form-check-label">[[register:agree-to-terms-of-use]]</label>
 	</div>
 </div>

src/views/partials/gdpr_consent.tpl

@@ -2,7 +2,7 @@
 	<p class="lead">[[user:consent.lead]]</p>
 	<p>[[user:consent.intro]]</p>
 	<div class="form-check mb-3">
-		<input class="form-check-input" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data">
+		<input class="form-check-input" type="checkbox" name="gdpr_agree_data" id="gdpr_agree_data" role="switch">
 		<label class="form-check-label" for="gdpr_agree_data">[[register:gdpr-agree-data]]</label>
 	</div>
 
@@ -16,7 +16,7 @@
 	</p>
 
 	<div class="form-check">
-		<input class="form-check-input" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email">
+		<input class="form-check-input" type="checkbox" name="gdpr_agree_email" id="gdpr_agree_email" role="switch">
 		<label class="form-check-label" for="gdpr_agree_email">[[register:gdpr-agree-email]]</label>
 	</div>
 </div>