From 1c0e8c16639dd4b4e952dd4a0c695e995f1bb1e9 Mon Sep 17 00:00:00 2001 From: psychobunny Date: Tue, 24 Nov 2020 16:30:16 -0500 Subject: [PATCH] fix: move meta.getServerTime call to admin namespace --- public/src/admin/settings/email.js | 2 +- src/socket.io/admin.js | 9 +++++++++ src/socket.io/meta.js | 10 ---------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/public/src/admin/settings/email.js b/public/src/admin/settings/email.js index 3e3fdc1280..458163f8d7 100644 --- a/public/src/admin/settings/email.js +++ b/public/src/admin/settings/email.js @@ -82,7 +82,7 @@ define('admin/settings/email', ['ace/ace', 'admin/settings'], function (ace) { hour = 0; } - socket.emit('meta.getServerTime', {}, function (err, now) { + socket.emit('admin.getServerTime', {}, function (err, now) { if (err) { return app.alertError(err.message); } diff --git a/src/socket.io/admin.js b/src/socket.io/admin.js index 9462f2afee..631914f05d 100644 --- a/src/socket.io/admin.js +++ b/src/socket.io/admin.js @@ -109,4 +109,13 @@ SocketAdmin.reloadAllSessions = function (socket, data, callback) { callback(); }; +SocketAdmin.getServerTime = function (socket, data, callback) { + const now = new Date(); + + callback(null, { + timestamp: now.getTime(), + offset: now.getTimezoneOffset(), + }); +}; + require('../promisify')(SocketAdmin); diff --git a/src/socket.io/meta.js b/src/socket.io/meta.js index e9cd3f00e4..75ea50c4f4 100644 --- a/src/socket.io/meta.js +++ b/src/socket.io/meta.js @@ -60,14 +60,4 @@ function leaveCurrentRoom(socket) { } } -SocketMeta.getServerTime = function (socket, data, callback) { - // Returns server time in milliseconds - const now = new Date(); - - callback(null, { - timestamp: now.getTime(), - offset: now.getTimezoneOffset(), - }); -}; - module.exports = SocketMeta;