Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-06-15 22:11:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

more sanity checks for bookmark

Browse Source 
dont allow setting bookmark higher than topic postcount
This commit is contained in:
Barış Soner Uşaklı
2023-02-15 22:06:00 -05:00
parent 54505e7a47
commit e4446ae14a
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
public/src/client/topic.js
View File

@@ -356,7 +356,7 @@ define('forum/topic', [
)
) {
if (app.user.uid) {
ajaxify.data.bookmark = index;
ajaxify.data.bookmark = Math.min(index, ajaxify.data.postcount);
socket.emit('topics.bookmark', {
tid: ajaxify.data.tid,

2
public/src/modules/navigator.js
View File

@@ -355,7 +355,7 @@ define('navigator', ['forum/pagination', 'components', 'hooks', 'alerts', 'trans
return;
}
index = Math.max(index, ajaxify.data.bookmark);
index = Math.max(index, Math.min(ajaxify.data.bookmark, ajaxify.data.postcount));
const unreadEl = paginationBlockUnreadEl.get(0);
const trackEl = unreadEl.parentNode;
const trackHeight = trackEl.getBoundingClientRect().height;

2
src/socket.io/topics.js
View File

@@ -35,7 +35,7 @@ SocketTopics.bookmark = async function (socket, data) {
const postcount = await topics.getTopicField(data.tid, 'postcount');
if (data.index > meta.config.bookmarkThreshold && postcount > meta.config.bookmarkThreshold) {
const currentIndex = await db.sortedSetScore(`tid:${data.tid}:bookmarks`, socket.uid);
if (!currentIndex || data.index > currentIndex) {
if (!currentIndex || (data.index > currentIndex && data.index <= postcount) || (currentIndex > postcount)) {
await topics.setUserBookmark(data.tid, socket.uid, data.index);
}
}