From 0e60a704a5c2d28eff3504e9872f8c1dcbd19751 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bar=C4=B1=C5=9F=20Soner=20U=C5=9Fakl=C4=B1?= Date: Thu, 12 May 2022 11:33:11 -0400 Subject: [PATCH] fix: 'unread' postIndex regression closes #10607 --- src/controllers/topics.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/controllers/topics.js b/src/controllers/topics.js index bc7259cb90..807e546a00 100644 --- a/src/controllers/topics.js +++ b/src/controllers/topics.js @@ -58,12 +58,12 @@ topicsController.get = async function getTopic(req, res, next) { return helpers.notAllowed(req, res); } - if (!res.locals.isAPI && (!req.params.slug || topicData.slug !== `${tid}/${req.params.slug}`) && (topicData.slug && topicData.slug !== `${tid}/`)) { - return helpers.redirect(res, `/topic/${topicData.slug}${postIndex ? `/${postIndex}` : ''}${generateQueryString(req.query)}`, true); + if (req.params.post_index === 'unread') { + postIndex = await topics.getUserBookmark(tid, req.uid); } - if (postIndex === 'unread') { - postIndex = await topics.getUserBookmark(tid, req.uid); + if (!res.locals.isAPI && (!req.params.slug || topicData.slug !== `${tid}/${req.params.slug}`) && (topicData.slug && topicData.slug !== `${tid}/`)) { + return helpers.redirect(res, `/topic/${topicData.slug}${postIndex ? `/${postIndex}` : ''}${generateQueryString(req.query)}`, true); } if (utils.isNumber(postIndex) && topicData.postcount > 0 && (postIndex < 1 || postIndex > topicData.postcount)) {