Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-05-07 06:56:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix: conflicts

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2021-07-05 10:02:42 -04:00
parent 38b0b3e5f7
commit 7282e39e74
2 changed files with 18 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/topics/fork.js
View File

@@ -39,7 +39,18 @@ module.exports = function (Topics) {
if (!isAdminOrMod) {
throw new Error('[[error:no-privileges]]');
}
const tid = await Topics.create({ uid: postData.uid, title: title, cid: cid });
const params = {
uid: postData.uid,
title: title,
cid: cid,
};
const result = await plugins.hooks.fire('filter:topic.fork', {
params: params,
tid: postData.tid,
});
const tid = await Topics.create(result.params);
await Topics.updateTopicBookmarks(fromTid, pids);
await async.eachSeries(pids, async function (pid) {

7
src/topics/merge.js
View File

@@ -45,11 +45,16 @@ module.exports = function (Topics) {
async function createNewTopic(title, oldestTid) {
const topicData = await Topics.getTopicFields(oldestTid, ['uid', 'cid']);
const tid = await Topics.create({
const params = {
uid: topicData.uid,
cid: topicData.cid,
title: title,
};
const result = await plugins.hooks.fire('filter:topic.mergeCreateNewTopic', {
oldestTid: oldestTid,
params: params,
});
const tid = await Topics.create(result.params);
return tid;
}