From fec907d99d09603ae29389c3c3136dab4cb4370f Mon Sep 17 00:00:00 2001 From: Julian Lam Date: Tue, 1 Mar 2022 14:30:29 -0500 Subject: [PATCH] fix: #10354, flag actions regression --- public/src/client/flags/detail.js | 19 +++++-------------- 1 file changed, 5 insertions(+), 14 deletions(-) diff --git a/public/src/client/flags/detail.js b/public/src/client/flags/detail.js index 3eaac8c842..644b7a1c35 100644 --- a/public/src/client/flags/detail.js +++ b/public/src/client/flags/detail.js @@ -83,15 +83,15 @@ define('forum/flags/detail', [ break; case 'delete-post': - postAction('delete', ajaxify.data.target.pid, ajaxify.data.target.tid); + postAction('delete', api.del, `/posts/${ajaxify.data.target.pid}/state`); break; case 'purge-post': - postAction('purge', ajaxify.data.target.pid, ajaxify.data.target.tid); + postAction('purge', api.del, `/posts/${ajaxify.data.target.pid}`); break; case 'restore-post': - postAction('restore', ajaxify.data.target.pid, ajaxify.data.target.tid); + postAction('restore', api.put, `/posts/${ajaxify.data.target.pid}/state`); break; case 'prepare-edit': { @@ -115,23 +115,14 @@ define('forum/flags/detail', [ }); }; - function postAction(action, pid, tid) { + function postAction(action, method, path) { translator.translate('[[topic:post_' + action + '_confirm]]', function (msg) { bootbox.confirm(msg, function (confirm) { if (!confirm) { return; } - socket.emit('posts.' + action, { - pid: pid, - tid: tid, - }, function (err) { - if (err) { - alerts.error(err); - } - - ajaxify.refresh(); - }); + method(path).then(ajaxify.refresh).catch(alerts.error); }); }); }