Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-03 12:36:02 +01:00
Code Issues Packages Projects Releases Wiki Activity

more fixes for #5660

Browse Source
This commit is contained in:
Julian Lam
2017-05-09 15:07:59 -04:00
parent 87fbb44ca8
commit ad14b0d60b
2 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/database/mongo/main.js
View File

@@ -92,6 +92,7 @@ module.exports = function (db, module) {
}; };
module.pexpireAt = function (key, timestamp, callback) { module.pexpireAt = function (key, timestamp, callback) {
timestamp = Math.min(timestamp, 8640000000000000);
module.setObjectField(key, 'expireAt', new Date(timestamp), callback); module.setObjectField(key, 'expireAt', new Date(timestamp), callback);
}; };
}; };

3
src/socket.io/user/ban.js
View File

@@ -10,6 +10,7 @@ var privileges = require('../../privileges');
var plugins = require('../../plugins'); var plugins = require('../../plugins');
var emailer = require('../../emailer'); var emailer = require('../../emailer');
var translator = require('../../translator'); var translator = require('../../translator');
var utils = require('../../../public/src/utils');
module.exports = function (SocketUser) { module.exports = function (SocketUser) {
SocketUser.banUsers = function (socket, data, callback) { SocketUser.banUsers = function (socket, data, callback) {
@@ -108,7 +109,7 @@ module.exports = function (SocketUser) {
subject: '[[email:banned.subject, ' + siteTitle + ']]', subject: '[[email:banned.subject, ' + siteTitle + ']]',
site_title: siteTitle, site_title: siteTitle,
username: username, username: username,
until: until ? new Date(until).toString() : false, until: until ? utils.toISOString(until) : false,
reason: reason, reason: reason,
}; };