Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-26 08:36:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: #11981, post immediately when canceling scheduling

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2023-09-06 11:00:34 -04:00
parent 5c023025b4
commit 19b7cdb245
2 changed files with 28 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/posts/edit.js
View File

@@ -186,7 +186,7 @@ module.exports = function (Posts) {
throw new Error('[[error:no-privileges]]');
}
const isMain = parseInt(data.pid, 10) === parseInt(topicData.mainPid, 10);
if (isMain && (isNaN(data.timestamp) || data.timestamp < Date.now())) {
if (isMain && isNaN(data.timestamp)) {
throw new Error('[[error:invalid-data]]');
}
}

14
src/topics/scheduled.js
View File

@@ -26,6 +26,11 @@ Scheduled.handleExpired = async function () {
return;
}
await postTids(tids);
await db.sortedSetsRemoveRangeByScore([`topics:scheduled`], '-inf', now);
};
async function postTids(tids) {
let topicsData = await topics.getTopicsData(tids);
// Filter deleted
topicsData = topicsData.filter(topicData => Boolean(topicData));
@@ -43,9 +48,8 @@ Scheduled.handleExpired = async function () {
updateUserLastposttimes(uids, topicsData),
updateGroupPosts(uids, topicsData),
...topicsData.map(topicData => unpin(topicData.tid, topicData)),
db.sortedSetsRemoveRangeByScore([`topics:scheduled`], '-inf', now)
));
};
}
// topics/tools.js#pin/unpin would block non-admins/mods, thus the local versions
Scheduled.pin = async function (tid, topicData) {
@@ -62,6 +66,9 @@ Scheduled.pin = async function (tid, topicData) {
};
Scheduled.reschedule = async function ({ cid, tid, timestamp, uid }) {
if (timestamp < Date.now()) {
await postTids([tid]);
} else {
const mainPid = await topics.getTopicField(tid, 'mainPid');
await Promise.all([
db.sortedSetsAdd([
@@ -78,7 +85,8 @@ Scheduled.reschedule = async function ({ cid, tid, timestamp, uid }) {
], timestamp, mainPid),
shiftPostTimes(tid, timestamp),
]);
return topics.updateLastPostTimeFromLastPid(tid);
await topics.updateLastPostTimeFromLastPid(tid);
}
};
function unpin(tid, topicData) {