paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-10-31 03:53:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

presence: Rename activity.set_user_status().

Browse Source 
We are trying to carve room for a more specific
"user_status" concept, which refers to statuses
that users specifically set, like "I'm away".

So we call this function "update_presence_info",
which reflects that it's more about actual
"presence"--i.e. the user really is present
in the browser, even though the actual human
may not want to be disturbed.
This commit is contained in:
Steve Howell
2018-12-18 17:19:29 +00:00
committed by Tim Abbott
parent 2c719bdb3f
commit ba69dcc74c
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend_tests/node_tests/activity.js
View File

@@ -774,7 +774,7 @@ run_test('update_huddles_and_redraw', () => {
reset_setup(); reset_setup();
run_test('set_user_status', () => { run_test('update_presence_info', () => {
const server_time = 500; const server_time = 500;
const info = { const info = {
website: { website: {
@@ -794,21 +794,21 @@ run_test('set_user_status', () => {
}; };
presence.presence_info[me.user_id] = undefined; presence.presence_info[me.user_id] = undefined;
activity.set_user_status(me.email, info, server_time); activity.update_presence_info(me.email, info, server_time);
assert(inserted); assert(inserted);
assert.deepEqual(presence.presence_info[me.user_id].status, 'active'); assert.deepEqual(presence.presence_info[me.user_id].status, 'active');
presence.presence_info[alice.user_id] = undefined; presence.presence_info[alice.user_id] = undefined;
activity.set_user_status(alice.email, info, server_time); activity.update_presence_info(alice.email, info, server_time);
assert(inserted); assert(inserted);
const expected = { status: 'active', mobile: false, last_active: 500 }; const expected = { status: 'active', mobile: false, last_active: 500 };
assert.deepEqual(presence.presence_info[alice.user_id], expected); assert.deepEqual(presence.presence_info[alice.user_id], expected);
activity.set_user_status(alice.email, info, server_time); activity.update_presence_info(alice.email, info, server_time);
blueslip.set_test_data('warn', 'unknown email: foo@bar.com'); blueslip.set_test_data('warn', 'unknown email: foo@bar.com');
blueslip.set_test_data('error', 'Unknown email for get_user_id: foo@bar.com'); blueslip.set_test_data('error', 'Unknown email for get_user_id: foo@bar.com');
activity.set_user_status('foo@bar.com', info, server_time); activity.update_presence_info('foo@bar.com', info, server_time);
assert(blueslip.get_test_logs('warn').length, 1); assert(blueslip.get_test_logs('warn').length, 1);
assert(blueslip.get_test_logs('error').length, 1); assert(blueslip.get_test_logs('error').length, 1);
blueslip.clear_test_data(); blueslip.clear_test_data();

2
frontend_tests/node_tests/dispatch.js
View File

@@ -762,7 +762,7 @@ with_overrides(function (override) {
var event = event_fixtures.presence; var event = event_fixtures.presence;
global.with_stub(function (stub) { global.with_stub(function (stub) {
override('activity.set_user_status', stub.f); override('activity.update_presence_info', stub.f);
dispatch(event); dispatch(event);
var args = stub.get_args('email', 'presence', 'server_time'); var args = stub.get_args('email', 'presence', 'server_time');
assert_same(args.email, 'alice@example.com'); assert_same(args.email, 'alice@example.com');

2
static/js/activity.js
View File

@@ -380,7 +380,7 @@ exports.initialize = function () {
ui.set_up_scrollbar($("#group-pms")); ui.set_up_scrollbar($("#group-pms"));
}; };
exports.set_user_status = function (email, info, server_time) { exports.update_presence_info = function (email, info, server_time) {
var user_id = people.get_user_id(email); var user_id = people.get_user_id(email);
if (!user_id) { if (!user_id) {
blueslip.warn('unknown email: ' + email); blueslip.warn('unknown email: ' + email);

2
static/js/server_events_dispatch.js
View File

@@ -59,7 +59,7 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
break; break;
case 'presence': case 'presence':
activity.set_user_status(event.email, event.presence, event.server_timestamp); activity.update_presence_info(event.email, event.presence, event.server_timestamp);
break; break;
case 'restart': case 'restart':