paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-01 12:33:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add people.pm_lookup_key

Browse Source
This commit is contained in:
Steve Howell
2017-08-01 09:51:56 -04:00
committed by Tim Abbott
parent 8a7397fef6
commit b446d96ed6
2 changed files with 17 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/people.js
View File

@@ -86,6 +86,12 @@ initialize();
assert.equal(people.is_my_user_id(undefined), false);
}());
(function test_pm_lookup_key() {
assert.equal(people.pm_lookup_key('30'), '30');
assert.equal(people.pm_lookup_key('32,30'), '32');
assert.equal(people.pm_lookup_key('101,32,30'), '32,101');
}());
(function test_get_recipients() {
assert.equal(people.get_recipients('30'), 'Me Myself');
assert.equal(people.get_recipients('30,32'), 'Isaac Newton');

11
static/js/people.js
View File

@@ -310,6 +310,17 @@ function sorted_other_user_ids(user_ids) {
return user_ids;
}
exports.pm_lookup_key = function (user_ids_string) {
/*
The server will sometimes include our own user id
in keys for PMs, but we only want our user id if
we sent a message to ourself.
*/
var user_ids = user_ids_string.split(',');
user_ids = sorted_other_user_ids(user_ids);
return user_ids.join(',');
};
exports.pm_with_user_ids = function (message) {
if (message.type !== 'private') {
return;