fix: don't return promise

v1.18.x
Barış Soner Uşaklı 6 years ago
parent 44a3352003
commit 2f0a331f02

@ -38,7 +38,8 @@ SocketGroups.join = function (socket, data, callback) {
} }
if (!meta.config.allowPrivateGroups) { if (!meta.config.allowPrivateGroups) {
return groups.join(data.groupName, socket.uid, callback); groups.join(data.groupName, socket.uid, callback);
return;
} }
async.parallel({ async.parallel({

@ -93,7 +93,8 @@ module.exports = function (SocketTopics) {
}; };
if (data.sort === 'unread') { if (data.sort === 'unread') {
params.cid = data.cid; params.cid = data.cid;
return topics.getUnreadTopics(params, callback); topics.getUnreadTopics(params, callback);
return;
} }
params.cids = data.cid; params.cids = data.cid;
params.sort = data.sort; params.sort = data.sort;

@ -130,13 +130,12 @@ module.exports = function (SocketUser) {
db.setObjectField('uid:' + uid + ':ban:' + banData.timestamp, 'fromUid', callerUid, next); db.setObjectField('uid:' + uid + ':ban:' + banData.timestamp, 'fromUid', callerUid, next);
}, },
function (next) { function (next) {
if (!reason) { if (reason) {
return translator.translate('[[user:info.banned-no-reason]]', function (translated) { return next(null, reason);
next(null, translated);
});
} }
translator.translate('[[user:info.banned-no-reason]]', function (translated) {
next(null, reason); next(null, translated);
});
}, },
function (_reason, next) { function (_reason, next) {
websockets.in('uid_' + uid).emit('event:banned', { websockets.in('uid_' + uid).emit('event:banned', {

@ -127,7 +127,7 @@ describe('socket.io', function () {
it('should get more unread topics', function (done) { it('should get more unread topics', function (done) {
io.emit('topics.loadMoreSortedTopics', { after: 0, count: 10, direction: 1, sort: 'unread' }, function (err, result) { io.emit('topics.loadMoreSortedTopics', { after: 0, count: 10, direction: 1, sort: 'unread' }, function (err, result) {
assert.ifError(err); assert.ifError(err);
console.log(result); assert(Array.isArray(result.topics));
done(); done();
}); });
}); });

Loading…
Cancel
Save