Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-26 08:31:22 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: make the /api/world data more category-like

Browse Source
This commit is contained in:
Opliko
2024-03-28 13:14:02 +01:00
parent 3c6966fb0f
commit e266b44745
2 changed files with 29 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/categories/data.js
View File

@@ -24,7 +24,10 @@ const worldCategory = {
color: '#333', color: '#333',
slug: '../world', slug: '../world',
parentCid: 0, parentCid: 0,
disabled: 0, // todo disabled: 0,
handle: 'world',
link: '',
class: '', // todo
}; };
module.exports = function (Categories) { module.exports = function (Categories) {

31
src/controllers/activitypub/topics.js
View File

@@ -16,6 +16,10 @@ const meta = require('../../meta');
const controller = module.exports; const controller = module.exports;
const validSorts = [
'recently_replied', 'recently_created', 'most_posts', 'most_votes', 'most_views',
];
controller.list = async function (req, res) { controller.list = async function (req, res) {
const { topicsPerPage } = await user.getSettings(req.uid); const { topicsPerPage } = await user.getSettings(req.uid);
const page = parseInt(req.query.page, 10) || 1; const page = parseInt(req.query.page, 10) || 1;
@@ -36,18 +40,33 @@ controller.list = async function (req, res) {
weights: sets.map((s, index) => (index ? 0 : 1)), weights: sets.map((s, index) => (index ? 0 : 1)),
}); });
const [categoryFields, userPrivileges, rssToken] = await Promise.all([ const [userPrivileges, tagData, userSettings, rssToken] = await Promise.all([
categories.getCategoryFields(-1, ['name', 'description', 'icon', 'imageClass', 'color', 'bgColor']), privileges.categories.get('-1', req.uid),
privileges.categories.get(-1, req.uid), helpers.getSelectedTag(req.query.tag),
user.getSettings(req.uid),
user.auth.getFeedToken(req.uid), user.auth.getFeedToken(req.uid),
]); ]);
const data = categoryFields; const targetUid = await user.getUidByUserslug(req.query.author);
data.cid = -1; const sort = validSorts.includes(req.query.sort) ? req.query.sort : userSettings.categoryTopicSort;
const data = await categories.getCategoryById({
uid: req.uid,
cid: '-1',
start: start,
stop: stop,
sort: sort,
settings: userSettings,
query: req.query,
tag: req.query.tag,
targetUid: targetUid,
});
delete data.children;
data.topicCount = await db.sortedSetIntersectCard(sets); data.topicCount = await db.sortedSetIntersectCard(sets);
data.topics = await topics.getTopicsByTids(tids, { uid: req.uid }); data.topics = await topics.getTopicsByTids(tids, { uid: req.uid });
topics.calculateTopicIndices(data.topics, start); topics.calculateTopicIndices(data.topics, start);
data.title = translator.escape(categoryFields.name); data.title = translator.escape(data.name);
data.privileges = userPrivileges; data.privileges = userPrivileges;
data.breadcrumbs = helpers.buildBreadcrumbs([{ text: `[[pages:world]]` }]); data.breadcrumbs = helpers.buildBreadcrumbs([{ text: `[[pages:world]]` }]);