From e038eb0509ab53d337c93d03fb8467b5ca7ab019 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@nodebb.org>
Date: Wed, 17 Jan 2024 11:54:20 -0500
Subject: [PATCH] fix: preserve cid if set

---
 src/activitypub/notes.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/activitypub/notes.js b/src/activitypub/notes.js
index f9738f65e4..1c9ff7f285 100644
--- a/src/activitypub/notes.js
+++ b/src/activitypub/notes.js
@@ -3,6 +3,7 @@
 const winston = require('winston');
 
 const db = require('../database');
+const topics = require('../topics');
 const posts = require('../posts');
 
 const activitypub = module.parent.exports;
@@ -99,6 +100,8 @@ Notes.assertTopic = async (uid, id) => {
 		return tid;
 	}
 
+	const cid = await topics.getTopicField(tid, 'cid');
+
 	const unprocessed = chain.filter((p, idx) => !members[idx]);
 	winston.info(`[notes/assertTopic] ${unprocessed.length} new note(s) found.`);
 
@@ -111,7 +114,7 @@ Notes.assertTopic = async (uid, id) => {
 		db.setObject(`topicRemote:${tid}`, {
 			tid,
 			uid: authorId,
-			cid: -1,
+			cid: cid || -1,
 			mainPid: tid,
 			title: 'TBD',
 			slug: `remote?resource=${encodeURIComponent(tid)}`,