Skip to content

Node.js based forum software built for the modern web

fix(topics): remove crosspost queue entries when topic is deleted

Julian Lam1b678fe1b509
diff --git a/src/posts/queue.js b/src/posts/queue.js
index 585a9d09d7..5c8a4d164b 100644
--- a/src/posts/queue.js
+++ b/src/posts/queue.js
@@ -341,6 +341,26 @@ module.exports = function (Posts) {
}
}
+ Posts.removeFromQueueByTid = async function (tid) {
+ // todo: refactor this to be more general (search by different values in queue hash or hash.data)
+ const tids = Array.isArray(tid) ? tid : [tid];
+ const ids = await db.getSortedSetRange('post:queue', 0, -1);
+ if (!ids.length) {
+ return [];
+ }
+ const keys = ids.map(id => `post:queue:${id}`);
+ const items = await db.getObjects(keys);
+ const toRemove = [];
+ items.forEach((item, idx) => {
+ const data = JSON.parse(item.data);
+ if (tids.includes(String(data.tid))) {
+ toRemove.push(ids[idx]);
+ }
+ });
+ await Promise.all(toRemove.map(removeFromQueue));
+ return toRemove;
+ };
+
Posts.removeFromQueue = async function (id) {
const data = await getParsedObject(id);
if (!data) {
diff --git a/src/topics/delete.js b/src/topics/delete.js
index 04dcaae748..8304f5b0ec 100644
--- a/src/topics/delete.js
+++ b/src/topics/delete.js
@@ -30,6 +30,7 @@ module.exports = function (Topics) {
resolveTopicPostFlags(pids, uid),
activitypub.out.remove.context(uid, tid),
categories.updateRecentTidForCid(cid),
+ posts.queue.removeFromQueueByTid(tid),
]);
};
@@ -133,6 +134,7 @@ module.exports = function (Topics) {
deleteFromTags(deletedTopics),
Topics.events.purge(tidsToDelete),
Topics.crossposts.removeAll(tidsToDelete),
+ posts.queue.removeFromQueueByTid(tidsToDelete),
reduceCounters(deletedTopics),
]);