diff --git a/src/socket.io/admin/plugins.js b/src/socket.io/admin/plugins.js index de37c1b885..c2d3f2ff13 100644 --- a/src/socket.io/admin/plugins.js +++ b/src/socket.io/admin/plugins.js @@ -30,8 +30,8 @@ Plugins.toggleInstall = async function (socket, data) { return pluginData; }; -Plugins.getActive = function (socket, data, callback) { - plugins.getActive(callback); +Plugins.getActive = async function () { + return await plugins.getActive(); }; Plugins.orderActivePlugins = async function (socket, data) { @@ -39,6 +39,6 @@ Plugins.orderActivePlugins = async function (socket, data) { await Promise.all(data.map(plugin => db.sortedSetAdd('plugins:active', plugin.order || 0, plugin.name))); }; -Plugins.upgrade = function (socket, data, callback) { - plugins.upgrade(data.id, data.version, callback); +Plugins.upgrade = async function (socket, data) { + return await plugins.upgrade(data.id, data.version); }; diff --git a/src/socket.io/admin/settings.js b/src/socket.io/admin/settings.js index fe4843821f..d34f7ca81b 100644 --- a/src/socket.io/admin/settings.js +++ b/src/socket.io/admin/settings.js @@ -5,8 +5,8 @@ const events = require('../../events'); const Settings = module.exports; -Settings.get = function (socket, data, callback) { - meta.settings.get(data.hash, callback); +Settings.get = async function (socket, data) { + return await meta.settings.get(data.hash); }; Settings.set = async function (socket, data) { @@ -19,7 +19,6 @@ Settings.set = async function (socket, data) { await events.log(eventData); }; -Settings.clearSitemapCache = function (socket, data, callback) { +Settings.clearSitemapCache = function () { require('../../sitemap').clearCache(); - callback(); }; diff --git a/src/socket.io/admin/themes.js b/src/socket.io/admin/themes.js index 1a6b4bd23b..32e677bcf8 100644 --- a/src/socket.io/admin/themes.js +++ b/src/socket.io/admin/themes.js @@ -5,8 +5,8 @@ const widgets = require('../../widgets'); const Themes = module.exports; -Themes.getInstalled = function (socket, data, callback) { - meta.themes.get(callback); +Themes.getInstalled = async function () { + return await meta.themes.get(); }; Themes.set = async function (socket, data) {