Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: add req.query to flags.list/getCount

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-05-19 10:01:33 -04:00
parent 573a6e11e3
commit 3d6bdeb3df
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/controllers/mods.js
View File

@@ -83,6 +83,7 @@ modsController.flags.list = async function (req, res, next) {
filters: filters, filters: filters,
sort: sort, sort: sort,
uid: req.uid, uid: req.uid,
query: req.query,
}), }),
analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30), analytics.getDailyStatsForSet('analytics:flags', Date.now(), 30),
helpers.getSelectedCategory(filters.cid), helpers.getSelectedCategory(filters.cid),

8
src/flags.js
View File

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

4
src/middleware/header.js
View File

@@ -109,6 +109,7 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
unreadCount: templateValues.unreadCount, unreadCount: templateValues.unreadCount,
} = await appendUnreadCounts({ } = await appendUnreadCounts({
uid: req.uid, uid: req.uid,
query: req.query,
navigation: results.navigation, navigation: results.navigation,
unreadData, unreadData,
})); }));
@@ -152,7 +153,7 @@ middleware.renderHeader = async function renderHeader(req, res, data) {
return await req.app.renderAsync('header', hookReturn.templateValues); 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 originalRoutes = navigation.map(nav => nav.originalRoute);
const calls = { const calls = {
unreadData: topics.getUnreadData({ uid: uid }), unreadData: topics.getUnreadData({ uid: uid }),
@@ -162,6 +163,7 @@ async function appendUnreadCounts({ uid, navigation, unreadData }) {
if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) { if (originalRoutes.includes('/flags') && await user.isPrivileged(uid)) {
return flags.getCount({ return flags.getCount({
uid, uid,
query,
filters: { filters: {
quick: 'unresolved', quick: 'unresolved',
cid: (await user.isAdminOrGlobalMod(uid)) ? [] : (await user.getModeratedCids(uid)), cid: (await user.isAdminOrGlobalMod(uid)) ? [] : (await user.getModeratedCids(uid)),