Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

buddy_data: Rename my_user_status() to get_my_user_status(). 

It would conflict with the my_user_status variable after migration to
an ES6 module.

Signed-off-by: Anders Kaseorg <anders@zulip.com>
This commit is contained in:
Anders Kaseorg 2020-09-24 01:57:52 -07:00 committed by Tim Abbott
parent 1d1eed2f17
commit 70d4674c6a
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
frontend_tests/node_tests/buddy_data.js
View File

@ -284,11 +284,11 @@ run_test("bulk_data_hacks", () => {
});
run_test("level", () => {
assert.equal(buddy_data.my_user_status(me.user_id), "translated: (you)");
assert.equal(buddy_data.get_my_user_status(me.user_id), "translated: (you)");
user_status.set_away(me.user_id);
assert.equal(buddy_data.my_user_status(me.user_id), "translated: (unavailable)");
assert.equal(buddy_data.get_my_user_status(me.user_id), "translated: (unavailable)");
user_status.revoke_away(me.user_id);
assert.equal(buddy_data.my_user_status(me.user_id), "translated: (you)");
assert.equal(buddy_data.get_my_user_status(me.user_id), "translated: (you)");
});
run_test("level", () => {

4
static/js/buddy_data.js
View File

@ -140,7 +140,7 @@ function get_num_unread(user_id) {
return unread.num_unread_for_person(user_id.toString());
}
exports.my_user_status = function (user_id) {
exports.get_my_user_status = function (user_id) {
if (!people.is_my_user_id(user_id)) {
return;
}
@ -179,7 +179,7 @@ exports.user_last_seen_time_status = function (user_id) {
exports.info_for = function (user_id) {
const user_circle_class = exports.get_user_circle_class(user_id);
const person = people.get_by_user_id(user_id);
const my_user_status = exports.my_user_status(user_id);
const my_user_status = exports.get_my_user_status(user_id);
const user_circle_status = exports.status_description(user_id);
return {