Merge branch 'master' into develop

This commit is contained in:
Barış Soner Uşaklı
2025-01-28 19:59:49 -05:00
6 changed files with 19 additions and 14 deletions

View File

@@ -15,12 +15,12 @@ categoriesController.get = async function (req, res) {
user.getCategoryWatchState(res.locals.uid),
categories.buildForSelect(res.locals.uid, 'find', ['descriptionParsed', 'depth', 'slug']),
]);
const pageCount = Math.max(1, Math.ceil(allCategoriesData.length / meta.config.categoriesPerPage));
const watchCategories = allCategoriesData.filter(c => c && c.cid !== -1);
const pageCount = Math.max(1, Math.ceil(watchCategories.length / meta.config.categoriesPerPage));
const page = Math.min(parseInt(req.query.page, 10) || 1, pageCount);
const start = Math.max(0, (page - 1) * meta.config.categoriesPerPage);
const stop = start + meta.config.categoriesPerPage - 1;
const categoriesData = allCategoriesData.slice(start, stop + 1);
const categoriesData = watchCategories.slice(start, stop + 1);
categoriesData.forEach((category) => {