Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 23:40:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: pass req.query to getUserDataByUserSlug

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-05-17 10:26:32 -04:00
parent fdf7e65331
commit 9f6ad7637e
14 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/controllers/accounts/blocks.js
View File

@@ -14,7 +14,7 @@ blocksController.getBlocks = async function (req, res, next) {
const start = Math.max(0, page - 1) * resultsPerPage; const start = Math.max(0, page - 1) * resultsPerPage;
const stop = start + resultsPerPage - 1; 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/categories.js
View File

@@ -8,7 +8,7 @@ const helpers = require('../helpers');
const categoriesController = module.exports; const categoriesController = module.exports;
categoriesController.get = async function (req, res, next) { 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/consent.js
View File

@@ -12,7 +12,7 @@ consentController.get = async function (req, res, next) {
return 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) { if (!userData) {
return next(); return next();
} }

4
src/controllers/accounts/edit.js
View File

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

2
src/controllers/accounts/follow.js
View File

@@ -16,7 +16,7 @@ followController.getFollowers = async function (req, res, next) {
}; };
async function getFollow(tpl, name, 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/groups.js
View File

@@ -7,7 +7,7 @@ const accountHelpers = require('./helpers');
const groupsController = module.exports; const groupsController = module.exports;
groupsController.get = async function (req, res, next) { 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) { if (!userData) {
return next(); return next();
} }

8
src/controllers/accounts/helpers.js
View File

@@ -16,7 +16,7 @@ const categories = require('../../categories');
const helpers = module.exports; const helpers = module.exports;
helpers.getUserDataByUserSlug = async function (userslug, callerUID) { helpers.getUserDataByUserSlug = async function (userslug, callerUID, query = {}) {
const uid = await user.getUidByUserslug(userslug); const uid = await user.getUidByUserslug(userslug);
if (!uid) { if (!uid) {
return null; return null;
@@ -114,7 +114,11 @@ helpers.getUserDataByUserSlug = async function (userslug, callerUID) {
await getCounts(userData, 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; return hookData.userData;
}; };

2
src/controllers/accounts/info.js
View File

@@ -9,7 +9,7 @@ const pagination = require('../../pagination');
const infoController = module.exports; const infoController = module.exports;
infoController.get = async function (req, res, next) { 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/posts.js
View File

@@ -145,7 +145,7 @@ async function getPostsFromUserSet(template, req, res, callback) {
const page = Math.max(1, parseInt(req.query.page, 10) || 1); const page = Math.max(1, parseInt(req.query.page, 10) || 1);
const [userData, settings] = await Promise.all([ 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), user.getSettings(req.uid),
]); ]);

2
src/controllers/accounts/profile.js
View File

@@ -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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/sessions.js
View File

@@ -7,7 +7,7 @@ const accountHelpers = require('./helpers');
const sessionController = module.exports; const sessionController = module.exports;
sessionController.get = async function (req, res, next) { 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/settings.js
View File

@@ -18,7 +18,7 @@ const accountHelpers = require('./helpers');
const settingsController = module.exports; const settingsController = module.exports;
settingsController.get = async function (req, res, next) { 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/accounts/uploads.js
View File

@@ -11,7 +11,7 @@ const accountHelpers = require('./helpers');
const uploadsController = module.exports; const uploadsController = module.exports;
uploadsController.get = async function (req, res, next) { 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) { if (!userData) {
return next(); return next();
} }

2
src/controllers/user.js
View File

@@ -14,7 +14,7 @@ userController.getCurrentUser = async function (req, res) {
return res.status(401).json('not-authorized'); return res.status(401).json('not-authorized');
} }
const userslug = await user.getUserField(req.uid, 'userslug'); 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); res.json(userData);
}; };