feat: add filter

* use appParseAndTranslate to translate category names

* translate parent categories on new category creation

Co-authored-by: Tudor-Dan Ravoiu <tudor-dan.ravoiu@ubisoft.com>

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.16.2-beta.0",
+    "version": "1.16.2-beta.2",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -190,4 +190,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/src/admin/manage/categories.js

@@ -109,9 +109,9 @@ define('admin/manage/categories', [
 				name: '[[admin/manage/categories:parent-category-none]]',
 				icon: 'fa-none',
 			});
-			Benchpress.render('admin/partials/categories/create', {
+			app.parseAndTranslate('admin/partials/categories/create', {
 				categories: categories,
-			}).then(function (html) {
+			}, function (html) {
 				var modal = bootbox.dialog({
 					title: '[[admin/manage/categories:alert.create]]',
 					message: html,

public/src/admin/manage/category.js

@@ -119,9 +119,9 @@ define('admin/manage/category', [
 					return app.alertError(err.message);
 				}
 
-				Benchpress.render('admin/partials/categories/copy-settings', {
+				app.parseAndTranslate('admin/partials/categories/copy-settings', {
 					categories: allCategories,
-				}).then(function (html) {
+				}, function (html) {
 					var selectedCid;
 					var modal = bootbox.dialog({
 						title: '[[modules:composer.select_category]]',

public/src/modules/translator.js

@@ -2,7 +2,19 @@
 
 (function (factory) {
 	function loadClient(language, namespace) {
-		return Promise.resolve(jQuery.getJSON([config.assetBaseUrl, 'language', language, namespace].join('/') + '.json?' + config['cache-buster']));
+		return new Promise(function (resolve, reject) {
+			jQuery.getJSON([config.assetBaseUrl, 'language', language, namespace].join('/') + '.json?' + config['cache-buster'], function (data) {
+				const payload = {
+					language: language,
+					namespace: namespace,
+					data: data,
+				};
+				$(window).trigger('action:translator.loadClient', payload);
+				resolve(payload.promise ? Promise.resolve(payload.promise) : data);
+			}).fail(function (jqxhr, textStatus, error) {
+				reject(new Error(textStatus + ', ' + error));
+			});
+		});
 	}
 	var warn = function () { console.warn.apply(console, arguments); };
 	if (typeof define === 'function' && define.amd) {
@@ -545,6 +557,18 @@
 			});
 		},
 
+		flushNamespace: function (namespace) {
+			Object.keys(Translator.cache).forEach(function (code) {
+				if (Translator.cache[code] &&
+					Translator.cache[code].translations &&
+					Translator.cache[code].translations[namespace]
+				) {
+					Translator.cache[code].translations[namespace] = null;
+				}
+			});
+		},
+
+
 		/**
 		 * Legacy translator function for backwards compatibility
 		 */

src/categories/index.js

@@ -57,9 +57,11 @@ Categories.getCategoryById = async function (data) {
 	category.isIgnored = watchState[0] === Categories.watchStates.ignoring;
 	category.parent = parent;
 
-
 	calculateTopicPostCount(category);
-	const result = await plugins.hooks.fire('filter:category.get', { category: category, uid: data.uid });
+	const result = await plugins.hooks.fire('filter:category.get', {
+		category: category,
+		...data,
+	});
 	return result.category;
 };
 

src/controllers/accounts/notifications.js

@@ -51,11 +51,12 @@ notificationsController.get = async function (req, res, next) {
 	if (!selectedFilter) {
 		return next();
 	}
-	let nids = await user.notifications.getAll(req.uid, selectedFilter.filter);
-	const pageCount = Math.max(1, Math.ceil(nids.length / itemsPerPage));
-	nids = nids.slice(start, stop + 1);
 
-	const notifications = await user.notifications.getNotifications(nids, req.uid);
+	const nids = await user.notifications.getAll(req.uid, selectedFilter.filter);
+	let notifications = await user.notifications.getNotifications(nids, req.uid);
+
+	const pageCount = Math.max(1, Math.ceil(notifications.length / itemsPerPage));
+	notifications = notifications.slice(start, stop + 1);
 
 	res.render('notifications', {
 		notifications: notifications,

src/controllers/category.js

@@ -49,8 +49,8 @@ categoryController.get = async function (req, res, next) {
 		return helpers.notAllowed(req, res);
 	}
 
-	if (!res.locals.isAPI && (!req.params.slug || categoryFields.slug !== cid + '/' + req.params.slug) && (categoryFields.slug && categoryFields.slug !== cid + '/')) {
-		return helpers.redirect(res, '/category/' + categoryFields.slug, true);
+	if (!res.locals.isAPI && !req.params.slug && (categoryFields.slug && categoryFields.slug !== `${cid}/`)) {
+		return helpers.redirect(res, `/category/${categoryFields.slug}`, true);
 	}
 
 	if (categoryFields.link) {

src/controllers/topics.js

@@ -118,7 +118,7 @@ function calculateStartStop(page, postIndex, settings) {
 	let startSkip = 0;
 
 	if (!settings.usePagination) {
-		if (postIndex !== 0) {
+		if (postIndex > 1) {
 			page = 1;
 		}
 		startSkip = Math.max(0, postIndex - Math.ceil(settings.postsPerPage / 2));

src/languages.js

@@ -3,7 +3,8 @@
 const fs = require('fs');
 const path = require('path');
 const utils = require('./utils');
-const paths = require('./constants').paths;
+const { paths } = require('./constants');
+const plugins = require('./plugins');
 
 const Languages = module.exports;
 const languagesPath = path.join(__dirname, '../build/public/language');
@@ -12,8 +13,14 @@ const files = fs.readdirSync(path.join(paths.nodeModules, '/timeago/locales'));
 Languages.timeagoCodes = files.filter(f => f.startsWith('jquery.timeago')).map(f => f.split('.')[2]);
 
 Languages.get = async function (language, namespace) {
-	const data = await fs.promises.readFile(path.join(languagesPath, language, namespace + '.json'), 'utf8');
-	return JSON.parse(data) || {};
+	const data = await fs.promises.readFile(path.join(languagesPath, language, `${namespace}.json`), 'utf8');
+	const parsed = JSON.parse(data) || {};
+	const result = await plugins.hooks.fire('filter:languages.get', {
+		language,
+		namespace,
+		data: parsed,
+	});
+	return result.data;
 };
 
 let codeCache = null;

src/middleware/headers.js

@@ -7,6 +7,7 @@ const _ = require('lodash');
 const meta = require('../meta');
 const languages = require('../languages');
 const helpers = require('./helpers');
+const plugins = require('../plugins');
 
 module.exports = function (middleware) {
 	middleware.addHeaders = helpers.try(function addHeaders(req, res, next) {
@@ -75,10 +76,13 @@ module.exports = function (middleware) {
 		next();
 	});
 
-	middleware.autoLocale = helpers.try(async function autoLocale(req, res, next) {
-		let langs;
+	middleware.autoLocale = helpers.try(async (req, res, next) => {
+		await plugins.hooks.fire('filter:middleware.autoLocale', {
+			req: req,
+			res: res,
+		});
 		if (req.query.lang) {
-			langs = await listCodes();
+			const langs = await listCodes();
 			if (!langs.includes(req.query.lang)) {
 				req.query.lang = meta.config.defaultLang;
 			}
@@ -87,7 +91,7 @@ module.exports = function (middleware) {
 		if (parseInt(req.uid, 10) > 0 || !meta.config.autoDetectLang) {
 			return next();
 		}
-		langs = await listCodes();
+		const langs = await listCodes();
 		const lang = req.acceptsLanguages(langs);
 		if (!lang) {
 			return next();

src/middleware/user.js

@@ -185,9 +185,8 @@ module.exports = function (middleware) {
 		if (!userslug) {
 			return next();
 		}
-		const path = req.path.replace(/^\/api/, '')
-			.replace('uid', 'user')
-			.replace(uid, function () { return userslug; });
+		const path = req.url.replace(/^\/api/, '')
+			.replace(`/uid/${uid}`, () => `/user/${userslug}`);
 		controllers.helpers.redirect(res, path);
 	});
 

src/topics/sorted.js

@@ -48,6 +48,10 @@ module.exports = function (Topics) {
 			tids = await db.getSortedSetRevRange('uid:' + params.uid + ':followed_tids', 0, -1);
 		} else if (params.cids) {
 			tids = await getCidTids(params);
+		} else if (params.tags.length) {
+			tids = await getTagTids(params);
+		} else if (params.sort === 'old') {
+			tids = await db.getSortedSetRange(`topics:recent`, 0, meta.config.recentMaxTopics - 1);
 		} else {
 			tids = await db.getSortedSetRevRange('topics:' + params.sort, 0, meta.config.recentMaxTopics - 1);
 		}
@@ -55,12 +59,30 @@ module.exports = function (Topics) {
 		return tids;
 	}
 
+	async function getTagTids(params) {
+		const sets = [
+			params.sort === 'old' ?
+				'topics:recent' :
+				`topics:${params.sort}`,
+			...params.tags.map(tag => `tag:${tag}:topics`),
+		];
+		const method = params.sort === 'old' ?
+			'getSortedSetIntersect' :
+			'getSortedSetRevIntersect';
+		return await db[method]({
+			sets: sets,
+			start: 0,
+			stop: meta.config.recentMaxTopics - 1,
+			weights: sets.map((s, index) => (index ? 0 : 1)),
+		});
+	}
+
 	async function getCidTids(params) {
 		const sets = [];
 		const pinnedSets = [];
-		params.cids.forEach(function (cid) {
-			if (params.sort === 'recent') {
-				sets.push('cid:' + cid + ':tids');
+		params.cids.forEach((cid) => {
+			if (params.sort === 'recent' || params.sort === 'old') {
+				sets.push(`cid:${cid}:tids`);
 			} else {
 				sets.push('cid:' + cid + ':tids' + (params.sort ? ':' + params.sort : ''));
 			}
@@ -68,7 +90,10 @@ module.exports = function (Topics) {
 		});
 		let pinnedTids = await db.getSortedSetRevRange(pinnedSets, 0, -1);
 		pinnedTids = await Topics.tools.checkPinExpiry(pinnedTids);
-		const tids = await db.getSortedSetRevRange(sets, 0, meta.config.recentMaxTopics - 1);
+		const method = params.sort === 'old' ?
+			'getSortedSetRange' :
+			'getSortedSetRevRange';
+		const tids = await db[method](sets, 0, meta.config.recentMaxTopics - 1);
 		return pinnedTids.concat(tids);
 	}
 
@@ -77,12 +102,13 @@ module.exports = function (Topics) {
 			return tids;
 		}
 		const topicData = await Topics.getTopicsFields(tids, ['tid', 'lastposttime', 'upvotes', 'downvotes', 'postcount', 'pinned']);
-		let sortFn = sortRecent;
-		if (params.sort === 'posts') {
-			sortFn = sortPopular;
-		} else if (params.sort === 'votes') {
-			sortFn = sortVotes;
-		}
+		const sortMap = {
+			recent: sortRecent,
+			old: sortOld,
+			posts: sortPopular,
+			votes: sortVotes,
+		};
+		const sortFn = sortMap[params.sort] || sortRecent;
 
 		if (params.floatPinned) {
 			floatPinned(topicData, sortFn);
@@ -106,6 +132,10 @@ module.exports = function (Topics) {
 		return b.lastposttime - a.lastposttime;
 	}
 
+	function sortOld(a, b) {
+		return a.lastposttime - b.lastposttime;
+	}
+
 	function sortVotes(a, b) {
 		if (a.votes !== b.votes) {
 			return b.votes - a.votes;

test/controllers.js

@@ -1050,8 +1050,18 @@ describe('Controllers', function () {
 			});
 		});
 
-		it('should 404 if user does not exist', function (done) {
-			request(nconf.get('url') + '/api/uid/123123', { json: true }, function (err, res) {
+		it('should redirect to userslug and keep query params', (done) => {
+			request(`${nconf.get('url')}/api/uid/${fooUid}/topics?foo=bar`, { json: true }, (err, res, body) => {
+				assert.ifError(err);
+				assert.equal(res.statusCode, 200);
+				assert.equal(res.headers['x-redirect'], '/user/foo/topics?foo=bar');
+				assert.equal(body, '/user/foo/topics?foo=bar');
+				done();
+			});
+		});
+
+		it('should 404 if user does not exist', (done) => {
+			request(`${nconf.get('url')}/api/uid/123123`, { json: true }, (err, res) => {
 				assert.ifError(err);
 				assert.equal(res.statusCode, 404);
 				done();

test/topics.js

@@ -2518,12 +2518,21 @@ describe('Topic\'s', function () {
 		});
 	});
 
-	describe('sorted topics', function () {
-		it('should get sorted topics in category', function (done) {
-			var filters = ['', 'watched', 'unreplied', 'new'];
-			async.map(filters, function (filter, next) {
+	describe('sorted topics', () => {
+		let category;
+		before(async () => {
+			category = await categories.create({ name: 'sorted' });
+			const topic1Result = await topics.post({ uid: topic.userId, cid: category.cid, title: 'old replied', content: 'topic 1 OP' });
+			const topic2Result = await topics.post({ uid: topic.userId, cid: category.cid, title: 'most recent replied', content: 'topic 2 OP' });
+			await topics.reply({ uid: topic.userId, content: 'topic 1 reply', tid: topic1Result.topicData.tid });
+			await topics.reply({ uid: topic.userId, content: 'topic 2 reply', tid: topic2Result.topicData.tid });
+		});
+
+		it('should get sorted topics in category', (done) => {
+			const filters = ['', 'watched', 'unreplied', 'new'];
+			async.map(filters, (filter, next) => {
 				topics.getSortedTopics({
-					cids: [topic.categoryId],
+					cids: [category.cid],
 					uid: topic.userId,
 					start: 0,
 					stop: -1,
@@ -2539,5 +2548,28 @@ describe('Topic\'s', function () {
 				done();
 			});
 		});
+		it('should get topics recent replied first', async () => {
+			const data = await topics.getSortedTopics({
+				cids: [category.cid],
+				uid: topic.userId,
+				start: 0,
+				stop: -1,
+				sort: 'recent',
+			});
+			assert.strictEqual(data.topics[0].title, 'most recent replied');
+			assert.strictEqual(data.topics[1].title, 'old replied');
+		});
+
+		it('should get topics recent replied last', async () => {
+			const data = await topics.getSortedTopics({
+				cids: [category.cid],
+				uid: topic.userId,
+				start: 0,
+				stop: -1,
+				sort: 'old',
+			});
+			assert.strictEqual(data.topics[0].title, 'old replied');
+			assert.strictEqual(data.topics[1].title, 'most recent replied');
+		});
 	});
 });