paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-21 23:19:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

Have unread.num_unread_for_person accept a user_id.

Browse Source 
(It used to take an email as its parameter.)
This commit is contained in:
Steve Howell
2016-11-18 08:02:06 -08:00
committed by Tim Abbott
parent 772571fd82
commit af9ff9a030
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/unread.js
View File

@@ -319,8 +319,8 @@ var zero_counts = {
}; };
people.add_in_realm(bob); people.add_in_realm(bob);
assert.equal(unread.num_unread_for_person('alice@example.com'), 0); assert.equal(unread.num_unread_for_person(alice.user_id), 0);
assert.equal(unread.num_unread_for_person('bob@example.com'), 0); assert.equal(unread.num_unread_for_person(bob.user_id), 0);
var message = { var message = {
id: 15, id: 15,
@@ -332,7 +332,7 @@ var zero_counts = {
flags: ['read'] flags: ['read']
}; };
unread.process_loaded_messages([message, read_message]); unread.process_loaded_messages([message, read_message]);
assert.equal(unread.num_unread_for_person('alice@example.com'), 1); assert.equal(unread.num_unread_for_person(alice.user_id), 1);
}()); }());

10
static/js/activity.js
View File

@@ -277,11 +277,11 @@ exports.update_users = function (user_list) {
} }
users = filter_and_sort(users); users = filter_and_sort(users);
function get_num_unread(email) { function get_num_unread(user_id) {
if (unread.suppress_unread_counts) { if (unread.suppress_unread_counts) {
return 0; return 0;
} }
return unread.num_unread_for_person(email); return unread.num_unread_for_person(user_id);
} }
// Note that we do not include ourselves in the user list any more. // Note that we do not include ourselves in the user list any more.
@@ -291,11 +291,10 @@ exports.update_users = function (user_list) {
function info_for(user_id) { function info_for(user_id) {
var presence = exports.presence_info[user_id].status; var presence = exports.presence_info[user_id].status;
var person = people.get_person_from_user_id(user_id); var person = people.get_person_from_user_id(user_id);
var email = person.email;
return { return {
name: person.full_name, name: person.full_name,
user_id: user_id, user_id: user_id,
num_unread: get_num_unread(email), num_unread: get_num_unread(user_id),
type: presence, type: presence,
type_desc: presence_descriptions[presence], type_desc: presence_descriptions[presence],
mobile: exports.presence_info[user_id].mobile mobile: exports.presence_info[user_id].mobile
@@ -361,8 +360,7 @@ exports.update_huddles = function () {
$('#group-pms').expectOne().html(html); $('#group-pms').expectOne().html(html);
_.each(huddles, function (user_ids_string) { _.each(huddles, function (user_ids_string) {
var emails_string = people.user_ids_string_to_emails_string(user_ids_string); var count = unread.num_unread_for_person(user_ids_string);
var count = unread.num_unread_for_person(emails_string);
set_count(user_ids_string, count); set_count(user_ids_string, count);
}); });

2
static/js/pm_list.js
View File

@@ -84,7 +84,7 @@ exports._build_private_messages_list = function (active_conversation, max_privat
var user_ids_string = private_message_obj.user_ids_string; var user_ids_string = private_message_obj.user_ids_string;
var reply_to = people.user_ids_string_to_emails_string(user_ids_string); var reply_to = people.user_ids_string_to_emails_string(user_ids_string);
var num_unread = unread.num_unread_for_person(reply_to); var num_unread = unread.num_unread_for_person(user_ids_string);
var always_visible = (idx < max_private_messages) || (num_unread > 0) var always_visible = (idx < max_private_messages) || (num_unread > 0)
|| (user_ids_string === active_conversation); || (user_ids_string === active_conversation);

3
static/js/unread.js
View File

@@ -174,8 +174,7 @@ exports.num_unread_for_subject = function (stream, subject) {
return num_unread; return num_unread;
}; };
exports.num_unread_for_person = function (emails_string) { exports.num_unread_for_person = function (user_ids_string) {
var user_ids_string = people.emails_strings_to_user_ids_string(emails_string);
if (!user_ids_string) { if (!user_ids_string) {
return 0; return 0;
} }