Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-08 15:05:46 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #9954, get next post timestamp

Browse Source 
fixes topic events being inserted in after first page but at the wrong spot
This commit is contained in:
Barış Soner Uşaklı
2021-10-31 15:09:33 -04:00
parent a7f235dbac
commit 89399c0ed5
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -212,7 +212,7 @@
function renderTopicEvents(index) {
const start = this.posts[index].timestamp;
const end = this.posts[index + 1] ? this.posts[index + 1].timestamp : Date.now();
const end = this.posts[index].nextPostTimestamp;
const events = this.events.filter(event => event.timestamp >= start && event.timestamp < end);
if (!events.length) {
return '';

17
src/topics/index.js
View File

@@ -240,9 +240,26 @@ async function getMainPostAndReplies(topic, set, uid, start, stop, reverse) {
Topics.calculatePostIndices(replies, repliesStart);
await Topics.addNextPostTimestamp(postData, set, reverse);
return await Topics.addPostData(postData, uid);
}
Topics.addNextPostTimestamp = async function (postData, set, reverse) {
if (!postData.length) {
return;
}
postData.forEach((p, index) => {
if (p && postData[index + 1]) {
p.nextPostTimestamp = postData[index + 1].timestamp;
}
});
const lastPost = postData[postData.length - 1];
if (lastPost && lastPost.index) {
const data = await db[reverse ? 'getSortedSetRevRangeWithScores' : 'getSortedSetRangeWithScores'](set, lastPost.index, lastPost.index);
lastPost.nextPostTimestamp = data.length ? data[0].score : Date.now();
}
};
async function getDeleter(topicData) {
if (!parseInt(topicData.deleterUid, 10)) {
return null;

1
src/topics/posts.js
View File

@@ -24,6 +24,7 @@ module.exports = function (Topics) {
const postData = await posts.getPostsFromSet(set, start, stop, uid, reverse);
Topics.calculatePostIndices(postData, start);
await Topics.addNextPostTimestamp(postData, set, reverse);
return await Topics.addPostData(postData, uid);
};