Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-28 01:26:16 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4275

Browse Source
This commit is contained in:
barisusakli
2016-02-29 10:36:20 +02:00
parent 441232e71d
commit 268aa12cc2
3 changed files with 27 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/messaging.js
View File

@@ -314,7 +314,7 @@ var async = require('async'),
Messaging.canMessageUser = function(uid, toUid, callback) {
if (parseInt(meta.config.disableChat) === 1 || !uid || uid === toUid) {
return callback(null, false);
return callback(new Error('[[error:chat-disabled]]'));
}
async.waterfall([
@@ -323,43 +323,40 @@ var async = require('async'),
},
function (exists, next) {
if (!exists) {
return callback(null, false);
return callback(new Error('[[error:no-user]]'));
}
user.getUserFields(uid, ['banned', 'email:confirmed'], next);
},
function (userData, next) {
if (parseInt(userData.banned, 10) === 1) {
return callback(null, false);
return callback(new Error('[[error:user-banned]]'));
}
if (parseInt(meta.config.requireEmailConfirmation, 10) === 1 && parseInt(userData['email:confirmed'], 10) !== 1) {
return callback(null, false);
return callback(new Error('[[error:email-not-confirmed-chat]]'));
}
user.getSettings(toUid, next);
async.parallel({
settings: async.apply(user.getSettings, toUid),
isAdmin: async.apply(user.isAdministrator, uid),
isFollowing: async.apply(user.isFollowing, toUid, uid)
}, next);
},
function(settings, next) {
if (!settings.restrictChat) {
return callback(null, true);
function(results, next) {
if (!results.settings.restrictChat || results.isAdmin || results.isFollowing) {
return next();
}
user.isAdministrator(uid, next);
},
function(isAdmin, next) {
if (isAdmin) {
return callback(null, true);
}
user.isFollowing(toUid, uid, next);
next(new Error('[[error:chat-restricted]]'));
}
], callback);
};
Messaging.canMessageRoom = function(uid, roomId, callback) {
if (parseInt(meta.config.disableChat) === 1 || !uid) {
return callback(new Error('[[error:chat-disabled]]'));
}
async.waterfall([
function (next) {
Messaging.isUserInRoom(uid, roomId, next);
@@ -368,14 +365,14 @@ var async = require('async'),
if (!inRoom) {
return next(new Error('[[error:not-in-room]]'));
}
Messaging.getUserCountInRoom(roomId, next);
},
function(count, next) {
if (count < 2) {
return next(new Error('[[error:no-users-in-room]]'));
}
user.getUserFields(uid, ['banned', 'email:confirmed'], next);
},
function (userData, next) {

4
src/socket.io/modules.js
View File

@@ -62,8 +62,8 @@ SocketModules.chats.newRoom = function(socket, data, callback) {
}
Messaging.canMessageUser(socket.uid, data.touid, function(err, allowed) {
if (err || !allowed) {
return callback(err || new Error('[[error:chat-restricted]]'));
if (err) {
return callback(err);
}
Messaging.newRoom(socket.uid, [data.touid], callback);

18
tests/messaging.js
View File

@@ -27,39 +27,39 @@ describe('Messaging Library', function() {
describe('.canMessage()', function() {
it('should not error out', function(done) {
Messaging.canMessageUser(testUids[1], testUids[2], function(err, allowed) {
Messaging.canMessageUser(testUids[1], testUids[2], function(err) {
assert.ifError(err);
done();
});
});
it('should allow messages to be sent to an unrestricted user', function(done) {
Messaging.canMessageUser(testUids[1], testUids[2], function(err, allowed) {
assert.strictEqual(allowed, true, 'should be true, received ' + allowed);
Messaging.canMessageUser(testUids[1], testUids[2], function(err) {
assert.ifError(err);
done();
});
});
it('should NOT allow messages to be sent to a restricted user', function(done) {
User.setSetting(testUids[1], 'restrictChat', '1', function() {
Messaging.canMessageUser(testUids[2], testUids[1], function(err, allowed) {
assert.strictEqual(allowed, false, 'should be false, received ' + allowed);
Messaging.canMessageUser(testUids[2], testUids[1], function(err) {
assert.strictEqual(err.message, '[[error:chat-restricted]]');
done();
});
});
});
it('should always allow admins through', function(done) {
Messaging.canMessageUser(testUids[0], testUids[1], function(err, allowed) {
assert.strictEqual(allowed, true, 'should be true, received ' + allowed);
Messaging.canMessageUser(testUids[0], testUids[1], function(err) {
assert.ifError(err);
done();
});
});
it('should allow messages to be sent to a restricted user if restricted user follows sender', function(done) {
User.follow(testUids[1], testUids[2], function() {
Messaging.canMessageUser(testUids[2], testUids[1], function(err, allowed) {
assert.strictEqual(allowed, true, 'should be true, received ' + allowed);
Messaging.canMessageUser(testUids[2], testUids[1], function(err) {
assert.ifError(err);
done();
});
});