archive-gh-me/nodeclub
1
0
Fork 0
mirror of https://github.com/cnodejs/nodeclub.git synced 2025-12-08 19:55:55 +00:00
Code Issues Projects Releases Wiki Activity

fix #487 回复消息时，不 at 消息作者

Browse Source
This commit is contained in:
alsotang 2015-02-14 21:35:41 +08:00
parent a9eba1a2b0
commit 96faae0c28
3 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
common/at.js
View File

@ -71,6 +71,11 @@ exports.sendMessageToMentionUsers = function (text, topicId, authorId, reply_id,
}
var ep = new EventProxy();
ep.fail(callback);
users = users.filter(function (user) {
return !user._id.equals(authorId);
});
ep.after('sent', users.length, function () {
callback();
});

20
test/common/at.test.js
View File

@ -11,12 +11,13 @@ var multiline = require('multiline');
var pedding = require('pedding');
describe('test/common/at.test.js', function () {
var testTopic, normalUser, normalUser2;
var testTopic, normalUser, normalUser2, adminUser;
before(function (done) {
support.ready(function () {
testTopic = support.testTopic;
normalUser = support.normalUser;
normalUser2 = support.normalUser2;
adminUser = support.adminUser;
done();
});
});
@ -156,7 +157,7 @@ aldjf
describe('sendMessageToMentionUsers()', function () {
it('should send message to all mention users', function (done) {
done = pedding(done, 2);
var atUserIds = [String(normalUser._id), String(normalUser2._id)];
var atUserIds = [String(adminUser._id), String(normalUser2._id)];
var ep = new eventproxy();
ep.after('user_id', atUserIds.length, function (user_ids) {
@ -170,7 +171,7 @@ aldjf
callback();
});
var text = '@' + normalUser.loginname + ' @' + normalUser2.loginname + ' @notexitstuser 你们好';
var text = '@' + adminUser.loginname + ' @' + normalUser2.loginname + ' @notexitstuser 你们好';
at.sendMessageToMentionUsers(text,
testTopic._id,
normalUser._id,
@ -191,6 +192,19 @@ aldjf
});
});
it('should not send at msg to author', function (done) {
mm(message, 'sendAtMessage', function () {
throw new Error('should not call me');
});
at.sendMessageToMentionUsers('@' + normalUser.loginname + ' hello',
testTopic._id, normalUser._id,
function (err) {
should.not.exist(err);
done();
});
});
describe('mock message.sendAtMessage() error', function () {
beforeEach(function () {
mm(message, 'sendAtMessage', function () {

1
test/support/support.js
View File

@ -52,6 +52,7 @@ ep.all('user', 'user2', 'admin', function (user, user2, admin) {
var adminObj = JSON.parse(JSON.stringify(admin));
adminObj.is_admin = true;
exports.adminUser = admin;
exports.adminUserCookie = mockUser(adminObj);
createTopic(user._id, ep.done('topic'));