feat: pass req.query to getUserDataByUserSlug

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

@@ -10,7 +10,7 @@ const meta = require('../../meta');
 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;
@@ -117,7 +117,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/posts.js

@@ -145,7 +145,7 @@ async function getPostsFromUserSet(template, req, res, callback) {
 	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),
 	]);
 

src/controllers/accounts/profile.js

@@ -26,7 +26,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/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);
 };