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: deprecated call to api.topics.move

Browse Source
This commit is contained in:
Julian Lam
2025-09-03 14:45:31 -04:00
parent b472dba244
commit 0f9015f050
2 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
public/src/client/topic/move.js
View File

@@ -2,8 +2,8 @@
define('forum/topic/move', [ define('forum/topic/move', [
'categorySelector', 'alerts', 'hooks', 'categorySelector', 'alerts', 'hooks', 'api',
], function (categorySelector, alerts, hooks) { ], function (categorySelector, alerts, hooks, api) {
const Move = {}; const Move = {};
let modal; let modal;
let selectedCategory; let selectedCategory;
@@ -88,15 +88,26 @@ define('forum/topic/move', [
function moveTopics(data) { function moveTopics(data) {
hooks.fire('action:topic.move', data); hooks.fire('action:topic.move', data);
socket.emit(!data.tids ? 'topics.moveAll' : 'topics.move', data, function (err) { if (data.tids) {
if (err) { data.tids.forEach((tid) => {
return alerts.error(err); api.put(`/topics/${tid}/move`, { cid: data.cid }).then(() => {
} if (typeof data.onComplete === 'function') {
data.onComplete();
}
}).catch(alerts.error);
});
} else {
socket.emit('topics.moveAll', data, function (err) {
if (err) {
return alerts.error(err);
}
if (typeof data.onComplete === 'function') {
data.onComplete();
}
});
}
if (typeof data.onComplete === 'function') {
data.onComplete();
}
});
} }
function closeMoveModal() { function closeMoveModal() {

2
src/socket.io/topics/move.js
View File

@@ -11,7 +11,7 @@ const sockets = require('..');
module.exports = function (SocketTopics) { module.exports = function (SocketTopics) {
SocketTopics.move = async function (socket, data) { SocketTopics.move = async function (socket, data) {
sockets.warnDeprecated(socket, 'GET /api/v3/topics/:tid/move'); sockets.warnDeprecated(socket, 'PUT /api/v3/topics/:tid/move');
if (!data || !Array.isArray(data.tids) || !data.cid) { if (!data || !Array.isArray(data.tids) || !data.cid) {
throw new Error('[[error:invalid-data]]'); throw new Error('[[error:invalid-data]]');