Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-02-04 13:49:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: closes #13899

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2026-01-25 19:45:23 -05:00
parent 871089da7d
commit f98de3e985
3 changed files with 66 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/posts/votes.js
View File

@@ -271,27 +271,30 @@ module.exports = function (Posts) {
async function updateTopicVoteCount(postData) {
const topicData = await topics.getTopicFields(postData.tid, ['mainPid', 'cid', 'pinned']);
const { cid } = topicData;
if (postData.uid) {
if (postData.votes !== 0) {
await db.sortedSetAdd(`cid:${topicData.cid}:uid:${postData.uid}:pids:votes`, postData.votes, postData.pid);
await db.sortedSetAdd(`cid:${cid}:uid:${postData.uid}:pids:votes`, postData.votes, postData.pid);
} else {
await db.sortedSetRemove(`cid:${topicData.cid}:uid:${postData.uid}:pids:votes`, postData.pid);
await db.sortedSetRemove(`cid:${cid}:uid:${postData.uid}:pids:votes`, postData.pid);
}
}
if (String(topicData.mainPid) !== String(postData.pid)) {
return await db.sortedSetAdd(`tid:${postData.tid}:posts:votes`, postData.votes, postData.pid);
}
const isRemoteCid = !utils.isNumber(cid) || cid === -1;
const promises = [
topics.setTopicFields(postData.tid, {
upvotes: postData.upvotes,
downvotes: postData.downvotes,
}),
db.sortedSetAdd('topics:votes', postData.votes, postData.tid),
isRemoteCid ?
Promise.resolve() :
db.sortedSetAdd('topics:votes', postData.votes, postData.tid),
];
if (!topicData.pinned) {
promises.push(db.sortedSetAdd(`cid:${topicData.cid}:tids:votes`, postData.votes, postData.tid));
promises.push(db.sortedSetAdd(`cid:${cid}:tids:votes`, postData.votes, postData.tid));
}
await Promise.all(promises);
}

24
src/topics/posts.js
View File

@@ -312,13 +312,22 @@ module.exports = function (Topics) {
};
Topics.increasePostCount = async function (tid) {
incrementFieldAndUpdateSortedSet(tid, 'postcount', 1, 'topics:posts');
await incrementFieldAndUpdateSortedSet(tid, 'postcount', 1, 'topics:posts');
};
Topics.decreasePostCount = async function (tid) {
incrementFieldAndUpdateSortedSet(tid, 'postcount', -1, 'topics:posts');
await incrementFieldAndUpdateSortedSet(tid, 'postcount', -1, 'topics:posts');
};
async function incrementFieldAndUpdateSortedSet(tid, field, by, set) {
const cid = await Topics.getTopicField(tid, 'cid');
const value = await db.incrObjectFieldBy(`topic:${tid}`, field, by);
const isRemoteCid = !utils.isNumber(cid) || cid === -1;
if (!isRemoteCid) {
await db.sortedSetAdd(set, value, tid);
}
}
Topics.increaseViewCount = async function (req, tid) {
const allow = req.uid > 0 || (meta.config.guestsIncrementTopicViews && req.uid === 0);
if (allow) {
@@ -327,17 +336,16 @@ module.exports = function (Topics) {
const interval = meta.config.incrementTopicViewsInterval * 60000;
if (!req.session.tids_viewed[tid] || req.session.tids_viewed[tid] < now - interval) {
const cid = await Topics.getTopicField(tid, 'cid');
incrementFieldAndUpdateSortedSet(tid, 'viewcount', 1, ['topics:views', `cid:${cid}:tids:views`]);
const isRemoteCid = !utils.isNumber(cid) || cid === -1;
const value = await db.incrObjectFieldBy(`topic:${tid}`, 'viewcount', 1);
await db.sortedSetsAdd(
isRemoteCid ? [`cid:${cid}:tids:views`] : ['topics:views', `cid:${cid}:tids:views`], value, tid
);
req.session.tids_viewed[tid] = now;
}
}
};
async function incrementFieldAndUpdateSortedSet(tid, field, by, set) {
const value = await db.incrObjectFieldBy(`topic:${tid}`, field, by);
await db[Array.isArray(set) ? 'sortedSetsAdd' : 'sortedSetAdd'](set, value, tid);
}
Topics.getTitleByPid = async function (pid) {
return await Topics.getTopicFieldByPid('title', pid);
};

42
src/upgrades/4.8.2/clean_ap_tids_from_topic_zsets.js Normal file
View File

@@ -0,0 +1,42 @@
'use strict';
const db = require('../../database');
const batch = require('../../batch');
const utils = require('../../utils');
module.exports = {
name: 'Remote AP tids from topics:recent, topics:views, topics:posts, topics:votes zsets',
timestamp: Date.UTC(2026, 0, 25),
method: async function () {
const { progress } = this;
const [recent, views, posts, votes] = await db.sortedSetsCard([
'topics:recent', 'topics:views', 'topics:posts', 'topics:votes',
]);
progress.total = recent + views + posts + votes;
async function cleanupSet(setName, count) {
const tidsToRemove = [];
await batch.processSortedSet(setName, async (tids) => {
const topicData = await db.getObjectsFields(tids.map(tid => `topic:${tid}`), ['tid', 'cid']);
const batchTids = topicData.filter(
t => t && (!t.cid || !utils.isNumber(t.cid) || t.cid === -1)
).map(t => t.tid);
tidsToRemove.push(...batchTids);
progress.incr(batchTids.length);
}, {
batch: 500,
});
await batch.processArray(tidsToRemove, async (batchTids) => {
await db.sortedSetRemove(setName, batchTids);
}, {
batch: 500,
});
progress.incr(count);
}
await cleanupSet('topics:recent', recent);
await cleanupSet('topics:views', views);
await cleanupSet('topics:posts', posts);
await cleanupSet('topics:votes', votes);
},
};