paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-04 14:03:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

people: Rename method to get_by_user_id().

Browse Source 
This name is consistent with:

    get_by_email()
    get_by_name()
This commit is contained in:
Steve Howell
2020-02-05 13:30:59 +00:00
committed by Tim Abbott
parent ea9212a92d
commit b8f01f9cda
35 changed files with 88 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/buddy_data.js
View File

@@ -286,7 +286,7 @@ run_test('user_last_seen_time_status', () => {
run_test('error handling', () => { run_test('error handling', () => {
presence.get_user_ids = () => [42]; presence.get_user_ids = () => [42];
blueslip.set_test_data('error', 'Unknown user_id in get_person_from_user_id: 42'); blueslip.set_test_data('error', 'Unknown user_id in get_by_user_id: 42');
blueslip.set_test_data('warn', 'Got user_id in presence but not people: 42'); blueslip.set_test_data('warn', 'Got user_id in presence but not people: 42');
buddy_data.get_filtered_and_sorted_user_ids(); buddy_data.get_filtered_and_sorted_user_ids();
assert.equal(blueslip.get_test_logs('error').length, 1); assert.equal(blueslip.get_test_logs('error').length, 1);

8
frontend_tests/node_tests/compose_pm_pill.js
View File

@@ -88,9 +88,9 @@ run_test('pills', () => {
} }
}; };
let get_person_from_user_id_called = false; let get_by_user_id_called = false;
people.get_person_from_user_id = function (id) { people.get_by_user_id = function (id) {
get_person_from_user_id_called = true; get_by_user_id_called = true;
if (id === othello.user_id) { if (id === othello.user_id) {
return othello; return othello;
} }
@@ -148,7 +148,7 @@ run_test('pills', () => {
compose_pm_pill.set_from_emails('othello@example.com'); compose_pm_pill.set_from_emails('othello@example.com');
assert(compose_pm_pill.widget); assert(compose_pm_pill.widget);
assert(get_person_from_user_id_called); assert(get_by_user_id_called);
assert(pills_cleared); assert(pills_cleared);
assert(appendValue_called); assert(appendValue_called);
assert(text_cleared); assert(text_cleared);

2
frontend_tests/node_tests/composebox_typeahead.js
View File

@@ -763,7 +763,7 @@ run_test('initialize', () => {
assert.equal(appended_name, 'Othello, the Moor of Venice'); assert.equal(appended_name, 'Othello, the Moor of Venice');
let appended_names = []; let appended_names = [];
people.get_person_from_user_id = function (user_id) { people.get_by_user_id = function (user_id) {
const users = {100: hamlet, 104: lear}; const users = {100: hamlet, 104: lear};
return users[user_id]; return users[user_id];
}; };

6
frontend_tests/node_tests/dispatch.js
View File

@@ -1098,7 +1098,7 @@ with_overrides(function (override) {
// realm_user // realm_user
let event = event_fixtures.realm_user__add; let event = event_fixtures.realm_user__add;
dispatch(event); dispatch(event);
const added_person = people.get_person_from_user_id(event.person.user_id); const added_person = people.get_by_user_id(event.person.user_id);
assert.equal(added_person.full_name, 'Added Person'); assert.equal(added_person.full_name, 'Added Person');
assert(people.is_active_user_for_popover(event.person.user_id)); assert(people.is_active_user_for_popover(event.person.user_id));
@@ -1107,7 +1107,7 @@ with_overrides(function (override) {
dispatch(event); dispatch(event);
// We don't actually remove the person, we just deactivate them. // We don't actually remove the person, we just deactivate them.
const removed_person = people.get_person_from_user_id(event.person.user_id); const removed_person = people.get_by_user_id(event.person.user_id);
assert.equal(removed_person.full_name, 'Added Person'); assert.equal(removed_person.full_name, 'Added Person');
assert(!people.is_active_user_for_popover(event.person.user_id)); assert(!people.is_active_user_for_popover(event.person.user_id));
@@ -1208,7 +1208,7 @@ with_overrides(function (override) {
// This next section can go away when we start handling // This next section can go away when we start handling
// user_ids more directly in some of subscriptions code. // user_ids more directly in some of subscriptions code.
override('people.get_person_from_user_id', function (user_id) { override('people.get_by_user_id', function (user_id) {
assert_same(user_id, 555); assert_same(user_id, 555);
return {email: 'this-is-not-really-used-in-the-test'}; return {email: 'this-is-not-really-used-in-the-test'};
}); });

2
frontend_tests/node_tests/general.js
View File

@@ -353,7 +353,7 @@ run_test('update_user_event', () => {
// stubbed out above. // stubbed out above.
server_events_dispatch.dispatch_normal_event(event); server_events_dispatch.dispatch_normal_event(event);
const user = people.get_person_from_user_id(bob.user_id); const user = people.get_by_user_id(bob.user_id);
// Verify that the code actually did its main job: // Verify that the code actually did its main job:
assert.equal(user.full_name, 'The Artist Formerly Known as Bob'); assert.equal(user.full_name, 'The Artist Formerly Known as Bob');

2
frontend_tests/node_tests/message_store.js
View File

@@ -186,7 +186,7 @@ run_test('errors', () => {
display_recipient: [{id: 92714}], display_recipient: [{id: 92714}],
}; };
blueslip.set_test_data('error', 'Unknown user_id in get_person_from_user_id: 92714'); blueslip.set_test_data('error', 'Unknown user_id in get_by_user_id: 92714');
blueslip.set_test_data('error', 'Unknown user id 92714'); // From person.js blueslip.set_test_data('error', 'Unknown user id 92714'); // From person.js
// Expect each to throw two blueslip errors // Expect each to throw two blueslip errors

10
frontend_tests/node_tests/people.js
View File

@@ -235,7 +235,7 @@ run_test('updates', () => {
assert.equal(people.get_by_name('Me the Third').email, 'me@example.com'); assert.equal(people.get_by_name('Me the Third').email, 'me@example.com');
}); });
run_test('get_person_from_user_id', () => { run_test('get_by_user_id', () => {
let person = { let person = {
email: 'mary@example.com', email: 'mary@example.com',
user_id: 42, user_id: 42,
@@ -244,11 +244,11 @@ run_test('get_person_from_user_id', () => {
people.add(person); people.add(person);
person = people.get_by_email('mary@example.com'); person = people.get_by_email('mary@example.com');
assert.equal(person.full_name, 'Mary'); assert.equal(person.full_name, 'Mary');
person = people.get_person_from_user_id(42); person = people.get_by_user_id(42);
assert.equal(person.email, 'mary@example.com'); assert.equal(person.email, 'mary@example.com');
people.set_full_name(person, 'Mary New'); people.set_full_name(person, 'Mary New');
person = people.get_person_from_user_id(42); person = people.get_by_user_id(42);
assert.equal(person.full_name, 'Mary New'); assert.equal(person.full_name, 'Mary New');
// deactivate() should eventually just take a user_id, but // deactivate() should eventually just take a user_id, but
@@ -257,7 +257,7 @@ run_test('get_person_from_user_id', () => {
people.deactivate(person); people.deactivate(person);
person = people.get_active_user_for_email('mary@example.com'); person = people.get_active_user_for_email('mary@example.com');
assert.equal(person, undefined); assert.equal(person, undefined);
person = people.get_person_from_user_id(42); person = people.get_by_user_id(42);
assert.equal(person.user_id, 42); assert.equal(person.user_id, 42);
}); });
@@ -894,7 +894,7 @@ run_test('initialize', () => {
assert(!people.is_valid_bulk_emails_for_compose(['not@valid.com', 'alice@example.com'])); assert(!people.is_valid_bulk_emails_for_compose(['not@valid.com', 'alice@example.com']));
assert(people.is_my_user_id(42)); assert(people.is_my_user_id(42));
const fetched_retiree = people.get_person_from_user_id(15); const fetched_retiree = people.get_by_user_id(15);
assert.equal(fetched_retiree.full_name, 'Retiree'); assert.equal(fetched_retiree.full_name, 'Retiree');
assert.equal(global.page_params.realm_users, undefined); assert.equal(global.page_params.realm_users, undefined);

2
frontend_tests/node_tests/people_errors.js
View File

@@ -128,7 +128,7 @@ run_test('blueslip', () => {
blueslip.clear_test_data(); blueslip.clear_test_data();
people.pm_with_user_ids = function () { return [42]; }; people.pm_with_user_ids = function () { return [42]; };
people.get_person_from_user_id = function () { return; }; people.get_by_user_id = function () { return; };
blueslip.set_test_data('error', 'Unknown people in message'); blueslip.set_test_data('error', 'Unknown people in message');
const uri = people.pm_with_url({}); const uri = people.pm_with_url({});
assert.equal(uri.indexOf('unk'), uri.length - 3); assert.equal(uri.indexOf('unk'), uri.length - 3);

10
frontend_tests/node_tests/settings_user_groups.js
View File

@@ -138,8 +138,8 @@ run_test('populate_user_groups', () => {
user_groups_list_append_called = true; user_groups_list_append_called = true;
}; };
let get_person_from_user_id_called = false; let get_by_user_id_called = false;
people.get_person_from_user_id = function (user_id) { people.get_by_user_id = function (user_id) {
if (user_id === iago.user_id) { if (user_id === iago.user_id) {
return iago; return iago;
} }
@@ -148,7 +148,7 @@ run_test('populate_user_groups', () => {
} }
assert.equal(user_id, 4); assert.equal(user_id, 4);
blueslip.set_test_data('warn', 'Undefined user in function append_user'); blueslip.set_test_data('warn', 'Undefined user in function append_user');
get_person_from_user_id_called = true; get_by_user_id_called = true;
}; };
settings_user_groups.can_edit = function () { settings_user_groups.can_edit = function () {
@@ -320,7 +320,7 @@ run_test('populate_user_groups', () => {
settings_user_groups.set_up(); settings_user_groups.set_up();
assert(templates_render_called); assert(templates_render_called);
assert(user_groups_list_append_called); assert(user_groups_list_append_called);
assert(get_person_from_user_id_called); assert(get_by_user_id_called);
assert(input_typeahead_called); assert(input_typeahead_called);
assert.equal(blueslip.get_test_logs('warn').length, 1); assert.equal(blueslip.get_test_logs('warn').length, 1);
blueslip.clear_test_data(); blueslip.clear_test_data();
@@ -353,7 +353,7 @@ run_test('with_external_user', () => {
return noop; return noop;
}); });
people.get_person_from_user_id = function () { people.get_by_user_id = function () {
return noop; return noop;
}; };

2
frontend_tests/node_tests/stream_data.js
View File

@@ -289,7 +289,7 @@ run_test('subscribers', () => {
assert(!ok); assert(!ok);
// Verify that we don't crash and return false for a bad user id. // Verify that we don't crash and return false for a bad user id.
blueslip.set_test_data('error', 'Unknown user_id in get_person_from_user_id: 9999999'); blueslip.set_test_data('error', 'Unknown user_id in get_by_user_id: 9999999');
blueslip.set_test_data('error', 'We tried to add invalid subscriber: 9999999'); blueslip.set_test_data('error', 'We tried to add invalid subscriber: 9999999');
ok = stream_data.add_subscriber('Rome', 9999999); ok = stream_data.add_subscriber('Rome', 9999999);
assert(!ok); assert(!ok);

6
frontend_tests/node_tests/user_events.js
View File

@@ -112,12 +112,12 @@ run_test('updates', () => {
assert.equal(full_name, 'Me V2'); assert.equal(full_name, 'Me V2');
user_events.update_person({user_id: isaac.user_id, new_email: 'newton@example.com'}); user_events.update_person({user_id: isaac.user_id, new_email: 'newton@example.com'});
person = people.get_person_from_user_id(isaac.user_id); person = people.get_by_user_id(isaac.user_id);
assert.equal(person.email, 'newton@example.com'); assert.equal(person.email, 'newton@example.com');
assert.equal(person.full_name, 'Sir Isaac'); assert.equal(person.full_name, 'Sir Isaac');
user_events.update_person({user_id: me.user_id, new_email: 'meforu@example.com'}); user_events.update_person({user_id: me.user_id, new_email: 'meforu@example.com'});
person = people.get_person_from_user_id(me.user_id); person = people.get_by_user_id(me.user_id);
assert.equal(person.email, 'meforu@example.com'); assert.equal(person.email, 'meforu@example.com');
assert.equal(person.full_name, 'Me V2'); assert.equal(person.full_name, 'Me V2');
@@ -151,7 +151,7 @@ run_test('updates', () => {
assert(person.timezone); assert(person.timezone);
blueslip.set_test_data('error', 'Got update_person event for unexpected user 29'); blueslip.set_test_data('error', 'Got update_person event for unexpected user 29');
blueslip.set_test_data('error', 'Unknown user_id in get_person_from_user_id: 29'); blueslip.set_test_data('error', 'Unknown user_id in get_by_user_id: 29');
assert(!user_events.update_person({user_id: 29, full_name: 'Sir Isaac Newton'})); assert(!user_events.update_person({user_id: 29, full_name: 'Sir Isaac Newton'}));
assert.equal(blueslip.get_test_logs('error').length, 2); assert.equal(blueslip.get_test_logs('error').length, 2);
blueslip.clear_test_data(); blueslip.clear_test_data();

6
static/js/activity.js
View File

@@ -137,7 +137,7 @@ exports.full_huddle_name = function (huddle) {
const user_ids = huddle_split(huddle); const user_ids = huddle_split(huddle);
const names = _.map(user_ids, function (user_id) { const names = _.map(user_ids, function (user_id) {
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
return person.full_name; return person.full_name;
}); });
@@ -149,7 +149,7 @@ exports.short_huddle_name = function (huddle) {
const num_to_show = 3; const num_to_show = 3;
let names = _.map(user_ids, function (user_id) { let names = _.map(user_ids, function (user_id) {
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
return person.full_name; return person.full_name;
}); });
@@ -418,7 +418,7 @@ exports.narrow_for_user = function (opts) {
}; };
exports.narrow_for_user_id = function (opts) { exports.narrow_for_user_id = function (opts) {
const person = people.get_person_from_user_id(opts.user_id); const person = people.get_by_user_id(opts.user_id);
const email = person.email; const email = person.email;
narrow.by('pm-with', email, {trigger: 'sidebar'}); narrow.by('pm-with', email, {trigger: 'sidebar'});

14
static/js/buddy_data.js
View File

@@ -95,8 +95,8 @@ exports.compare_function = function (a, b) {
} }
// Sort equivalent PM names alphabetically // Sort equivalent PM names alphabetically
const person_a = people.get_person_from_user_id(a); const person_a = people.get_by_user_id(a);
const person_b = people.get_person_from_user_id(b); const person_b = people.get_by_user_id(b);
const full_name_a = person_a ? person_a.full_name : ''; const full_name_a = person_a ? person_a.full_name : '';
const full_name_b = person_b ? person_b.full_name : ''; const full_name_b = person_b ? person_b.full_name : '';
@@ -123,7 +123,7 @@ function filter_user_ids(filter_text, user_ids) {
}); });
const persons = _.map(user_ids, function (user_id) { const persons = _.map(user_ids, function (user_id) {
return people.get_person_from_user_id(user_id); return people.get_by_user_id(user_id);
}); });
const user_id_dict = people.filter_people_by_search_terms(persons, search_terms); const user_id_dict = people.filter_people_by_search_terms(persons, search_terms);
@@ -181,7 +181,7 @@ exports.user_last_seen_time_status = function (user_id) {
exports.info_for = function (user_id) { exports.info_for = function (user_id) {
const user_circle_class = exports.get_user_circle_class(user_id); const user_circle_class = exports.get_user_circle_class(user_id);
const person = people.get_person_from_user_id(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.my_user_status(user_id);
const user_circle_status = exports.status_description(user_id); const user_circle_status = exports.status_description(user_id);
@@ -218,12 +218,12 @@ exports.get_title_data = function (user_ids_string, is_group) {
// Since it's not a group, user_ids_string is a single user ID. // Since it's not a group, user_ids_string is a single user ID.
const user_id = parseInt(user_ids_string, 10); const user_id = parseInt(user_ids_string, 10);
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (person.is_bot) { if (person.is_bot) {
// Bot has an owner. // Bot has an owner.
if (person.bot_owner_id !== null) { if (person.bot_owner_id !== null) {
person.bot_owner_full_name = people.get_person_from_user_id( person.bot_owner_full_name = people.get_by_user_id(
person.bot_owner_id).full_name; person.bot_owner_id).full_name;
const bot_owner_name = i18n.t('Owner: __name__', {name: person.bot_owner_full_name}); const bot_owner_name = i18n.t('Owner: __name__', {name: person.bot_owner_full_name});
@@ -312,7 +312,7 @@ exports.get_filtered_and_sorted_user_ids = function (filter_text) {
} }
user_ids = _.filter(user_ids, function (user_id) { user_ids = _.filter(user_ids, function (user_id) {
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (!person) { if (!person) {
blueslip.warn('Got user_id in presence but not people: ' + user_id); blueslip.warn('Got user_id in presence but not people: ' + user_id);

4
static/js/compose.js
View File

@@ -490,7 +490,7 @@ function validate_stream_message_post_policy(stream_name) {
return false; return false;
} }
const person = people.get_person_from_user_id(page_params.user_id); const person = people.get_by_user_id(page_params.user_id);
const current_datetime = new Date(Date.now()); const current_datetime = new Date(Date.now());
const person_date_joined = new Date(person.date_joined); const person_date_joined = new Date(person.date_joined);
const days = new Date(current_datetime - person_date_joined).getDate(); const days = new Date(current_datetime - person_date_joined).getDate();
@@ -583,7 +583,7 @@ function validate_private_message() {
if (page_params.realm_private_message_policy === 2) { if (page_params.realm_private_message_policy === 2) {
// Frontend check for for PRIVATE_MESSAGE_POLICY_DISABLED // Frontend check for for PRIVATE_MESSAGE_POLICY_DISABLED
const user_ids = compose_pm_pill.get_user_ids(); const user_ids = compose_pm_pill.get_user_ids();
if (user_ids.length !== 1 || !people.get_person_from_user_id(user_ids[0]).is_bot) { if (user_ids.length !== 1 || !people.get_by_user_id(user_ids[0]).is_bot) {
// Unless we're composing to a bot // Unless we're composing to a bot
compose_error(i18n.t("Private messages are disabled in this organization."), compose_error(i18n.t("Private messages are disabled in this organization."),
$("#private_message_recipient")); $("#private_message_recipient"));

2
static/js/compose_actions.js
View File

@@ -341,7 +341,7 @@ exports.respond_to_message = function (opts) {
// reply_to for private messages is everyone involved, so for // reply_to for private messages is everyone involved, so for
// personals replies we need to set the private message // personals replies we need to set the private message
// recipient to just the sender // recipient to just the sender
pm_recipient = people.get_person_from_user_id(message.sender_id).email; pm_recipient = people.get_by_user_id(message.sender_id).email;
} else { } else {
pm_recipient = people.pm_reply_to(message); pm_recipient = people.pm_reply_to(message);
} }

2
static/js/compose_fade.js
View File

@@ -123,7 +123,7 @@ const user_fade_config = {
function update_user_row_when_fading(li, conf) { function update_user_row_when_fading(li, conf) {
const user_id = conf.get_user_id(li); const user_id = conf.get_user_id(li);
const email = people.get_person_from_user_id(user_id).email; const email = people.get_by_user_id(user_id).email;
const would_receive = exports.would_receive_message(email); const would_receive = exports.would_receive_message(email);
if (would_receive || people.is_my_user_id(user_id)) { if (would_receive || people.is_my_user_id(user_id)) {

2
static/js/compose_pm_pill.js
View File

@@ -51,7 +51,7 @@ exports.get_emails = function () {
// return something like "alice@example.com,bob@example.com" // return something like "alice@example.com,bob@example.com"
const user_ids = exports.get_user_ids(); const user_ids = exports.get_user_ids();
const emails = user_ids.map(function (id) { const emails = user_ids.map(function (id) {
return people.get_person_from_user_id(id).email; return people.get_by_user_id(id).email;
}).join(","); }).join(",");
return emails; return emails;
}; };

2
static/js/composebox_typeahead.js
View File

@@ -998,7 +998,7 @@ exports.initialize = function () {
updater: function (item) { updater: function (item) {
if (user_groups.is_user_group(item)) { if (user_groups.is_user_group(item)) {
for (const user_id of item.members) { for (const user_id of item.members) {
const user = people.get_person_from_user_id(user_id); const user = people.get_by_user_id(user_id);
// filter out inserted users and current user from pill insertion // filter out inserted users and current user from pill insertion
const inserted_users = user_pill.get_user_ids(compose_pm_pill.widget); const inserted_users = user_pill.get_user_ids(compose_pm_pill.widget);
const current_user = people.is_current_user(user.email); const current_user = people.is_current_user(user.email);

2
static/js/markdown.js
View File

@@ -67,7 +67,7 @@ exports.apply_markdown = function (message) {
if (match) { if (match) {
const user_id = parseInt(match[2], 10); const user_id = parseInt(match[2], 10);
if (people.is_known_user_id(user_id)) { if (people.is_known_user_id(user_id)) {
person = people.get_person_from_user_id(user_id); person = people.get_by_user_id(user_id);
if (person.full_name !== match[1]) { // Invalid Syntax if (person.full_name !== match[1]) { // Invalid Syntax
return; return;
} }

2
static/js/message_edit.js
View File

@@ -656,7 +656,7 @@ exports.show_history = function (message) {
display_date: moment(timestamp).format("MMMM D, YYYY"), display_date: moment(timestamp).format("MMMM D, YYYY"),
}; };
if (msg.user_id) { if (msg.user_id) {
const person = people.get_person_from_user_id(msg.user_id); const person = people.get_by_user_id(msg.user_id);
item.edited_by = person.full_name; item.edited_by = person.full_name;
} }

2
static/js/message_list_view.js
View File

@@ -552,7 +552,7 @@ MessageListView.prototype = {
// mention text to show the user's current name, // mention text to show the user's current name,
// assuming that you're not searching for text // assuming that you're not searching for text
// inside the highlight. // inside the highlight.
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (person !== undefined) { if (person !== undefined) {
// Note that person might be undefined in some // Note that person might be undefined in some
// unpleasant corner cases involving data import. // unpleasant corner cases involving data import.

6
static/js/message_store.js
View File

@@ -32,7 +32,7 @@ exports.each = function (f) {
exports.get_pm_emails = function (message) { exports.get_pm_emails = function (message) {
function email(user_id) { function email(user_id) {
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (!person) { if (!person) {
blueslip.error('Unknown user id ' + user_id); blueslip.error('Unknown user id ' + user_id);
return '?'; return '?';
@@ -49,7 +49,7 @@ exports.get_pm_emails = function (message) {
exports.get_pm_full_names = function (message) { exports.get_pm_full_names = function (message) {
function name(user_id) { function name(user_id) {
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (!person) { if (!person) {
blueslip.error('Unknown user id ' + user_id); blueslip.error('Unknown user id ' + user_id);
return '?'; return '?';
@@ -141,7 +141,7 @@ exports.add_message_metadata = function (message) {
people.extract_people_from_message(message); people.extract_people_from_message(message);
people.maybe_incr_recipient_count(message); people.maybe_incr_recipient_count(message);
const sender = people.get_person_from_user_id(message.sender_id); const sender = people.get_by_user_id(message.sender_id);
if (sender) { if (sender) {
message.sender_full_name = sender.full_name; message.sender_full_name = sender.full_name;
message.sender_email = sender.email; message.sender_email = sender.email;

16
static/js/people.js
View File

@@ -43,9 +43,9 @@ function split_to_ints(lst) {
}); });
} }
exports.get_person_from_user_id = function (user_id) { exports.get_by_user_id = function (user_id) {
if (!people_by_user_id_dict.has(user_id)) { if (!people_by_user_id_dict.has(user_id)) {
blueslip.error('Unknown user_id in get_person_from_user_id: ' + user_id); blueslip.error('Unknown user_id in get_by_user_id: ' + user_id);
return; return;
} }
return people_by_user_id_dict.get(user_id); return people_by_user_id_dict.get(user_id);
@@ -223,7 +223,7 @@ exports.reply_to_to_user_ids_string = function (emails_string) {
}; };
exports.get_user_time_preferences = function (user_id) { exports.get_user_time_preferences = function (user_id) {
const user_timezone = exports.get_person_from_user_id(user_id).timezone; const user_timezone = exports.get_by_user_id(user_id).timezone;
if (user_timezone) { if (user_timezone) {
if (page_params.twenty_four_hour_time) { if (page_params.twenty_four_hour_time) {
return { return {
@@ -246,7 +246,7 @@ exports.get_user_time = function (user_id) {
}; };
exports.get_user_type = function (user_id) { exports.get_user_type = function (user_id) {
const user_profile = exports.get_person_from_user_id(user_id); const user_profile = exports.get_by_user_id(user_id);
if (user_profile.is_admin) { if (user_profile.is_admin) {
return i18n.t("Administrator"); return i18n.t("Administrator");
@@ -468,7 +468,7 @@ exports.pm_with_url = function (message) {
if (user_ids.length > 1) { if (user_ids.length > 1) {
suffix = 'group'; suffix = 'group';
} else { } else {
const person = exports.get_person_from_user_id(user_ids[0]); const person = exports.get_by_user_id(user_ids[0]);
if (person && person.email) { if (person && person.email) {
suffix = person.email.split('@')[0].toLowerCase(); suffix = person.email.split('@')[0].toLowerCase();
} else { } else {
@@ -592,7 +592,7 @@ exports.format_small_avatar_url = function (raw_url) {
exports.sender_is_bot = function (message) { exports.sender_is_bot = function (message) {
if (message.sender_id) { if (message.sender_id) {
const person = exports.get_person_from_user_id(message.sender_id); const person = exports.get_by_user_id(message.sender_id);
return person.is_bot; return person.is_bot;
} }
return false; return false;
@@ -600,7 +600,7 @@ exports.sender_is_bot = function (message) {
exports.sender_is_guest = function (message) { exports.sender_is_guest = function (message) {
if (message.sender_id) { if (message.sender_id) {
const person = exports.get_person_from_user_id(message.sender_id); const person = exports.get_by_user_id(message.sender_id);
return person.is_guest; return person.is_guest;
} }
return false; return false;
@@ -634,7 +634,7 @@ exports.small_avatar_url = function (message) {
// We should always have message.sender_id, except for in the // We should always have message.sender_id, except for in the
// tutorial, where it's ok to fall back to the url in the fake // tutorial, where it's ok to fall back to the url in the fake
// messages. // messages.
person = exports.get_person_from_user_id(message.sender_id); person = exports.get_by_user_id(message.sender_id);
} }
// The first time we encounter a sender in a message, we may // The first time we encounter a sender in a message, we may

2
static/js/pm_list.js
View File

@@ -78,7 +78,7 @@ exports._get_convos = function () {
} else { } else {
const user_id = parseInt(user_ids_string, 10); const user_id = parseInt(user_ids_string, 10);
user_circle_class = buddy_data.get_user_circle_class(user_id); user_circle_class = buddy_data.get_user_circle_class(user_id);
const recipient_user_obj = people.get_person_from_user_id(user_id); const recipient_user_obj = people.get_by_user_id(user_id);
if (recipient_user_obj.is_bot) { if (recipient_user_obj.is_bot) {
user_circle_class = 'user_circle_green'; user_circle_class = 'user_circle_green';

26
static/js/popovers.js
View File

@@ -197,7 +197,7 @@ function render_user_info_popover(user, popover_element, is_sender_popover, priv
if (is_cross_realm_bot) { if (is_cross_realm_bot) {
args.is_cross_realm_bot = is_cross_realm_bot; args.is_cross_realm_bot = is_cross_realm_bot;
} else if (bot_owner_id) { } else if (bot_owner_id) {
const bot_owner = people.get_person_from_user_id(bot_owner_id); const bot_owner = people.get_by_user_id(bot_owner_id);
args.bot_owner = bot_owner; args.bot_owner = bot_owner;
} }
} }
@@ -341,7 +341,7 @@ function get_user_info_popover_items() {
function fetch_group_members(member_ids) { function fetch_group_members(member_ids) {
return member_ids return member_ids
.map(function (m) { .map(function (m) {
return people.get_person_from_user_id(m); return people.get_by_user_id(m);
}) })
.filter(function (m) { .filter(function (m) {
return m !== undefined; return m !== undefined;
@@ -685,7 +685,7 @@ exports.show_sender_info = function () {
const $sender = $message.find('.sender_info_hover'); const $sender = $message.find('.sender_info_hover');
const message = current_msg_list.get(rows.id($message)); const message = current_msg_list.get(rows.id($message));
const user = people.get_person_from_user_id(message.sender_id); const user = people.get_by_user_id(message.sender_id);
show_user_info_popover($sender[0], user, message); show_user_info_popover($sender[0], user, message);
if (current_message_info_popover_elem) { if (current_message_info_popover_elem) {
focus_user_info_popover_item(); focus_user_info_popover_item();
@@ -714,7 +714,7 @@ exports.register_click_handlers = function () {
const row = $(this).closest(".message_row"); const row = $(this).closest(".message_row");
e.stopPropagation(); e.stopPropagation();
const message = current_msg_list.get(rows.id(row)); const message = current_msg_list.get(rows.id(row));
const user = people.get_person_from_user_id(message.sender_id); const user = people.get_by_user_id(message.sender_id);
show_user_info_popover(this, user, message); show_user_info_popover(this, user, message);
}); });
@@ -733,7 +733,7 @@ exports.register_click_handlers = function () {
let user; let user;
if (id_string) { if (id_string) {
const user_id = parseInt(id_string, 10); const user_id = parseInt(id_string, 10);
user = people.get_person_from_user_id(user_id); user = people.get_by_user_id(user_id);
} else { } else {
user = people.get_by_email(email); user = people.get_by_email(email);
} }
@@ -757,7 +757,7 @@ exports.register_click_handlers = function () {
$('body').on('click', '.info_popover_actions .narrow_to_private_messages', function (e) { $('body').on('click', '.info_popover_actions .narrow_to_private_messages', function (e) {
const user_id = elem_to_user_id($(e.target).parents('ul')); const user_id = elem_to_user_id($(e.target).parents('ul'));
const email = people.get_person_from_user_id(user_id).email; const email = people.get_by_user_id(user_id).email;
exports.hide_message_info_popover(); exports.hide_message_info_popover();
narrow.by('pm-with', email, {trigger: 'user sidebar popover'}); narrow.by('pm-with', email, {trigger: 'user sidebar popover'});
e.stopPropagation(); e.stopPropagation();
@@ -766,7 +766,7 @@ exports.register_click_handlers = function () {
$('body').on('click', '.info_popover_actions .narrow_to_messages_sent', function (e) { $('body').on('click', '.info_popover_actions .narrow_to_messages_sent', function (e) {
const user_id = elem_to_user_id($(e.target).parents('ul')); const user_id = elem_to_user_id($(e.target).parents('ul'));
const email = people.get_person_from_user_id(user_id).email; const email = people.get_by_user_id(user_id).email;
exports.hide_message_info_popover(); exports.hide_message_info_popover();
narrow.by('sender', email, {trigger: 'user sidebar popover'}); narrow.by('sender', email, {trigger: 'user sidebar popover'});
e.stopPropagation(); e.stopPropagation();
@@ -778,7 +778,7 @@ exports.register_click_handlers = function () {
compose_actions.start('stream', {trigger: 'sidebar user actions'}); compose_actions.start('stream', {trigger: 'sidebar user actions'});
} }
const user_id = elem_to_user_id($(e.target).parents('ul')); const user_id = elem_to_user_id($(e.target).parents('ul'));
const name = people.get_person_from_user_id(user_id).full_name; const name = people.get_by_user_id(user_id).full_name;
const mention = people.get_mention_syntax(name, user_id); const mention = people.get_mention_syntax(name, user_id);
compose_ui.insert_syntax_and_focus(mention); compose_ui.insert_syntax_and_focus(mention);
exports.hide_user_sidebar_popover(); exports.hide_user_sidebar_popover();
@@ -792,7 +792,7 @@ exports.register_click_handlers = function () {
compose_actions.respond_to_message({trigger: 'user sidebar popover'}); compose_actions.respond_to_message({trigger: 'user sidebar popover'});
} }
const user_id = elem_to_user_id($(e.target).parents('ul')); const user_id = elem_to_user_id($(e.target).parents('ul'));
const name = people.get_person_from_user_id(user_id).full_name; const name = people.get_by_user_id(user_id).full_name;
const mention = people.get_mention_syntax(name, user_id); const mention = people.get_mention_syntax(name, user_id);
compose_ui.insert_syntax_and_focus(mention); compose_ui.insert_syntax_and_focus(mention);
exports.hide_message_info_popover(); exports.hide_message_info_popover();
@@ -802,7 +802,7 @@ exports.register_click_handlers = function () {
$('body').on('click', '.info_popover_actions .view_user_profile', function (e) { $('body').on('click', '.info_popover_actions .view_user_profile', function (e) {
const user_id = elem_to_user_id($(e.target).parents('ul')); const user_id = elem_to_user_id($(e.target).parents('ul'));
const user = people.get_person_from_user_id(user_id); const user = people.get_by_user_id(user_id);
exports.show_user_profile(user); exports.show_user_profile(user);
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@@ -822,7 +822,7 @@ exports.register_click_handlers = function () {
$('body').on('click', '.bot-owner-name', function (e) { $('body').on('click', '.bot-owner-name', function (e) {
const user_id = $(e.target).attr('data-bot-owner-id'); const user_id = $(e.target).attr('data-bot-owner-id');
const user = people.get_person_from_user_id(user_id); const user = people.get_by_user_id(user_id);
exports.show_user_profile(user); exports.show_user_profile(user);
}); });
@@ -882,7 +882,7 @@ exports.register_click_handlers = function () {
stream_popover.show_streamlist_sidebar(); stream_popover.show_streamlist_sidebar();
} }
const user = people.get_person_from_user_id(user_id); const user = people.get_by_user_id(user_id);
const popover_placement = userlist_placement === "left" ? "right" : "left"; const popover_placement = userlist_placement === "left" ? "right" : "left";
render_user_info_popover(user, target, false, "compose_private_message", render_user_info_popover(user, target, false, "compose_private_message",
@@ -972,7 +972,7 @@ exports.register_click_handlers = function () {
$('body').on('click', '.respond_personal_button, .compose_private_message', function (e) { $('body').on('click', '.respond_personal_button, .compose_private_message', function (e) {
const user_id = elem_to_user_id($(e.target).parents('ul')); const user_id = elem_to_user_id($(e.target).parents('ul'));
const email = people.get_person_from_user_id(user_id).email; const email = people.get_by_user_id(user_id).email;
compose_actions.start('private', { compose_actions.start('private', {
trigger: 'popover send private', trigger: 'popover send private',
private_message_recipient: email}); private_message_recipient: email});

2
static/js/reactions.js
View File

@@ -151,7 +151,7 @@ function full_name(user_id) {
if (user_id === page_params.user_id) { if (user_id === page_params.user_id) {
return 'You (click to remove)'; return 'You (click to remove)';
} }
return people.get_person_from_user_id(user_id).full_name; return people.get_by_user_id(user_id).full_name;
} }
function generate_title(emoji_name, user_ids) { function generate_title(emoji_name, user_ids) {

2
static/js/server_events_dispatch.js
View File

@@ -201,7 +201,7 @@ exports.dispatch_normal_event = function dispatch_normal_event(event) {
settings_users.update_user_data(event.bot.user_id, event.bot); settings_users.update_user_data(event.bot.user_id, event.bot);
} else if (event.op === 'update') { } else if (event.op === 'update') {
if (_.has(event.bot, 'owner_id')) { if (_.has(event.bot, 'owner_id')) {
event.bot.owner = people.get_person_from_user_id(event.bot.owner_id).email; event.bot.owner = people.get_by_user_id(event.bot.owner_id).email;
} }
bot_data.update(event.bot.user_id, event.bot); bot_data.update(event.bot.user_id, event.bot);
settings_users.update_user_data(event.bot.user_id, event.bot); settings_users.update_user_data(event.bot.user_id, event.bot);

8
static/js/settings_account.js
View File

@@ -106,7 +106,7 @@ function update_user_custom_profile_fields(fields, method) {
} }
exports.append_custom_profile_fields = function (element_id, user_id) { exports.append_custom_profile_fields = function (element_id, user_id) {
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (person.is_bot) { if (person.is_bot) {
return; return;
} }
@@ -180,7 +180,7 @@ exports.initialize_custom_user_type_fields = function (element_id, user_id, is_e
const field_types = page_params.custom_profile_field_types; const field_types = page_params.custom_profile_field_types;
const user_pills = new IntDict(); const user_pills = new IntDict();
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (person.is_bot) { if (person.is_bot) {
return user_pills; return user_pills;
} }
@@ -215,7 +215,7 @@ exports.initialize_custom_user_type_fields = function (element_id, user_id, is_e
const field_value = JSON.parse(field_value_raw); const field_value = JSON.parse(field_value_raw);
if (field_value) { if (field_value) {
field_value.forEach(function (pill_user_id) { field_value.forEach(function (pill_user_id) {
const user = people.get_person_from_user_id(pill_user_id); const user = people.get_by_user_id(pill_user_id);
user_pill.append_user(user, pills); user_pill.append_user(user, pills);
}); });
} }
@@ -533,7 +533,7 @@ exports.set_up = function () {
$("#show_my_user_profile_modal").on('click', function () { $("#show_my_user_profile_modal").on('click', function () {
overlays.close_overlay("settings"); overlays.close_overlay("settings");
const user = people.get_person_from_user_id(people.my_current_user_id()); const user = people.get_by_user_id(people.my_current_user_id());
setTimeout(function () { setTimeout(function () {
popovers.show_user_profile(user); popovers.show_user_profile(user);
}, 100); }, 100);

2
static/js/settings_user_groups.js
View File

@@ -58,7 +58,7 @@ exports.populate_user_groups = function () {
const userg = $('div.user-group[id="' + data.id + '"]'); const userg = $('div.user-group[id="' + data.id + '"]');
data.members.forEach(function (user_id) { data.members.forEach(function (user_id) {
const user = people.get_person_from_user_id(user_id); const user = people.get_by_user_id(user_id);
user_pill.append_user(user, pills); user_pill.append_user(user, pills);
}); });

8
static/js/settings_users.js
View File

@@ -135,7 +135,7 @@ function populate_users(realm_people_data) {
user.bot_type = settings_bots.type_id_to_string(user.bot_type); user.bot_type = settings_bots.type_id_to_string(user.bot_type);
if (user.bot_owner_id !== null) { if (user.bot_owner_id !== null) {
user.bot_owner_full_name = people.get_person_from_user_id( user.bot_owner_full_name = people.get_by_user_id(
user.bot_owner_id).full_name; user.bot_owner_id).full_name;
} else { } else {
user.no_owner = true; user.no_owner = true;
@@ -331,7 +331,7 @@ exports.on_load_success = function (realm_people_data) {
const row = $(e.target).closest(".user_row"); const row = $(e.target).closest(".user_row");
const user_id = row.data('user-id'); const user_id = row.data('user-id');
const user = people.get_person_from_user_id(user_id); const user = people.get_by_user_id(user_id);
modal_elem.find(".email").text(user.email); modal_elem.find(".email").text(user.email);
modal_elem.find(".user_name").text(user.full_name); modal_elem.find(".user_name").text(user.full_name);
modal_elem.modal("show"); modal_elem.modal("show");
@@ -406,7 +406,7 @@ exports.on_load_success = function (realm_people_data) {
$('.admin_bot_table').on('click', '.user_row .view_user_profile', function (e) { $('.admin_bot_table').on('click', '.user_row .view_user_profile', function (e) {
const owner_id = $(e.target).attr('data-owner-id'); const owner_id = $(e.target).attr('data-owner-id');
const owner = people.get_person_from_user_id(owner_id); const owner = people.get_by_user_id(owner_id);
popovers.show_user_profile(owner); popovers.show_user_profile(owner);
e.stopPropagation(); e.stopPropagation();
e.preventDefault(); e.preventDefault();
@@ -414,7 +414,7 @@ exports.on_load_success = function (realm_people_data) {
$(".admin_user_table, .admin_bot_table").on("click", ".open-user-form", function (e) { $(".admin_user_table, .admin_bot_table").on("click", ".open-user-form", function (e) {
const user_id = parseInt($(e.currentTarget).attr("data-user-id"), 10); const user_id = parseInt($(e.currentTarget).attr("data-user-id"), 10);
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (!person) { if (!person) {
return; return;

4
static/js/stream_create.js
View File

@@ -102,7 +102,7 @@ function ajaxSubscribeForCreation(stream_name, description, user_ids, invite_onl
// TODO: We can eliminate the user_ids -> principals conversion // TODO: We can eliminate the user_ids -> principals conversion
// once we upgrade the backend to accept user_ids. // once we upgrade the backend to accept user_ids.
const persons = _.compact(_.map(user_ids, (user_id) => { const persons = _.compact(_.map(user_ids, (user_id) => {
return people.get_person_from_user_id(user_id); return people.get_by_user_id(user_id);
})); }));
const principals = _.map(persons, (person) => person.email); const principals = _.map(persons, (person) => person.email);
@@ -271,7 +271,7 @@ exports.show_new_stream_modal = function () {
const all_users = people.get_people_for_stream_create(); const all_users = people.get_people_for_stream_create();
// Add current user on top of list // Add current user on top of list
all_users.unshift(people.get_person_from_user_id(page_params.user_id)); all_users.unshift(people.get_by_user_id(page_params.user_id));
const html = render_new_stream_users({ const html = render_new_stream_users({
users: all_users, users: all_users,
streams: stream_data.get_streams_for_settings_page(), streams: stream_data.get_streams_for_settings_page(),

2
static/js/stream_data.js
View File

@@ -629,7 +629,7 @@ exports.add_subscriber = function (stream_name, user_id) {
blueslip.warn("We got an add_subscriber call for a non-existent stream."); blueslip.warn("We got an add_subscriber call for a non-existent stream.");
return false; return false;
} }
const person = people.get_person_from_user_id(user_id); const person = people.get_by_user_id(user_id);
if (person === undefined) { if (person === undefined) {
blueslip.error("We tried to add invalid subscriber: " + user_id); blueslip.error("We tried to add invalid subscriber: " + user_id);
return false; return false;

2
static/js/stream_edit.js
View File

@@ -36,7 +36,7 @@ exports.is_sub_settings_active = function (sub) {
exports.get_email_of_subscribers = function (subscribers) { exports.get_email_of_subscribers = function (subscribers) {
return subscribers.map(function (user_id) { return subscribers.map(function (user_id) {
return people.get_person_from_user_id(user_id).email; return people.get_by_user_id(user_id).email;
}); });
}; };

4
static/js/typing_events.js
View File

@@ -42,7 +42,7 @@ function get_users_typing_for_narrow() {
exports.render_notifications_for_narrow = function () { exports.render_notifications_for_narrow = function () {
const user_ids = get_users_typing_for_narrow(); const user_ids = get_users_typing_for_narrow();
const users_typing = user_ids.map(people.get_person_from_user_id); const users_typing = user_ids.map(people.get_by_user_id);
if (users_typing.length === 0) { if (users_typing.length === 0) {
$('#typing_notifications').hide(); $('#typing_notifications').hide();
} else { } else {
@@ -73,7 +73,7 @@ exports.display_notification = function (event) {
recipients.sort(); recipients.sort();
const sender_id = event.sender.user_id; const sender_id = event.sender.user_id;
event.sender.name = people.get_person_from_user_id(sender_id).full_name; event.sender.name = people.get_by_user_id(sender_id).full_name;
typing_data.add_typist(recipients, sender_id); typing_data.add_typist(recipients, sender_id);

2
static/js/user_events.js
View File

@@ -4,7 +4,7 @@
// (We should do bot updates here too.) // (We should do bot updates here too.)
exports.update_person = function update(person) { exports.update_person = function update(person) {
const person_obj = people.get_person_from_user_id(person.user_id); const person_obj = people.get_by_user_id(person.user_id);
if (!person_obj) { if (!person_obj) {
blueslip.error("Got update_person event for unexpected user " + person.user_id); blueslip.error("Got update_person event for unexpected user " + person.user_id);