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

Merge branch 'develop' into activitypub

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2024-08-21 12:57:10 -04:00
parent e6d8e05932 f5fcac95e7
commit df6062d8be
108 changed files with 635 additions and 325 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/chats.js
View File

@@ -37,7 +37,7 @@ async function rateLimitExceeded(caller, field) {
}
chatsAPI.list = async (caller, { uid = caller.uid, start, stop, page, perPage } = {}) => {
if (!start && !stop && !page) {
if ((!utils.isNumber(start) || !utils.isNumber(stop)) && !utils.isNumber(page)) {
throw new Error('[[error:invalid-data]]');
}

48
src/api/topics.js
View File

@@ -4,9 +4,12 @@ const validator = require('validator');
const user = require('../user');
const topics = require('../topics');
const categories = require('../categories');
const posts = require('../posts');
const meta = require('../meta');
const privileges = require('../privileges');
const events = require('../events');
const batch = require('../batch');
const activitypubApi = require('./activitypub');
const apiHelpers = require('./helpers');
@@ -306,3 +309,48 @@ topicsAPI.bump = async (caller, { tid }) => {
await topics.markAsUnreadForAll(tid);
topics.pushUnreadCount(caller.uid);
};
topicsAPI.move = async (caller, { tid, cid }) => {
const canMove = await privileges.categories.isAdminOrMod(cid, caller.uid);
if (!canMove) {
throw new Error('[[error:no-privileges]]');
}
const tids = Array.isArray(tid) ? tid : [tid];
const uids = await user.getUidsFromSet('users:online', 0, -1);
const cids = [parseInt(cid, 10)];
await batch.processArray(tids, async (tids) => {
await Promise.all(tids.map(async (tid) => {
const canMove = await privileges.topics.isAdminOrMod(tid, caller.uid);
if (!canMove) {
throw new Error('[[error:no-privileges]]');
}
const topicData = await topics.getTopicFields(tid, ['tid', 'cid', 'slug', 'deleted']);
if (!cids.includes(topicData.cid)) {
cids.push(topicData.cid);
}
await topics.tools.move(tid, {
cid,
uid: caller.uid,
});
const notifyUids = await privileges.categories.filterUids('topics:read', topicData.cid, uids);
socketHelpers.emitToUids('event:topic_moved', topicData, notifyUids);
if (!topicData.deleted) {
socketHelpers.sendNotificationToTopicOwner(tid, caller.uid, 'move', 'notifications:moved-your-topic');
}
await events.log({
type: `topic-move`,
uid: caller.uid,
ip: caller.ip,
tid: tid,
fromCid: topicData.cid,
toCid: cid,
});
}));
}, { batch: 10 });
await categories.onTopicsMoved(cids);
};