From 518157d9faf05b155dc43a5fa230c02d4f1803c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Mon, 17 May 2021 10:26:32 -0400 Subject: [PATCH] feat: pass req.query to getUserDataByUserSlug --- src/controllers/accounts/blocks.js | 2 +- src/controllers/accounts/categories.js | 2 +- src/controllers/accounts/consent.js | 2 +- src/controllers/accounts/edit.js | 4 ++-- src/controllers/accounts/follow.js | 2 +- src/controllers/accounts/groups.js | 2 +- src/controllers/accounts/helpers.js | 8 ++++++-- src/controllers/accounts/info.js | 2 +- src/controllers/accounts/posts.js | 2 +- src/controllers/accounts/profile.js | 2 +- src/controllers/accounts/sessions.js | 2 +- src/controllers/accounts/settings.js | 2 +- src/controllers/accounts/uploads.js | 2 +- src/controllers/user.js | 2 +- 14 files changed, 20 insertions(+), 16 deletions(-) diff --git a/src/controllers/accounts/blocks.js b/src/controllers/accounts/blocks.js index 7665d4d2b9..12962e1027 100644 --- a/src/controllers/accounts/blocks.js +++ b/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(); } diff --git a/src/controllers/accounts/categories.js b/src/controllers/accounts/categories.js index c752a377f7..a5cd86c9d5 100644 --- a/src/controllers/accounts/categories.js +++ b/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(); } diff --git a/src/controllers/accounts/consent.js b/src/controllers/accounts/consent.js index 3456fceb54..a4b5cd02c9 100644 --- a/src/controllers/accounts/consent.js +++ b/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(); } diff --git a/src/controllers/accounts/edit.js b/src/controllers/accounts/edit.js index c050ea422c..3bcaff1d85 100644 --- a/src/controllers/accounts/edit.js +++ b/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; } diff --git a/src/controllers/accounts/follow.js b/src/controllers/accounts/follow.js index 77543b5271..82b23cb2f9 100644 --- a/src/controllers/accounts/follow.js +++ b/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(); } diff --git a/src/controllers/accounts/groups.js b/src/controllers/accounts/groups.js index db9651e9fe..7d2f03cbf3 100644 --- a/src/controllers/accounts/groups.js +++ b/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(); } diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js index 718f5fe7c4..359355da87 100644 --- a/src/controllers/accounts/helpers.js +++ b/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; }; diff --git a/src/controllers/accounts/info.js b/src/controllers/accounts/info.js index 6fd247eb31..950b74945d 100644 --- a/src/controllers/accounts/info.js +++ b/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(); } diff --git a/src/controllers/accounts/posts.js b/src/controllers/accounts/posts.js index b589b3990a..ab213609bf 100644 --- a/src/controllers/accounts/posts.js +++ b/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), ]); diff --git a/src/controllers/accounts/profile.js b/src/controllers/accounts/profile.js index 599d0bab79..71a9f01ee6 100644 --- a/src/controllers/accounts/profile.js +++ b/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(); } diff --git a/src/controllers/accounts/sessions.js b/src/controllers/accounts/sessions.js index 26bbc3c8b9..c1713d3d62 100644 --- a/src/controllers/accounts/sessions.js +++ b/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(); } diff --git a/src/controllers/accounts/settings.js b/src/controllers/accounts/settings.js index 8d561bc976..848f62b893 100644 --- a/src/controllers/accounts/settings.js +++ b/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(); } diff --git a/src/controllers/accounts/uploads.js b/src/controllers/accounts/uploads.js index 95fce14801..d1c113846a 100644 --- a/src/controllers/accounts/uploads.js +++ b/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(); } diff --git a/src/controllers/user.js b/src/controllers/user.js index 353c4170c1..acd018ce67 100644 --- a/src/controllers/user.js +++ b/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); };