merge: fix conflicts

pass query to emits

install/package.json

@@ -2,7 +2,7 @@
     "name": "nodebb",
     "license": "GPL-3.0",
     "description": "NodeBB Forum",
-    "version": "1.16.2",
+    "version": "1.16.2-beta.2",
     "homepage": "http://www.nodebb.org",
     "repository": {
         "type": "git",
@@ -43,7 +43,7 @@
         "bcryptjs": "2.4.3",
         "benchpressjs": "2.4.0",
         "body-parser": "^1.19.0",
-        "bootbox": "5.5.2",
+        "bootbox": "4.4.0",
         "bootstrap": "^3.4.1",
         "chart.js": "^2.9.3",
         "cli-graph": "^3.2.2",
@@ -101,7 +101,7 @@
         "nodebb-plugin-spam-be-gone": "0.7.7",
         "nodebb-rewards-essentials": "0.1.4",
         "nodebb-theme-lavender": "5.0.17",
-        "nodebb-theme-persona": "10.3.19",
+        "nodebb-theme-persona": "10.3.18",
         "nodebb-theme-slick": "1.3.8",
         "nodebb-theme-vanilla": "11.3.10",
         "nodebb-widget-essentials": "5.0.2",
@@ -154,12 +154,12 @@
         "@commitlint/cli": "11.0.0",
         "@commitlint/config-angular": "11.0.0",
         "coveralls": "3.1.0",
-        "eslint": "7.18.0",
+        "eslint": "7.17.0",
         "eslint-config-airbnb-base": "14.2.1",
         "eslint-plugin-import": "2.22.1",
         "grunt": "1.3.0",
         "grunt-contrib-watch": "1.1.0",
-        "husky": "4.3.8",
+        "husky": "4.3.7",
         "jsdom": "16.4.0",
         "lint-staged": "10.5.3",
         "mocha": "8.2.1",
@@ -190,4 +190,4 @@
             "url": "https://github.com/barisusakli"
         }
     ]
-}
+}

public/language/it/flags.json

@@ -13,7 +13,7 @@
 	"filter-active": "Ci sono uno o più filtri attivi in questa lista di segnalazioni",
 	"filter-reset": "Rimuovi Filtri",
 	"filters": "Opzioni Filtri",
-	"filter-reporterId": "UID segnalatore",
+	"filter-reporterId": "Segnalatore UID",
 	"filter-targetUid": "UID segnalato",
 	"filter-type": "Tipo Segnalazione",
 	"filter-type-all": "Tutto il Contenuto",

public/openapi/write.yaml

@@ -104,16 +104,10 @@ paths:
     $ref: 'write/posts/pid.yaml'
   /posts/{pid}/state:
     $ref: 'write/posts/pid/state.yaml'
-  /posts/{pid}/move:
-    $ref: 'write/posts/pid/move.yaml'
   /posts/{pid}/vote:
     $ref: 'write/posts/pid/vote.yaml'
   /posts/{pid}/bookmark:
     $ref: 'write/posts/pid/bookmark.yaml'
-  /posts/{pid}/diffs:
-    $ref: 'write/posts/pid/diffs.yaml'
-  /posts/{pid}/diffs/{since}:
-    $ref: 'write/posts/pid/diffs/since.yaml'
   /admin/settings/{setting}:
     $ref: 'write/admin/settings/setting.yaml'
   /files/:

public/openapi/write/posts/pid/diffs.yaml

@@ -1,41 +0,0 @@
-get:
-  tags:
-    - posts
-  summary: get post edit history
-  description: This operation retrieves a post's edit history
-  parameters:
-    - in: path
-      name: pid
-      schema:
-        type: string
-      required: true
-      description: a valid post id
-      example: 2
-  responses:
-    '200':
-      description: Post history successfully retrieved.
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              status:
-                $ref: ../../../components/schemas/Status.yaml#/Status
-              response:
-                type: object
-                properties:
-                  timestamps:
-                    type: array
-                    items:
-                      type: number
-                  revisions:
-                    type: array
-                    items:
-                      type: object
-                      properties:
-                        timestamp:
-                          type: number
-                        username:
-                          type: string
-                  editable:
-                    type: boolean

public/openapi/write/posts/pid/diffs/since.yaml

@@ -1,65 +0,0 @@
-get:
-  tags:
-    - posts
-  summary: get single post edit history
-  description: This operation retrieves a post's edit history
-  parameters:
-    - in: path
-      name: pid
-      schema:
-        type: string
-      required: true
-      description: a valid post id
-      example: 2
-    - in: path
-      name: since
-      schema:
-        type: number
-      required: true
-      description: a valid UNIX timestamp
-      example: 0
-  responses:
-    '200':
-      description: Post history successfully retrieved.
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              status:
-                $ref: ../../../../components/schemas/Status.yaml#/Status
-              response:
-                $ref: ../../../../components/schemas/PostObject.yaml#/PostObject
-put:
-  tags:
-    - posts
-  summary: revert a post
-  description: This operation reverts a post to an earlier version. The revert process will append a new history item to the post's edit history.
-  parameters:
-    - in: path
-      name: pid
-      schema:
-        type: string
-      required: true
-      description: a valid post id
-      example: 2
-    - in: path
-      name: since
-      schema:
-        type: number
-      required: true
-      description: a valid UNIX timestamp
-      example: 0
-  responses:
-    '200':
-      description: Post successfully reverted
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              status:
-                $ref: ../../../../components/schemas/Status.yaml#/Status
-              response:
-                type: object
-                properties: {}

public/openapi/write/posts/pid/move.yaml

@@ -1,36 +0,0 @@
-put:
-  tags:
-    - posts
-  summary: move a post
-  description: This operation moves a post to a different topic.
-  parameters:
-    - in: path
-      name: pid
-      schema:
-        type: number
-      required: true
-      description: a valid post id
-      example: 5
-  requestBody:
-    content:
-      application/json:
-        schema:
-          type: object
-          properties:
-            tid:
-              type: number
-              description: a valid topic id
-              example: 4
-  responses:
-    '200':
-      description: Post successfully moved
-      content:
-        application/json:
-          schema:
-            type: object
-            properties:
-              status:
-                $ref: ../../../components/schemas/Status.yaml#/Status
-              response:
-                type: object
-                properties: {}

public/src/admin/manage/categories.js

@@ -99,7 +99,7 @@ define('admin/manage/categories', [
 	}
 
 	Categories.throwCreateModal = function () {
-		socket.emit('categories.getSelectCategories', {}, function (err, categories) {
+		socket.emit('categories.getSelectCategories', { query: utils.params() }, function (err, categories) {
 			if (err) {
 				return app.alertError(err.message);
 			}
@@ -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

@@ -114,14 +114,14 @@ define('admin/manage/category', [
 		});
 
 		$('.copy-settings').on('click', function () {
-			socket.emit('categories.getSelectCategories', {}, function (err, allCategories) {
+			socket.emit('categories.getSelectCategories', { query: utils.params() }, function (err, allCategories) {
 				if (err) {
 					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]]',
@@ -261,7 +261,7 @@ define('admin/manage/category', [
 	}
 
 	Category.launchParentSelector = function () {
-		socket.emit('categories.getSelectCategories', {}, function (err, allCategories) {
+		socket.emit('categories.getSelectCategories', { query: utils.params() }, function (err, allCategories) {
 			if (err) {
 				return app.alertError(err.message);
 			}

public/src/client/account/best.js

@@ -9,7 +9,7 @@ define('forum/account/best', ['forum/account/header', 'forum/account/posts'], fu
 
 		$('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
 
-		posts.handleInfiniteScroll('posts.loadMoreBestPosts', 'account/best');
+		posts.handleInfiniteScroll('account/best');
 	};
 
 	return Best;

public/src/client/account/bookmarks.js

@@ -9,7 +9,7 @@ define('forum/account/bookmarks', ['forum/account/header', 'forum/account/posts'
 
 		$('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
 
-		posts.handleInfiniteScroll('posts.loadMoreBookmarks', 'account/bookmarks');
+		posts.handleInfiniteScroll('account/bookmarks');
 	};
 
 	return Bookmarks;

public/src/client/account/downvoted.js

@@ -9,7 +9,7 @@ define('forum/account/downvoted', ['forum/account/header', 'forum/account/posts'
 
 		$('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
 
-		posts.handleInfiniteScroll('posts.loadMoreDownVotedPosts', 'account/downvoted');
+		posts.handleInfiniteScroll('account/downvoted');
 	};
 
 	return Downvoted;

public/src/client/account/ignored.js

@@ -0,0 +1,13 @@
+'use strict';
+
+define('forum/account/ignored', ['forum/account/header', 'forum/account/topics'], function (header, topics) {
+	var AccountIgnored = {};
+
+	AccountIgnored.init = function () {
+		header.init();
+
+		topics.handleInfiniteScroll('account/ignored');
+	};
+
+	return AccountIgnored;
+});

public/src/client/account/posts.js

@@ -3,20 +3,21 @@
 
 define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) {
 	var AccountPosts = {};
-	var method;
+
 	var template;
+	var page = 1;
 
 	AccountPosts.init = function () {
 		header.init();
 
 		$('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
 
-		AccountPosts.handleInfiniteScroll('posts.loadMoreUserPosts', 'account/posts');
+		AccountPosts.handleInfiniteScroll('account/posts');
 	};
 
-	AccountPosts.handleInfiniteScroll = function (_method, _template) {
-		method = _method;
+	AccountPosts.handleInfiniteScroll = function (_template) {
 		template = _template;
+		page = ajaxify.data.pagination.currentPage;
 		if (!config.usePagination) {
 			infinitescroll.init(loadMore);
 		}
@@ -26,17 +27,16 @@ define('forum/account/posts', ['forum/account/header', 'forum/infinitescroll'],
 		if (direction < 0) {
 			return;
 		}
+		var params = utils.params();
+		page += 1;
+		params.page = page;
 
-		infinitescroll.loadMore(method, {
-			uid: ajaxify.data.theirid,
-			after: $('[component="posts"]').attr('data-nextstart'),
-		}, function (data, done) {
+		infinitescroll.loadMoreXhr(params, function (data, done) {
 			if (data.posts && data.posts.length) {
 				onPostsLoaded(data.posts, done);
 			} else {
 				done();
 			}
-			$('[component="posts"]').attr('data-nextstart', data.nextStart);
 		});
 	}
 

public/src/client/account/topics.js

@@ -3,21 +3,19 @@
 
 define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'], function (header, infinitescroll) {
 	var AccountTopics = {};
-	var method;
+
 	var template;
-	var set;
+	var page = 1;
 
 	AccountTopics.init = function () {
 		header.init();
 
-		AccountTopics.handleInfiniteScroll('topics.loadMoreUserTopics', 'account/topics');
+		AccountTopics.handleInfiniteScroll('account/topics');
 	};
 
-	AccountTopics.handleInfiniteScroll = function (_method, _template, _set) {
-		method = _method;
+	AccountTopics.handleInfiniteScroll = function (_template) {
 		template = _template;
-		set = _set;
-
+		page = ajaxify.data.pagination.currentPage;
 		if (!config.usePagination) {
 			infinitescroll.init(loadMore);
 		}
@@ -27,20 +25,16 @@ define('forum/account/topics', ['forum/account/header', 'forum/infinitescroll'],
 		if (direction < 0) {
 			return;
 		}
+		var params = utils.params();
+		page += 1;
+		params.page = page;
 
-		infinitescroll.loadMore(method, {
-			set: set,
-			uid: ajaxify.data.theirid,
-			after: $('[component="category"]').attr('data-nextstart'),
-			count: config.topicsPerPage,
-		}, function (data, done) {
+		infinitescroll.loadMoreXhr(params, function (data, done) {
 			if (data.topics && data.topics.length) {
 				onTopicsLoaded(data.topics, done);
 			} else {
 				done();
 			}
-
-			$('[component="category"]').attr('data-nextstart', data.nextStart);
 		});
 	}
 

public/src/client/account/upvoted.js

@@ -9,7 +9,7 @@ define('forum/account/upvoted', ['forum/account/header', 'forum/account/posts'],
 
 		$('[component="post/content"] img:not(.not-responsive)').addClass('img-responsive');
 
-		posts.handleInfiniteScroll('posts.loadMoreUpVotedPosts', 'account/upvoted');
+		posts.handleInfiniteScroll('account/upvoted');
 	};
 
 	return Upvoted;

public/src/client/account/watched.js

@@ -7,7 +7,7 @@ define('forum/account/watched', ['forum/account/header', 'forum/account/topics']
 	AccountWatched.init = function () {
 		header.init();
 
-		topics.handleInfiniteScroll('topics.loadMoreFromSet', 'account/watched', 'uid:' + ajaxify.data.theirid + ':followed_tids');
+		topics.handleInfiniteScroll('account/watched');
 	};
 
 	return AccountWatched;

public/src/client/chats.js

@@ -416,7 +416,7 @@ define('forum/chats', [
 			roomid = '';
 		}
 
-		var url = 'user/' + ajaxify.data.userslug + '/chats/' + roomid;
+		var url = 'user/' + ajaxify.data.userslug + '/chats/' + roomid + window.location.search;
 		if (self.fetch) {
 			fetch(config.relative_path + '/api/' + url, { credentials: 'include' })
 				.then(function (response) {

public/src/client/infinitescroll.js

@@ -78,6 +78,25 @@ define('forum/infinitescroll', function () {
 		});
 	};
 
+	scroll.loadMoreXhr = function (data, callback) {
+		if (loadingMore) {
+			return;
+		}
+		loadingMore = true;
+		var url = config.relative_path + '/api' + location.pathname.replace(new RegExp('^' + config.relative_path), '');
+		var hookData = { url: url, data: data };
+		$(window).trigger('action:infinitescroll.loadmore.xhr', hookData);
+
+		$.get(url, data, function (data) {
+			callback(data, function () {
+				loadingMore = false;
+			});
+		}).fail(function (jqXHR) {
+			loadingMore = false;
+			app.alertError(String(jqXHR.responseJSON || jqXHR.statusText));
+		});
+	};
+
 	scroll.removeExtra = function (els, direction, count) {
 		if (els.length <= count) {
 			return;

public/src/client/topic/diffs.js

@@ -1,6 +1,6 @@
 'use strict';
 
-define('forum/topic/diffs', ['api', 'forum/topic/images'], function (api) {
+define('forum/topic/diffs', ['forum/topic/images'], function () {
 	var Diffs = {};
 
 	Diffs.open = function (pid) {
@@ -10,7 +10,11 @@ define('forum/topic/diffs', ['api', 'forum/topic/images'], function (api) {
 
 		var localeStringOpts = { year: 'numeric', month: 'short', day: 'numeric', hour: 'numeric', minute: 'numeric' };
 
-		api.get(`/posts/${pid}/diffs`, {}).then((data) => {
+		socket.emit('posts.getDiffs', { pid: pid }, function (err, data) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+
 			app.parseAndTranslate('partials/modals/post_history', {
 				diffs: data.revisions.map(function (revision) {
 					var timestamp = parseInt(revision.timestamp, 10);
@@ -52,7 +56,7 @@ define('forum/topic/diffs', ['api', 'forum/topic/images'], function (api) {
 					revertEl.prop('disabled', true);
 				});
 			});
-		}).catch(app.alertError);
+		});
 	};
 
 	Diffs.load = function (pid, since, postContainer) {
@@ -60,7 +64,11 @@ define('forum/topic/diffs', ['api', 'forum/topic/images'], function (api) {
 			return;
 		}
 
-		api.get(`/posts/${pid}/diffs/${since}`, {}).then((data) => {
+		socket.emit('posts.showPostAt', { pid: pid, since: since }, function (err, data) {
+			if (err) {
+				return app.alertError(err.message);
+			}
+
 			data.deleted = !!parseInt(data.deleted, 10);
 
 			app.parseAndTranslate('partials/posts_list', 'posts', {
@@ -68,7 +76,7 @@ define('forum/topic/diffs', ['api', 'forum/topic/images'], function (api) {
 			}, function (html) {
 				postContainer.empty().append(html);
 			});
-		}).catch(app.alertError);
+		});
 	};
 
 	Diffs.restore = function (pid, since, modal) {
@@ -76,10 +84,14 @@ define('forum/topic/diffs', ['api', 'forum/topic/images'], function (api) {
 			return;
 		}
 
-		api.put(`/posts/${pid}/diffs/${since}`, {}).then(() => {
+		socket.emit('posts.restoreDiff', { pid: pid, since: since }, function (err) {
+			if (err) {
+				return app.alertError(err);
+			}
+
 			modal.modal('hide');
 			app.alertSuccess('[[topic:diffs.post-restored]]');
-		}).catch(app.alertError);
+		});
 	};
 
 	return Diffs;

public/src/client/topic/move-post.js

@@ -2,8 +2,8 @@
 
 
 define('forum/topic/move-post', [
-	'components', 'postSelect', 'translator', 'alerts', 'api',
-], function (components, postSelect, translator, alerts, api) {
+	'components', 'postSelect', 'translator', 'alerts',
+], function (components, postSelect, translator, alerts) {
 	var MovePost = {};
 
 	var moveModal;
@@ -100,10 +100,10 @@ define('forum/topic/move-post', [
 		if (!ajaxify.data.template.topic || !data.tid) {
 			return;
 		}
-
-		Promise.all(data.pids.map(pid => api.put(`/posts/${pid}/move`, {
-			tid: data.tid,
-		}))).then(() => {
+		socket.emit('posts.movePosts', { pids: data.pids, tid: data.tid }, function (err) {
+			if (err) {
+				return app.alertError(err.message);
+			}
 			data.pids.forEach(function (pid) {
 				components.get('post', 'pid', pid).fadeOut(500, function () {
 					$(this).remove();
@@ -111,7 +111,7 @@ define('forum/topic/move-post', [
 			});
 
 			closeMoveModal();
-		}).catch(app.alertError);
+		});
 	}
 
 	function closeMoveModal() {

public/src/client/topic/move.js

@@ -12,7 +12,7 @@ define('forum/topic/move', ['categorySelector', 'alerts'], function (categorySel
 		Move.onComplete = onComplete;
 		Move.moveAll = !tids;
 
-		socket.emit('categories.getMoveCategories', onCategoriesLoaded);
+		socket.emit('categories.getMoveCategories', { query: utils.params() }, onCategoriesLoaded);
 	};
 
 	function onCategoriesLoaded(err, categories) {

public/src/client/topic/posts.js

@@ -210,9 +210,7 @@ define('forum/topic/posts', [
 				html.insertBefore(before);
 
 				// Now restore the relative position the user was on prior to new post insertion
-				if (scrollTop > 0) {
-					$(window).scrollTop(scrollTop + ($(document).height() - height));
-				}
+				$(window).scrollTop(scrollTop + ($(document).height() - height));
 			} else {
 				components.get('topic').append(html);
 			}

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) {
@@ -286,9 +298,6 @@
 					var out = translated;
 					translatedArgs.forEach(function (arg, i) {
 						var escaped = arg.replace(/%(?=\d)/g, '%').replace(/\\,/g, ',');
-						// fix double escaped translation keys, see https://github.com/NodeBB/NodeBB/issues/9206
-						escaped = escaped.replace(/[/g, '[')
-							.replace(/]/g, ']');
 						out = out.replace(new RegExp('%' + (i + 1), 'g'), escaped);
 					});
 					return out;
@@ -548,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/api/helpers.js

@@ -10,6 +10,13 @@ const socketHelpers = require('../socket.io/helpers');
 const websockets = require('../socket.io');
 const events = require('../events');
 
+exports.setDefaultPostData = function (reqOrSocket, data) {
+	data.uid = reqOrSocket.uid;
+	data.req = exports.buildReqObject(reqOrSocket, { ...data });
+	data.timestamp = Date.now();
+	data.fromQueue = false;
+};
+
 // creates a slimmed down version of the request object
 exports.buildReqObject = (req, payload) => {
 	req = req || {};

src/api/posts.js

@@ -4,7 +4,6 @@ const validator = require('validator');
 const _ = require('lodash');
 
 const utils = require('../utils');
-const user = require('../user');
 const posts = require('../posts');
 const topics = require('../topics');
 const groups = require('../groups');
@@ -13,7 +12,6 @@ const events = require('../events');
 const privileges = require('../privileges');
 const apiHelpers = require('./helpers');
 const websockets = require('../socket.io');
-const socketHelpers = require('../socket.io/helpers');
 
 const postsAPI = module.exports;
 
@@ -196,27 +194,6 @@ async function isMainAndLastPost(pid) {
 	};
 }
 
-postsAPI.move = async function (caller, data) {
-	const canMove = await Promise.all([
-		privileges.topics.isAdminOrMod(data.tid, caller.uid),
-		privileges.posts.canMove(data.pid, caller.uid),
-	]);
-	if (!canMove.every(Boolean)) {
-		throw new Error('[[error:no-privileges]]');
-	}
-
-	await topics.movePostToTopic(caller.uid, data.pid, data.tid);
-
-	const [postDeleted, topicDeleted] = await Promise.all([
-		posts.getPostField(data.pid, 'deleted'),
-		topics.getTopicField(data.tid, 'deleted'),
-	]);
-
-	if (!postDeleted && !topicDeleted) {
-		socketHelpers.sendNotificationToPostOwner(data.pid, caller.uid, 'move', 'notifications:moved_your_post');
-	}
-};
-
 postsAPI.upvote = async function (caller, data) {
 	return await apiHelpers.postCommand(caller, 'upvote', 'voted', 'notifications:upvoted_your_post_in', data);
 };
@@ -236,61 +213,3 @@ postsAPI.bookmark = async function (caller, data) {
 postsAPI.unbookmark = async function (caller, data) {
 	return await apiHelpers.postCommand(caller, 'unbookmark', 'bookmarked', '', data);
 };
-
-async function diffsPrivilegeCheck(pid, uid) {
-	const [deleted, privilegesData] = await Promise.all([
-		posts.getPostField(pid, 'deleted'),
-		privileges.posts.get([pid], uid),
-	]);
-
-	const allowed = privilegesData[0]['posts:history'] && (deleted ? privilegesData[0]['posts:view_deleted'] : true);
-	if (!allowed) {
-		throw new Error('[[error:no-privileges]]');
-	}
-}
-
-postsAPI.getDiffs = async (caller, data) => {
-	await diffsPrivilegeCheck(data.pid, caller.uid);
-	const timestamps = await posts.diffs.list(data.pid);
-	const post = await posts.getPostFields(data.pid, ['timestamp', 'uid']);
-
-	const diffs = await posts.diffs.get(data.pid);
-	const uids = diffs.map(diff => diff.uid || null);
-	uids.push(post.uid);
-	let usernames = await user.getUsersFields(uids, ['username']);
-	usernames = usernames.map(userObj => (userObj.uid ? userObj.username : null));
-
-	let canEdit = true;
-	try {
-		await user.isPrivilegedOrSelf(caller.uid, post.uid);
-	} catch (e) {
-		canEdit = false;
-	}
-
-	timestamps.push(post.timestamp);
-
-	return {
-		timestamps: timestamps,
-		revisions: timestamps.map((timestamp, idx) => ({
-			timestamp: timestamp,
-			username: usernames[idx],
-		})),
-		editable: canEdit,
-	};
-};
-
-postsAPI.loadDiff = async (caller, data) => {
-	await diffsPrivilegeCheck(data.pid, caller.uid);
-	return await posts.diffs.load(data.pid, data.since, caller.uid);
-};
-
-postsAPI.restoreDiff = async (caller, data) => {
-	const cid = await posts.getCidByPid(data.pid);
-	const canEdit = await privileges.categories.can('edit', cid, caller.uid);
-	if (!canEdit) {
-		throw new Error('[[error:no-privileges]]');
-	}
-
-	const edit = await posts.diffs.restore(data.pid, data.since, caller.uid, apiHelpers.buildReqObject(caller));
-	websockets.in('topic_' + edit.topic.tid).emit('event:post_edited', edit);
-};

src/api/topics.js

@@ -33,10 +33,7 @@ topicsAPI.create = async function (caller, data) {
 
 	const payload = { ...data };
 	payload.tags = payload.tags || [];
-	payload.uid = caller.uid;
-	payload.req = apiHelpers.buildReqObject(caller);
-	payload.timestamp = Date.now();
-	payload.fromQueue = false;
+	apiHelpers.setDefaultPostData(caller, payload);
 
 	// Blacklist & Post Queue
 	await meta.blacklist.test(caller.ip);
@@ -57,16 +54,8 @@ topicsAPI.create = async function (caller, data) {
 };
 
 topicsAPI.reply = async function (caller, data) {
-	var payload = {
-		tid: data.tid,
-		uid: caller.uid,
-		req: apiHelpers.buildReqObject(caller),	// For IP recording
-		content: data.content,
-		timestamp: Date.now(),
-		fromQueue: false,
-	};
-
-	if (data.toPid) { payload.toPid = data.toPid; }
+	const payload = { ...data };
+	apiHelpers.setDefaultPostData(caller, payload);
 
 	// Blacklist & Post Queue
 	await meta.blacklist.test(caller.ip);

src/categories/create.js

@@ -45,16 +45,6 @@ module.exports = function (Categories) {
 			category.backgroundImage = data.backgroundImage;
 		}
 
-		const result = await plugins.hooks.fire('filter:category.create', { category: category, data: data });
-		category = result.category;
-
-
-		await db.setObject('category:' + category.cid, category);
-		if (!category.descriptionParsed) {
-			await Categories.parseDescription(category.cid, category.description);
-		}
-		await db.sortedSetsAdd(['categories:cid', 'cid:' + parentCid + ':children'], category.order, category.cid);
-
 		const defaultPrivileges = [
 			'groups:find',
 			'groups:read',
@@ -70,12 +60,35 @@ module.exports = function (Categories) {
 			'groups:topics:delete',
 		];
 		const modPrivileges = defaultPrivileges.concat([
+			'groups:topics:schedule',
 			'groups:posts:view_deleted',
 			'groups:purge',
 		]);
-		await privileges.categories.give(defaultPrivileges, category.cid, 'registered-users');
-		await privileges.categories.give(modPrivileges, category.cid, ['administrators', 'Global Moderators']);
-		await privileges.categories.give(['groups:find', 'groups:read', 'groups:topics:read'], category.cid, ['guests', 'spiders']);
+		const guestPrivileges = ['groups:find', 'groups:read', 'groups:topics:read'];
+
+		const result = await plugins.hooks.fire('filter:category.create', {
+			category: category,
+			data: data,
+			defaultPrivileges: defaultPrivileges,
+			modPrivileges: modPrivileges,
+			guestPrivileges: guestPrivileges,
+		});
+		category = result.category;
+
+		await db.setObject(`category:${category.cid}`, category);
+		if (!category.descriptionParsed) {
+			await Categories.parseDescription(category.cid, category.description);
+		}
+
+		await db.sortedSetAddBulk([
+			['categories:cid', category.order, category.cid],
+			[`cid:${parentCid}:children`, category.order, category.cid],
+			['categories:name', 0, `${data.name.substr(0, 200).toLowerCase()}:${category.cid}`],
+		]);
+
+		await privileges.categories.give(result.defaultPrivileges, category.cid, 'registered-users');
+		await privileges.categories.give(result.modPrivileges, category.cid, ['administrators', 'Global Moderators']);
+		await privileges.categories.give(result.guestPrivileges, category.cid, ['guests', 'spiders']);
 
 		cache.del(['categories:cid', 'cid:' + parentCid + ':children']);
 		if (data.cloneFromCid && parseInt(data.cloneFromCid, 10)) {
@@ -150,6 +163,11 @@ module.exports = function (Categories) {
 		if (copyParent) {
 			destination.parentCid = source.parentCid || 0;
 		}
+		await plugins.hooks.fire('filter:categories.copySettingsFrom', {
+			source: source,
+			destination: destination,
+			copyParent: copyParent,
+		});
 
 		await db.setObject('category:' + toCid, destination);
 

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/404.js

@@ -7,6 +7,7 @@ const validator = require('validator');
 const meta = require('../meta');
 const plugins = require('../plugins');
 const middleware = require('../middleware');
+const helpers = require('../middleware/helpers');
 
 exports.handle404 = function handle404(req, res) {
 	const relativePath = nconf.get('relative_path');
@@ -22,7 +23,13 @@ exports.handle404 = function handle404(req, res) {
 
 	if (isClientScript.test(req.url)) {
 		res.type('text/javascript').status(404).send('Not Found');
-	} else if (req.path.startsWith(relativePath + '/assets/uploads') || (req.get('accept') && !req.get('accept').includes('text/html')) || req.path === '/favicon.ico') {
+	} else if (
+		!res.locals.isAPI && (
+			req.path.startsWith(`${relativePath}/assets/uploads`) ||
+			(req.get('accept') && !req.get('accept').includes('text/html')) ||
+			req.path === '/favicon.ico'
+		)
+	) {
 		meta.errors.log404(req.path || '');
 		res.sendStatus(404);
 	} else if (req.accepts('html')) {
@@ -41,8 +48,16 @@ exports.send404 = async function (req, res) {
 	res.status(404);
 	const path = String(req.path || '');
 	if (res.locals.isAPI) {
-		return res.json({ path: validator.escape(path.replace(/^\/api/, '')), title: '[[global:404.title]]' });
+		return res.json({
+			path: validator.escape(path.replace(/^\/api/, '')),
+			title: '[[global:404.title]]',
+			bodyClass: helpers.buildBodyClass(req, res),
+		});
 	}
 	await middleware.buildHeaderAsync(req, res);
-	res.render('404', { path: validator.escape(path), title: '[[global:404.title]]' });
+	await res.render('404', {
+		path: validator.escape(path),
+		title: '[[global:404.title]]',
+		bodyClass: helpers.buildBodyClass(req, res),
+	});
 };

src/controllers/accounts/blocks.js

@@ -14,7 +14,7 @@ blocksController.getBlocks = async function (req, res, next) {
 	const start = Math.max(0, page - 1) * resultsPerPage;
 	const stop = start + resultsPerPage - 1;
 
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/categories.js

@@ -8,7 +8,7 @@ const helpers = require('../helpers');
 const categoriesController = module.exports;
 
 categoriesController.get = async function (req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/consent.js

@@ -12,7 +12,7 @@ consentController.get = async function (req, res, next) {
 		return next();
 	}
 
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/edit.js

@@ -12,7 +12,7 @@ const editController = module.exports;
 
 editController.get = async function (req, res, next) {
 	const [userData, canUseSignature] = await Promise.all([
-		accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid),
+		accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query),
 		privileges.global.can('signature', req.uid),
 	]);
 	if (!userData) {
@@ -114,7 +114,7 @@ async function renderRoute(name, req, res, next) {
 }
 
 async function getUserData(req) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return null;
 	}

src/controllers/accounts/follow.js

@@ -16,7 +16,7 @@ followController.getFollowers = async function (req, res, next) {
 };
 
 async function getFollow(tpl, name, req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/groups.js

@@ -7,7 +7,7 @@ const accountHelpers = require('./helpers');
 const groupsController = module.exports;
 
 groupsController.get = async function (req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/helpers.js

@@ -16,7 +16,7 @@ const categories = require('../../categories');
 
 const helpers = module.exports;
 
-helpers.getUserDataByUserSlug = async function (userslug, callerUID) {
+helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) {
 	const uid = await user.getUidByUserslug(userslug);
 	if (!uid) {
 		return null;
@@ -114,7 +114,11 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID) {
 
 	await getCounts(userData, callerUID);
 
-	const hookData = await plugins.hooks.fire('filter:helpers.getUserDataByUserSlug', { userData: userData, callerUID: callerUID });
+	const hookData = await plugins.hooks.fire('filter:helpers.getUserDataByUserSlug', {
+		userData: userData,
+		callerUID: callerUID,
+		query: query,
+	});
 	return hookData.userData;
 };
 

src/controllers/accounts/info.js

@@ -9,7 +9,7 @@ const pagination = require('../../pagination');
 const infoController = module.exports;
 
 infoController.get = async function (req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

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/accounts/posts.js

@@ -8,6 +8,8 @@ const categories = require('../../categories');
 const pagination = require('../../pagination');
 const helpers = require('../helpers');
 const accountHelpers = require('./helpers');
+const plugins = require('../../plugins');
+const utils = require('../../utils');
 
 const postsController = module.exports;
 
@@ -107,43 +109,43 @@ const templateToData = {
 };
 
 postsController.getBookmarks = async function (req, res, next) {
-	await getFromUserSet('account/bookmarks', req, res, next);
+	await getPostsFromUserSet('account/bookmarks', req, res, next);
 };
 
 postsController.getPosts = async function (req, res, next) {
-	await getFromUserSet('account/posts', req, res, next);
+	await getPostsFromUserSet('account/posts', req, res, next);
 };
 
 postsController.getUpVotedPosts = async function (req, res, next) {
-	await getFromUserSet('account/upvoted', req, res, next);
+	await getPostsFromUserSet('account/upvoted', req, res, next);
 };
 
 postsController.getDownVotedPosts = async function (req, res, next) {
-	await getFromUserSet('account/downvoted', req, res, next);
+	await getPostsFromUserSet('account/downvoted', req, res, next);
 };
 
 postsController.getBestPosts = async function (req, res, next) {
-	await getFromUserSet('account/best', req, res, next);
+	await getPostsFromUserSet('account/best', req, res, next);
 };
 
 postsController.getWatchedTopics = async function (req, res, next) {
-	await getFromUserSet('account/watched', req, res, next);
+	await getPostsFromUserSet('account/watched', req, res, next);
 };
 
 postsController.getIgnoredTopics = async function (req, res, next) {
-	await getFromUserSet('account/ignored', req, res, next);
+	await getPostsFromUserSet('account/ignored', req, res, next);
 };
 
 postsController.getTopics = async function (req, res, next) {
-	await getFromUserSet('account/topics', req, res, next);
+	await getPostsFromUserSet('account/topics', req, res, next);
 };
 
-async function getFromUserSet(template, req, res, callback) {
+async function getPostsFromUserSet(template, req, res, callback) {
 	const data = templateToData[template];
 	const page = Math.max(1, parseInt(req.query.page, 10) || 1);
 
 	const [userData, settings] = await Promise.all([
-		accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid),
+		accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query),
 		user.getSettings(req.uid),
 	]);
 
@@ -154,12 +156,26 @@ async function getFromUserSet(template, req, res, callback) {
 	const start = (page - 1) * itemsPerPage;
 	const stop = start + itemsPerPage - 1;
 	const sets = await data.getSets(req.uid, userData);
-
-	const [itemCount, itemData] = await Promise.all([
-		settings.usePagination ? db.sortedSetsCardSum(sets) : 0,
-		getItemData(sets, data, req, start, stop),
-	]);
-
+	let result;
+	if (plugins.hooks.hasListeners('filter:account.getPostsFromUserSet')) {
+		result = await plugins.hooks.fire('filter:account.getPostsFromUserSet', {
+			req: req,
+			template: template,
+			userData: userData,
+			settings: settings,
+			data: data,
+			start: start,
+			stop: stop,
+			itemCount: 0,
+			itemData: [],
+		});
+	} else {
+		result = await utils.promiseParallel({
+			itemCount: settings.usePagination ? db.sortedSetsCardSum(sets) : 0,
+			itemData: getItemData(sets, data, req, start, stop),
+		});
+	}
+	const { itemCount, itemData } = result;
 	userData[data.type] = itemData[data.type];
 	userData.nextStart = itemData.nextStart;
 

src/controllers/accounts/profile.js

@@ -25,7 +25,7 @@ profileController.get = async function (req, res, next) {
 		}
 	}
 
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/sessions.js

@@ -7,7 +7,7 @@ const accountHelpers = require('./helpers');
 const sessionController = module.exports;
 
 sessionController.get = async function (req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/settings.js

@@ -18,7 +18,7 @@ const accountHelpers = require('./helpers');
 const settingsController = module.exports;
 
 settingsController.get = async function (req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/accounts/uploads.js

@@ -11,7 +11,7 @@ const accountHelpers = require('./helpers');
 const uploadsController = module.exports;
 
 uploadsController.get = async function (req, res, next) {
-	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(req.params.userslug, req.uid, req.query);
 	if (!userData) {
 		return next();
 	}

src/controllers/category.js

@@ -3,6 +3,7 @@
 
 const nconf = require('nconf');
 const validator = require('validator');
+const qs = require('querystring');
 
 const db = require('../database');
 const privileges = require('../privileges');
@@ -42,15 +43,15 @@ categoryController.get = async function (req, res, next) {
 		return next();
 	}
 	if (topicIndex < 0) {
-		return helpers.redirect(res, '/category/' + categoryFields.slug);
+		return helpers.redirect(res, `/category/${categoryFields.slug}?${qs.stringify(req.query)}`);
 	}
 
 	if (!userPrivileges.read) {
 		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}?${qs.stringify(req.query)}`, true);
 	}
 
 	if (categoryFields.link) {
@@ -86,7 +87,7 @@ categoryController.get = async function (req, res, next) {
 	}
 
 	if (topicIndex > Math.max(categoryData.topic_count - 1, 0)) {
-		return helpers.redirect(res, '/category/' + categoryData.slug + '/' + categoryData.topic_count);
+		return helpers.redirect(res, `/category/${categoryData.slug}/${categoryData.topic_count}?${qs.stringify(req.query)}`);
 	}
 	const pageCount = Math.max(1, Math.ceil(categoryData.topic_count / userSettings.topicsPerPage));
 	if (userSettings.usePagination && currentPage > pageCount) {

src/controllers/errors.js

@@ -1,10 +1,11 @@
 'use strict';
 
-var nconf = require('nconf');
-var winston = require('winston');
-var validator = require('validator');
-var plugins = require('../plugins');
-var middleware = require('../middleware');
+const nconf = require('nconf');
+const winston = require('winston');
+const validator = require('validator');
+const plugins = require('../plugins');
+const middleware = require('../middleware');
+const helpers = require('../middleware/helpers');
 
 exports.handleURIErrors = async function handleURIErrors(err, req, res, next) {
 	// Handle cases where malformed URIs are passed in
@@ -56,12 +57,17 @@ exports.handleErrors = function handleErrors(err, req, res, next) { // eslint-di
 
 		res.status(status || 500);
 
-		var path = String(req.path || '');
+		const path = String(req.path || '');
+		const data = {
+			path: validator.escape(path),
+			error: validator.escape(String(err.message)),
+			bodyClass: helpers.buildBodyClass(req, res),
+		};
 		if (res.locals.isAPI) {
-			res.json({ path: validator.escape(path), error: err.message });
+			res.json(data);
 		} else {
 			await middleware.buildHeaderAsync(req, res);
-			res.render('500', { path: validator.escape(path), error: validator.escape(String(err.message)) });
+			res.render('500', data);
 		}
 	};
 

src/controllers/mods.js

@@ -106,6 +106,7 @@ modsController.flags.list = async function (req, res, next) {
 			filters: filters,
 			sort: sort,
 			uid: req.uid,
+			query: req.query,
 		}),
 		analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30),
 		categories.buildForSelect(req.uid, 'read'),

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/controllers/user.js

@@ -14,7 +14,7 @@ userController.getCurrentUser = async function (req, res) {
 		return res.status(401).json('not-authorized');
 	}
 	const userslug = await user.getUserField(req.uid, 'userslug');
-	const userData = await accountHelpers.getUserDataByUserSlug(userslug, req.uid);
+	const userData = await accountHelpers.getUserDataByUserSlug(userslug, req.uid, req.query);
 	res.json(userData);
 };
 

src/controllers/write/posts.js

@@ -38,14 +38,6 @@ Posts.delete = async (req, res) => {
 	helpers.formatApiResponse(200, res);
 };
 
-Posts.move = async (req, res) => {
-	await api.posts.move(req, {
-		pid: req.params.pid,
-		tid: req.body.tid,
-	});
-	helpers.formatApiResponse(200, res);
-};
-
 async function mock(req) {
 	const tid = await posts.getPostField(req.params.pid, 'tid');
 	return { pid: req.params.pid, room_id: `topic_${tid}` };
@@ -81,16 +73,3 @@ Posts.unbookmark = async (req, res) => {
 	await api.posts.unbookmark(req, data);
 	helpers.formatApiResponse(200, res);
 };
-
-Posts.getDiffs = async (req, res) => {
-	helpers.formatApiResponse(200, res, await api.posts.getDiffs(req, { ...req.params }));
-};
-
-Posts.loadDiff = async (req, res) => {
-	helpers.formatApiResponse(200, res, await api.posts.loadDiff(req, { ...req.params }));
-};
-
-Posts.restoreDiff = async (req, res) => {
-	helpers.formatApiResponse(200, res, await api.posts.restoreDiff(req, { ...req.params }));
-};
-

src/controllers/write/topics.js

@@ -104,14 +104,8 @@ Topics.deleteTags = async (req, res) => {
 };
 
 Topics.getThumbs = async (req, res) => {
-	if (isFinite(req.params.tid)) {	// post_uuids can be passed in occasionally, in that case no checks are necessary
-		const [exists, canRead] = await Promise.all([
-			topics.exists(req.params.tid),
-			privileges.topics.can('topics:read', req.params.tid, req.uid),
-		]);
-		if (!exists || !canRead) {
-			return helpers.formatApiResponse(403, res);
-		}
+	if (!await privileges.topics.can('topics:read', req.params.tid, req.uid)) {
+		return helpers.formatApiResponse(403, res);
 	}
 
 	helpers.formatApiResponse(200, res, await topics.thumbs.get(req.params.tid));

src/emailer.js

@@ -230,16 +230,6 @@ Emailer.send = async (template, uid, params) => {
 	params.uid = uid;
 	params.username = userData.username;
 	params.rtl = await translator.translate('[[language:dir]]', userSettings.userLang) === 'rtl';
-
-	const result = await Plugins.hooks.fire('filter:email.cancel', {
-		cancel: false, // set to true in plugin to cancel sending email
-		template: template,
-		params: params,
-	});
-
-	if (result.cancel) {
-		return;
-	}
 	await Emailer.sendToEmail(template, userData.email, userSettings.userLang, params);
 };
 

src/flags.js

@@ -121,13 +121,13 @@ Flags.get = async function (flagId) {
 	return data.flag;
 };
 
-Flags.getCount = async function ({ uid, filters }) {
+Flags.getCount = async function ({ uid, filters, query }) {
 	filters = filters || {};
-	const flagIds = await Flags.getFlagIdsWithFilters({ filters, uid });
+	const flagIds = await Flags.getFlagIdsWithFilters({ filters, uid, query });
 	return flagIds.length;
 };
 
-Flags.getFlagIdsWithFilters = async function ({ filters, uid }) {
+Flags.getFlagIdsWithFilters = async function ({ filters, uid, query }) {
 	let sets = [];
 	const orSets = [];
 
@@ -164,7 +164,13 @@ Flags.getFlagIdsWithFilters = async function ({ filters, uid }) {
 		}
 	}
 
-	return flagIds;
+	const result = await plugins.hooks.fire('filter:flags.getFlagIdsWithFilters', {
+		filters,
+		uid,
+		query,
+		flagIds,
+	});
+	return result.flagIds;
 };
 
 Flags.list = async function (data) {
@@ -172,6 +178,7 @@ Flags.list = async function (data) {
 	let flagIds = await Flags.getFlagIdsWithFilters({
 		filters,
 		uid: data.uid,
+		query: data.query,
 	});
 	flagIds = await Flags.sort(flagIds, data.sort);
 

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/assert.js

@@ -46,7 +46,7 @@ Assert.topic = helpers.try(async (req, res, next) => {
 
 Assert.post = helpers.try(async (req, res, next) => {
 	if (!await posts.exists(req.params.pid)) {
-		return controllerHelpers.formatApiResponse(404, res, new Error('[[error:no-post]]'));
+		return controllerHelpers.formatApiResponse(404, res, new Error('[[error:no-topic]]'));
 	}
 
 	next();

src/middleware/header.js

@@ -1,26 +1,26 @@
 'use strict';
 
-const nconf = require('nconf');
-const jsesc = require('jsesc');
-const _ = require('lodash');
+var nconf = require('nconf');
+var jsesc = require('jsesc');
+var _ = require('lodash');
 const validator = require('validator');
-const util = require('util');
+var util = require('util');
 
-const db = require('../database');
-const user = require('../user');
-const topics = require('../topics');
-const messaging = require('../messaging');
-const flags = require('../flags');
-const meta = require('../meta');
-const plugins = require('../plugins');
-const navigation = require('../navigation');
-const translator = require('../translator');
-const privileges = require('../privileges');
-const languages = require('../languages');
-const utils = require('../utils');
-const helpers = require('./helpers');
+var db = require('../database');
+var user = require('../user');
+var topics = require('../topics');
+var messaging = require('../messaging');
+var flags = require('../flags');
+var meta = require('../meta');
+var plugins = require('../plugins');
+var navigation = require('../navigation');
+var translator = require('../translator');
+var privileges = require('../privileges');
+var languages = require('../languages');
+var utils = require('../utils');
+var helpers = require('./helpers');
 
-const controllers = {
+var controllers = {
 	api: require('../controllers/api'),
 	helpers: require('../controllers/helpers'),
 };
@@ -49,9 +49,9 @@ middleware.buildHeader = helpers.try(async function buildHeader(req, res, next)
 middleware.buildHeaderAsync = util.promisify(middleware.buildHeader);
 
 middleware.renderHeader = async function renderHeader(req, res, data) {
-	const registrationType = meta.config.registrationType || 'normal';
+	var registrationType = meta.config.registrationType || 'normal';
 	res.locals.config = res.locals.config || {};
-	const templateValues = {
+	var templateValues = {
 		title: meta.config.title || '',
 		'title:url': meta.config['title:url'] || '',
 		description: meta.config.description || '',
@@ -109,6 +109,7 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
 		unreadCount: templateValues.unreadCount,
 	} = await appendUnreadCounts({
 		uid: req.uid,
+		query: req.query,
 		navigation: results.navigation,
 		unreadData,
 	}));
@@ -152,16 +153,17 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
 	return await req.app.renderAsync('header', hookReturn.templateValues);
 };
 
-async function appendUnreadCounts({ uid, navigation, unreadData }) {
+async function appendUnreadCounts({ uid, navigation, unreadData, query }) {
 	const originalRoutes = navigation.map(nav => nav.originalRoute);
 	const calls = {
-		unreadData: topics.getUnreadData({ uid: uid }),
+		unreadData: topics.getUnreadData({ uid: uid, query: query }),
 		unreadChatCount: messaging.getUnreadCount(uid),
 		unreadNotificationCount: user.notifications.getUnreadCount(uid),
 		unreadFlagCount: (async function () {
 			if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) {
 				return flags.getCount({
 					uid,
+					query,
 					filters: {
 						quick: 'unresolved',
 						cid: (await user.isAdminOrGlobalMod(uid)) ? [] : (await user.getModeratedCids(uid)),
@@ -240,7 +242,7 @@ middleware.renderFooter = async function renderFooter(req, res, templateValues)
 };
 
 function modifyTitle(obj) {
-	const title = controllers.helpers.buildTitle(meta.config.homePageTitle || '[[pages:home]]');
+	var title = controllers.helpers.buildTitle(meta.config.homePageTitle || '[[pages:home]]');
 	obj.browserTitle = title;
 
 	if (obj.metaTags) {

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/helpers.js

@@ -1,5 +1,9 @@
 'use strict';
 
+const winston = require('winston');
+const validator = require('validator');
+const slugify = require('../slugify');
+
 const helpers = module.exports;
 
 helpers.try = function (middleware) {
@@ -20,3 +24,34 @@ helpers.try = function (middleware) {
 		}
 	};
 };
+
+helpers.buildBodyClass = function (req, res, templateData = {}) {
+	const clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
+	const parts = clean.split('/').slice(0, 3);
+	parts.forEach((p, index) => {
+		try {
+			p = slugify(decodeURIComponent(p));
+		} catch (err) {
+			winston.error(err.stack);
+			p = '';
+		}
+		p = validator.escape(String(p));
+		parts[index] = index ? `${parts[0]}-${p}` : `page-${p || 'home'}`;
+	});
+
+	if (templateData.template && templateData.template.topic) {
+		parts.push(`page-topic-category-${templateData.category.cid}`);
+		parts.push(`page-topic-category-${slugify(templateData.category.name)}`);
+	}
+
+	if (Array.isArray(templateData.breadcrumbs)) {
+		templateData.breadcrumbs.forEach((crumb) => {
+			if (crumb && crumb.hasOwnProperty('cid')) {
+				parts.push(`parent-category-${crumb.cid}`);
+			}
+		});
+	}
+
+	parts.push(`page-status-${res.statusCode}`);
+	return parts.join(' ');
+};

src/middleware/render.js

@@ -2,82 +2,96 @@
 
 const nconf = require('nconf');
 const validator = require('validator');
-const winston = require('winston');
+
 
 const plugins = require('../plugins');
 const meta = require('../meta');
 const translator = require('../translator');
 const widgets = require('../widgets');
 const utils = require('../utils');
-const slugify = require('../slugify');
+const helpers = require('./helpers');
 
 const relative_path = nconf.get('relative_path');
 
 module.exports = function (middleware) {
 	middleware.processRender = function processRender(req, res, next) {
 		// res.render post-processing, modified from here: https://gist.github.com/mrlannigan/5051687
-		const render = res.render;
+		const { render } = res;
+
 		res.render = async function renderOverride(template, options, fn) {
 			const self = this;
-			const req = this.req;
-
-			options = options || {};
-			if (typeof options === 'function') {
-				fn = options;
-				options = {};
-			}
-
-			options.loggedIn = req.uid > 0;
-			options.relative_path = relative_path;
-			options.template = { name: template, [template]: true };
-			options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
-			options.bodyClass = buildBodyClass(req, res, options);
-
-			const buildResult = await plugins.hooks.fire('filter:' + template + '.build', { req: req, res: res, templateData: options });
-			const templateToRender = buildResult.templateData.templateToRender || template;
-
-			const renderResult = await plugins.hooks.fire('filter:middleware.render', { req: req, res: res, templateData: buildResult.templateData });
-			options = renderResult.templateData;
-			options._header = {
-				tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
-			};
-			options.widgets = await widgets.render(req.uid, {
-				template: template + '.tpl',
-				url: options.url,
-				templateData: options,
-				req: req,
-				res: res,
-			});
-			res.locals.template = template;
-			options._locals = undefined;
-
-			if (res.locals.isAPI) {
-				if (req.route && req.route.path === '/api/') {
-					options.title = '[[pages:home]]';
+			const { req } = this;
+			async function renderMethod(template, options, fn) {
+				options = options || {};
+				if (typeof options === 'function') {
+					fn = options;
+					options = {};
+				}
+
+				options.loggedIn = req.uid > 0;
+				options.relative_path = relative_path;
+				options.template = { name: template, [template]: true };
+				options.url = (req.baseUrl + req.path.replace(/^\/api/, ''));
+				options.bodyClass = helpers.buildBodyClass(req, res, options);
+
+				const buildResult = await plugins.hooks.fire(`filter:${template}.build`, { req: req, res: res, templateData: options });
+				if (res.headersSent) {
+					return;
+				}
+				const templateToRender = buildResult.templateData.templateToRender || template;
+
+				const renderResult = await plugins.hooks.fire('filter:middleware.render', { req: req, res: res, templateData: buildResult.templateData });
+				if (res.headersSent) {
+					return;
+				}
+				options = renderResult.templateData;
+				options._header = {
+					tags: await meta.tags.parse(req, renderResult, res.locals.metaTags, res.locals.linkTags),
+				};
+				options.widgets = await widgets.render(req.uid, {
+					template: `${template}.tpl`,
+					url: options.url,
+					templateData: options,
+					req: req,
+					res: res,
+				});
+				res.locals.template = template;
+				options._locals = undefined;
+
+				if (res.locals.isAPI) {
+					if (req.route && req.route.path === '/api/') {
+						options.title = '[[pages:home]]';
+					}
+					req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
+					return res.json(options);
+				}
+
+				const results = await utils.promiseParallel({
+					header: renderHeaderFooter('renderHeader', req, res, options),
+					content: renderContent(render, templateToRender, req, res, options),
+					footer: renderHeaderFooter('renderFooter', req, res, options),
+				});
+
+				const str = `${results.header +
+					(res.locals.postHeader || '') +
+					results.content
+				}<script id="ajaxify-data" type="application/json">${
+					JSON.stringify(options).replace(/<\//g, '<\\/')
+				}</script>${
+					res.locals.preFooter || ''
+				}${results.footer}`;
+
+				if (typeof fn !== 'function') {
+					self.send(str);
+				} else {
+					fn(null, str);
 				}
-				req.app.set('json spaces', global.env === 'development' || req.query.pretty ? 4 : 0);
-				return res.json(options);
 			}
 
-			const results = await utils.promiseParallel({
-				header: renderHeaderFooter('renderHeader', req, res, options),
-				content: renderContent(render, templateToRender, req, res, options),
-				footer: renderHeaderFooter('renderFooter', req, res, options),
-			});
-
-			const str = results.header +
-				(res.locals.postHeader || '') +
-				results.content +
-				'<script id="ajaxify-data" type="application/json">' +
-					JSON.stringify(options).replace(/<\//g, '<\\/') +
-				'</script>' +
-				(res.locals.preFooter || '') +
-				results.footer;
-
-			if (typeof fn !== 'function') {
-				self.send(str);
-			} else {
-				fn(null, str);
+			try {
+				await renderMethod(template, options, fn);
+			} catch (err) {
+				next(err);
 			}
 		};
 
@@ -117,34 +131,4 @@ module.exports = function (middleware) {
 		const translated = await translator.translate(str, language);
 		return translator.unescape(translated);
 	}
-
-	function buildBodyClass(req, res, templateData) {
-		const clean = req.path.replace(/^\/api/, '').replace(/^\/|\/$/g, '');
-		const parts = clean.split('/').slice(0, 3);
-		parts.forEach(function (p, index) {
-			try {
-				p = slugify(decodeURIComponent(p));
-			} catch (err) {
-				winston.error(err.stack);
-				p = '';
-			}
-			p = validator.escape(String(p));
-			parts[index] = index ? parts[0] + '-' + p : 'page-' + (p || 'home');
-		});
-
-		if (templateData.template.topic) {
-			parts.push('page-topic-category-' + templateData.category.cid);
-			parts.push('page-topic-category-' + slugify(templateData.category.name));
-		}
-		if (templateData.breadcrumbs) {
-			templateData.breadcrumbs.forEach(function (crumb) {
-				if (crumb.hasOwnProperty('cid')) {
-					parts.push('parent-category-' + crumb.cid);
-				}
-			});
-		}
-
-		parts.push('page-status-' + res.statusCode);
-		return parts.join(' ');
-	}
 };

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/notifications.js

@@ -123,6 +123,12 @@ Notifications.create = async function (data) {
 	}
 	const now = Date.now();
 	data.datetime = now;
+	const result = await plugins.hooks.fire('filter:notifications.create', {
+		data: data,
+	});
+	if (!result.data) {
+		return null;
+	}
 	await Promise.all([
 		db.sortedSetAdd('notifications', now, data.nid),
 		db.setObject('notifications:' + data.nid, data),
@@ -327,9 +333,10 @@ Notifications.prune = async function () {
 		]);
 
 		await batch.processSortedSet('users:joindate', async function (uids) {
-			const unread = uids.map(uid => 'uid:' + uid + ':notifications:unread');
-			const read = uids.map(uid => 'uid:' + uid + ':notifications:read');
-			await db.sortedSetsRemoveRangeByScore(unread.concat(read), '-inf', cutoffTime);
+			await Promise.all([
+				db.sortedSetsRemoveRangeByScore(uids.map(uid => 'uid:' + uid + ':notifications:unread'), '-inf', cutoffTime),
+				db.sortedSetsRemoveRangeByScore(uids.map(uid => 'uid:' + uid + ':notifications:read'), '-inf', cutoffTime),
+			]);
 		}, { batch: 500, interval: 100 });
 	} catch (err) {
 		if (err) {

src/plugins/hooks.js

@@ -92,7 +92,7 @@ Hooks.unregister = function (id, hook, method) {
 Hooks.fire = async function (hook, params) {
 	const hookList = plugins.loadedHooks[hook];
 	const hookType = hook.split(':')[0];
-	if (global.env === 'development' && hook !== 'action:plugins.firehook') {
+	if (global.env === 'development' && hook !== 'action:plugins.fireHook') {
 		winston.verbose('[plugins/fireHook] ' + hook);
 	}
 
@@ -102,8 +102,8 @@ Hooks.fire = async function (hook, params) {
 	}
 	const result = await hookTypeToMethod[hookType](hook, hookList, params);
 
-	if (hook !== 'action:plugins.firehook') {
-		Hooks.fire('action:plugins.firehook', { hook: hook, params: params });
+	if (hook !== 'action:plugins.fireHook') {
+		Hooks.fire('action:plugins.fireHook', { hook: hook, params: params });
 	}
 	if (result !== undefined) {
 		return result;

src/posts/create.js

@@ -24,7 +24,7 @@ module.exports = function (Posts) {
 			throw new Error('[[error:invalid-uid]]');
 		}
 
-		if (data.toPid && !utils.isNumber(data.toPid)) {
+		if (data.hasOwnProperty('toPid') && !utils.isNumber(data.toPid)) {
 			throw new Error('[[error:invalid-pid]]');
 		}
 

src/routes/write/posts.js

@@ -18,17 +18,11 @@ module.exports = function () {
 	setupApiRoute(router, 'put', '/:pid/state', [...middlewares, middleware.assert.post], controllers.write.posts.restore);
 	setupApiRoute(router, 'delete', '/:pid/state', [...middlewares, middleware.assert.post], controllers.write.posts.delete);
 
-	setupApiRoute(router, 'put', '/:pid/move', [...middlewares, middleware.assert.post, middleware.checkRequired.bind(null, ['tid'])], controllers.write.posts.move);
-
 	setupApiRoute(router, 'put', '/:pid/vote', [...middlewares, middleware.checkRequired.bind(null, ['delta']), middleware.assert.post], controllers.write.posts.vote);
 	setupApiRoute(router, 'delete', '/:pid/vote', [...middlewares, middleware.assert.post], controllers.write.posts.unvote);
 
 	setupApiRoute(router, 'put', '/:pid/bookmark', [...middlewares, middleware.assert.post], controllers.write.posts.bookmark);
 	setupApiRoute(router, 'delete', '/:pid/bookmark', [...middlewares, middleware.assert.post], controllers.write.posts.unbookmark);
 
-	setupApiRoute(router, 'get', '/:pid/diffs', [middleware.authenticateOrGuest, middleware.assert.post], controllers.write.posts.getDiffs);
-	setupApiRoute(router, 'get', '/:pid/diffs/:since', [middleware.authenticateOrGuest, middleware.assert.post], controllers.write.posts.loadDiff);
-	setupApiRoute(router, 'put', '/:pid/diffs/:since', [...middlewares, middleware.assert.post], controllers.write.posts.restoreDiff);
-
 	return router;
 };

src/search.js

@@ -282,7 +282,7 @@ async function getWatchedCids(data) {
 	if (!data.categories.includes('watched')) {
 		return [];
 	}
-	return await user.getCategoriesByStates(data.uid, [categories.watchStates.watching]);
+	return await user.getWatchedCategories(data.uid);
 }
 
 async function getChildrenCids(data) {

src/socket.io/categories.js

@@ -6,6 +6,7 @@ const user = require('../user');
 const topics = require('../topics');
 const api = require('../api');
 const sockets = require('.');
+const plugins = require('../plugins');
 
 const SocketCategories = module.exports;
 
@@ -94,12 +95,17 @@ SocketCategories.getMoveCategories = async function (socket, data) {
 	return await SocketCategories.getSelectCategories(socket, data);
 };
 
-SocketCategories.getSelectCategories = async function (socket) {
+SocketCategories.getSelectCategories = async function (socket, data) {
 	const [isAdmin, categoriesData] = await Promise.all([
 		user.isAdministrator(socket.uid),
 		categories.buildForSelect(socket.uid, 'find', ['disabled', 'link']),
 	]);
-	return categoriesData.filter(category => category && (!category.disabled || isAdmin) && !category.link);
+	const result = await plugins.hooks.fire('filter:categories.getSelectCategories', {
+		categories: categoriesData,
+		isAdmin: isAdmin,
+		query: data.query || {},
+	});
+	return result.categories.filter(category => category && (!category.disabled || isAdmin) && !category.link);
 };
 
 SocketCategories.setWatchState = async function (socket, data) {

src/socket.io/helpers.js

@@ -18,10 +18,8 @@ const apiHelpers = require('../api/helpers');
 const SocketHelpers = module.exports;
 
 SocketHelpers.setDefaultPostData = function (data, socket) {
-	data.uid = socket.uid;
-	data.req = apiHelpers.buildReqObject(socket);
-	data.timestamp = Date.now();
-	data.fromQueue = false;
+	websockets.warnDeprecated(socket, 'apiHelpers.setDefaultPostData');
+	apiHelpers.setDefaultPostData(socket, data);
 };
 
 SocketHelpers.notifyNew = async function (uid, type, result) {

src/socket.io/posts.js

@@ -6,11 +6,11 @@ const privileges = require('../privileges');
 const plugins = require('../plugins');
 const meta = require('../meta');
 const topics = require('../topics');
-const categories = require('../categories');
 const user = require('../user');
 const socketHelpers = require('./helpers');
 const utils = require('../utils');
 const api = require('../api');
+const apiHelpers = require('../api/helpers');
 
 const sockets = require('.');
 const SocketPosts = module.exports;
@@ -29,7 +29,7 @@ SocketPosts.reply = async function (socket, data) {
 		throw new Error('[[error:invalid-data]]');
 	}
 
-	socketHelpers.setDefaultPostData(data, socket);
+	apiHelpers.setDefaultPostData(socket, data);
 	await meta.blacklist.test(data.req.ip);
 	const shouldQueue = await posts.shouldQueue(socket.uid, data);
 	if (shouldQueue) {
@@ -100,41 +100,6 @@ SocketPosts.getPost = async function (socket, pid) {
 	return await api.posts.get(socket, { pid });
 };
 
-SocketPosts.loadMoreBookmarks = async function (socket, data) {
-	return await loadMorePosts('uid:' + data.uid + ':bookmarks', socket.uid, data);
-};
-
-SocketPosts.loadMoreUserPosts = async function (socket, data) {
-	const cids = await categories.getCidsByPrivilege('categories:cid', socket.uid, 'topics:read');
-	const keys = cids.map(c => 'cid:' + c + ':uid:' + data.uid + ':pids');
-	return await loadMorePosts(keys, socket.uid, data);
-};
-
-SocketPosts.loadMoreBestPosts = async function (socket, data) {
-	const cids = await categories.getCidsByPrivilege('categories:cid', socket.uid, 'topics:read');
-	const keys = cids.map(c => 'cid:' + c + ':uid:' + data.uid + ':pids:votes');
-	return await loadMorePosts(keys, socket.uid, data);
-};
-
-SocketPosts.loadMoreUpVotedPosts = async function (socket, data) {
-	return await loadMorePosts('uid:' + data.uid + ':upvote', socket.uid, data);
-};
-
-SocketPosts.loadMoreDownVotedPosts = async function (socket, data) {
-	return await loadMorePosts('uid:' + data.uid + ':downvote', socket.uid, data);
-};
-
-async function loadMorePosts(set, uid, data) {
-	if (!data || !utils.isNumber(data.uid) || !utils.isNumber(data.after)) {
-		throw new Error('[[error:invalid-data]]');
-	}
-
-	const start = Math.max(0, parseInt(data.after, 10));
-	const stop = start + 9;
-
-	return await posts.getPostSummariesFromSet(set, uid, start, stop);
-}
-
 SocketPosts.getCategory = async function (socket, pid) {
 	return await posts.getCidByPid(pid);
 };

src/socket.io/posts/diffs.js

@@ -1,21 +1,67 @@
 'use strict';
 
-const api = require('../../api');
+const posts = require('../../posts');
+const user = require('../../user');
+const privileges = require('../../privileges');
+const apiHelpers = require('../../api/helpers');
 const websockets = require('..');
 
 module.exports = function (SocketPosts) {
 	SocketPosts.getDiffs = async function (socket, data) {
-		websockets.warnDeprecated(socket, 'GET /api/v3/posts/:pid/diffs');
-		return await api.posts.getDiffs(socket, data);
+		await privilegeCheck(data.pid, socket.uid);
+		const timestamps = await posts.diffs.list(data.pid);
+		const post = await posts.getPostFields(data.pid, ['timestamp', 'uid']);
+
+		const diffs = await posts.diffs.get(data.pid);
+		const uids = diffs.map(diff => diff.uid || null);
+		uids.push(post.uid);
+		let usernames = await user.getUsersFields(uids, ['username']);
+		usernames = usernames.map(userObj => (userObj.uid ? userObj.username : null));
+
+		let canEdit = true;
+		try {
+			await user.isPrivilegedOrSelf(socket.uid, post.uid);
+		} catch (e) {
+			canEdit = false;
+		}
+
+		timestamps.push(post.timestamp);
+
+		return {
+			timestamps: timestamps,
+			revisions: timestamps.map((timestamp, idx) => ({
+				timestamp: timestamp,
+				username: usernames[idx],
+			})),
+			editable: canEdit,
+		};
 	};
 
 	SocketPosts.showPostAt = async function (socket, data) {
-		websockets.warnDeprecated(socket, 'GET /api/v3/posts/:pid/diffs/:since');
-		return await api.posts.loadDiff(socket, data);
+		await privilegeCheck(data.pid, socket.uid);
+		return await posts.diffs.load(data.pid, data.since, socket.uid);
 	};
 
+	async function privilegeCheck(pid, uid) {
+		const [deleted, privilegesData] = await Promise.all([
+			posts.getPostField(pid, 'deleted'),
+			privileges.posts.get([pid], uid),
+		]);
+
+		const allowed = privilegesData[0]['posts:history'] && (deleted ? privilegesData[0]['posts:view_deleted'] : true);
+		if (!allowed) {
+			throw new Error('[[error:no-privileges]]');
+		}
+	}
+
 	SocketPosts.restoreDiff = async function (socket, data) {
-		websockets.warnDeprecated(socket, 'PUT /api/v3/posts/:pid/diffs/:since');
-		return await api.posts.restoreDiff(socket, data);
+		const cid = await posts.getCidByPid(data.pid);
+		const canEdit = await privileges.categories.can('edit', cid, socket.uid);
+		if (!canEdit) {
+			throw new Error('[[error:no-privileges]]');
+		}
+
+		const edit = await posts.diffs.restore(data.pid, data.since, socket.uid, apiHelpers.buildReqObject(socket));
+		websockets.in('topic_' + edit.topic.tid).emit('event:post_edited', edit);
 	};
 };

src/socket.io/posts/move.js

@@ -1,33 +1,45 @@
 'use strict';
 
-const api = require('../../api');
-const sockets = require('..');
+const privileges = require('../../privileges');
+const topics = require('../../topics');
+const posts = require('../../posts');
+const socketHelpers = require('../helpers');
 
 module.exports = function (SocketPosts) {
-	function moveChecks(socket, typeCheck, data) {
+	SocketPosts.movePost = async function (socket, data) {
+		await SocketPosts.movePosts(socket, { pids: [data.pid], tid: data.tid });
+	};
+
+	SocketPosts.movePosts = async function (socket, data) {
 		if (!socket.uid) {
 			throw new Error('[[error:not-logged-in]]');
 		}
 
-		if (!data || !typeCheck || !data.tid) {
+		if (!data || !Array.isArray(data.pids) || !data.tid) {
 			throw new Error('[[error:invalid-data]]');
 		}
-	}
 
-	SocketPosts.movePost = async function (socket, data) {
-		sockets.warnDeprecated(socket, 'PUT /api/v3/posts/:pid/move');
+		const canMove = await privileges.topics.isAdminOrMod(data.tid, socket.uid);
+		if (!canMove) {
+			throw new Error('[[error:no-privileges]]');
+		}
 
-		moveChecks(socket, isFinite(data.pid), data);
-		await api.posts.move(socket, data);
-	};
+		for (const pid of data.pids) {
+			/* eslint-disable no-await-in-loop */
+			const canMove = await privileges.posts.canMove(pid, socket.uid);
+			if (!canMove) {
+				throw new Error('[[error:no-privileges]]');
+			}
+			await topics.movePostToTopic(socket.uid, pid, data.tid);
 
-	SocketPosts.movePosts = async function (socket, data) {
-		sockets.warnDeprecated(socket, 'PUT /api/v3/posts/:pid/move');
+			const [postDeleted, topicDeleted] = await Promise.all([
+				posts.getPostField(pid, 'deleted'),
+				topics.getTopicField(data.tid, 'deleted'),
+			]);
 
-		moveChecks(socket, !Array.isArray(data.pids), data);
-		await Promise.all(data.pids.map(async pid => api.posts.move(socket, {
-			tid: data.tid,
-			pid,
-		})));
+			if (!postDeleted && !topicDeleted) {
+				socketHelpers.sendNotificationToPostOwner(pid, socket.uid, 'move', 'notifications:moved_your_post');
+			}
+		}
 	};
 };

src/socket.io/topics/infinitescroll.js

@@ -1,7 +1,6 @@
 'use strict';
 
 const topics = require('../../topics');
-const categories = require('../../categories');
 const privileges = require('../../privileges');
 const meta = require('../../meta');
 const utils = require('../../utils');
@@ -89,12 +88,6 @@ module.exports = function (SocketTopics) {
 		return await topics.getTopicsFromSet(data.set, socket.uid, start, stop);
 	};
 
-	SocketTopics.loadMoreUserTopics = async function (socket, data) {
-		const cids = await categories.getCidsByPrivilege('categories:cid', socket.uid, 'topics:read');
-		data.set = cids.map(c => 'cid:' + c + ':uid:' + data.uid + ':tids');
-		return await SocketTopics.loadMoreFromSet(socket, data);
-	};
-
 	function calculateStartStop(data) {
 		const itemsPerPage = Math.min(meta.config.topicsPerPage || 20, parseInt(data.count, 10) || meta.config.topicsPerPage || 20);
 		let start = Math.max(0, parseInt(data.after, 10));

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;

src/upgrades/1.15.0/fullname_search_set.js

@@ -16,7 +16,7 @@ module.exports = {
 			const userData = await user.getUsersFields(uids, ['uid', 'fullname']);
 			const bulkAdd = userData
 				.filter(u => u.uid && u.fullname)
-				.map(u => ['fullname:sorted', 0, String(u.fullname).substr(0, 255).toLowerCase() + ':' + u.uid]);
+				.map(u => ['fullname:sorted', 0, u.fullname.substr(0, 255).toLowerCase() + ':' + u.uid]);
 			await db.sortedSetAddBulk(bulkAdd);
 		}, {
 			batch: 500,

src/upgrades/1.15.0/verified_users_group.js

@@ -13,9 +13,6 @@ module.exports = {
 	timestamp: Date.UTC(2020, 9, 13),
 	method: async function () {
 		const progress = this.progress;
-
-		const maxGroupLength = meta.config.maximumGroupNameLength;
-		meta.config.maximumGroupNameLength = 30;
 		const timestamp = await db.getObjectField('group:administrators', 'timestamp');
 		const verifiedExists = await groups.exists('verified-users');
 		if (!verifiedExists) {
@@ -41,8 +38,7 @@ module.exports = {
 				timestamp: timestamp + 1,
 			});
 		}
-		// restore setting
-		meta.config.maximumGroupNameLength = maxGroupLength;
+
 		await batch.processSortedSet('users:joindate', async function (uids) {
 			progress.incr(uids.length);
 			const userData = await user.getUsersFields(uids, ['uid', 'email:confirmed']);

src/user/categories.js

@@ -4,6 +4,7 @@ const _ = require('lodash');
 
 const db = require('../database');
 const categories = require('../categories');
+const plugins = require('../plugins');
 
 module.exports = function (User) {
 	User.setCategoryWatchState = async function (uid, cids, state) {
@@ -36,14 +37,24 @@ module.exports = function (User) {
 		if (!(parseInt(uid, 10) > 0)) {
 			return [];
 		}
-		return await User.getCategoriesByStates(uid, [categories.watchStates.ignoring]);
+		const cids = await User.getCategoriesByStates(uid, [categories.watchStates.ignoring]);
+		const result = await plugins.hooks.fire('filter:user.getIgnoredCategories', {
+			uid: uid,
+			cids: cids,
+		});
+		return result.cids;
 	};
 
 	User.getWatchedCategories = async function (uid) {
 		if (!(parseInt(uid, 10) > 0)) {
 			return [];
 		}
-		return await User.getCategoriesByStates(uid, [categories.watchStates.watching]);
+		const cids = await User.getCategoriesByStates(uid, [categories.watchStates.watching]);
+		const result = await plugins.hooks.fire('filter:user.getWatchedCategories', {
+			uid: uid,
+			cids: cids,
+		});
+		return result.cids;
 	};
 
 	User.getCategoriesByStates = async function (uid, states) {

test/api.js

@@ -135,12 +135,6 @@ describe('API', async () => {
 			title: 'Test Topic 2',
 			content: 'Test topic 2 content',
 		});
-		await topics.post({
-			uid: unprivUid,
-			cid: testCategory.cid,
-			title: 'Test Topic 3',
-			content: 'Test topic 3 content',
-		});
 
 		// Create a sample flag
 		await flags.create('post', 1, unprivUid, 'sample reasons', Date.now());

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/posts.js

@@ -901,55 +901,8 @@ describe('Post\'s', function () {
 			});
 		});
 
-		it('shold error with invalid data', function (done) {
-			socketPosts.loadMoreBookmarks({ uid: voterUid }, { uid: voterUid, after: null }, function (err) {
-				assert.equal(err.message, '[[error:invalid-data]]');
-				done();
-			});
-		});
-
-		it('should load more bookmarks', function (done) {
-			socketPosts.loadMoreBookmarks({ uid: voterUid }, { uid: voterUid, after: 0 }, function (err, data) {
-				assert.ifError(err);
-				assert(data);
-				done();
-			});
-		});
-
-		it('should load more user posts', function (done) {
-			socketPosts.loadMoreUserPosts({ uid: voterUid }, { uid: voterUid, after: 0 }, function (err, data) {
-				assert.ifError(err);
-				assert(data);
-				done();
-			});
-		});
-
-		it('should load more best posts', function (done) {
-			socketPosts.loadMoreBestPosts({ uid: voterUid }, { uid: voterUid, after: 0 }, function (err, data) {
-				assert.ifError(err);
-				assert(data);
-				done();
-			});
-		});
-
-		it('should load more up voted posts', function (done) {
-			socketPosts.loadMoreUpVotedPosts({ uid: voterUid }, { uid: voterUid, after: 0 }, function (err, data) {
-				assert.ifError(err);
-				assert(data);
-				done();
-			});
-		});
-
-		it('should load more down voted posts', function (done) {
-			socketPosts.loadMoreDownVotedPosts({ uid: voterUid }, { uid: voterUid, after: 0 }, function (err, data) {
-				assert.ifError(err);
-				assert(data);
-				done();
-			});
-		});
-
-		it('should get post category', function (done) {
-			socketPosts.getCategory({ uid: voterUid }, pid, function (err, postCid) {
+		it('should get post category', (done) => {
+			socketPosts.getCategory({ uid: voterUid }, pid, (err, postCid) => {
 				assert.ifError(err);
 				assert.equal(cid, postCid);
 				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');
+		});
 	});
 });

test/translator.js

@@ -135,16 +135,6 @@ describe('new Translator(language)', function () {
 			});
 		});
 
-		it('should translate escaped translation arguments properly', function () {
-			// https://github.com/NodeBB/NodeBB/issues/9206
-			var translator = Translator.create('en-GB');
-
-			var key = '[[notifications:upvoted_your_post_in, test1, error: Error: [[error:group-name-too-long]] on NodeBB Upgrade]]';
-			return translator.translate(key).then(function (translated) {
-				assert.strictEqual(translated, '<strong>test1</strong> has upvoted your post in <strong>error: Error: &lsqb;&lsqb;error:group-name-too-long&rsqb;&rsqb; on NodeBB Upgrade</strong>.');
-			});
-		});
-
 		it('should properly escape and ignore % and \\, in arguments', function () {
 			var translator = Translator.create('en-GB');