diff --git a/web/src/message_live_update.ts b/web/src/message_live_update.ts index 126852ef26..25c7abd713 100644 --- a/web/src/message_live_update.ts +++ b/web/src/message_live_update.ts @@ -1,6 +1,5 @@ import * as message_lists from "./message_lists"; import * as message_store from "./message_store"; -import * as people from "./people"; import type {UserStatusEmojiInfo} from "./user_status"; export function rerender_messages_view(): void { @@ -80,9 +79,7 @@ export function update_user_full_name(user_id: number, full_name: string): void } export function update_avatar(user_id: number, avatar_url: string): void { - let url = avatar_url; - url = people.format_small_avatar_url(url); - message_store.update_small_avatar_url(user_id, url); + message_store.update_small_avatar_url(user_id, avatar_url); rerender_messages_view_for_user(user_id); } diff --git a/web/src/people.ts b/web/src/people.ts index ea987df501..b0336c8867 100644 --- a/web/src/people.ts +++ b/web/src/people.ts @@ -718,12 +718,6 @@ export function exclude_me_from_string(user_ids_string: string): string { return user_ids.join(","); } -export function format_small_avatar_url(raw_url: string): string { - const url = new URL(raw_url, window.location.origin); - url.search += (url.search ? "&" : "") + "s=50"; - return url.href; -} - export function sender_is_bot(message: Message): boolean { if (message.sender_id) { const person = get_by_user_id(message.sender_id); @@ -790,21 +784,19 @@ export function user_can_direct_message(recipient_ids_string: string): boolean { function gravatar_url_for_email(email: string): string { const hash = md5(email.toLowerCase()); - const avatar_url = "https://secure.gravatar.com/avatar/" + hash + "?d=identicon"; - const small_avatar_url = format_small_avatar_url(avatar_url); - return small_avatar_url; + return "https://secure.gravatar.com/avatar/" + hash + "?d=identicon"; } export function small_avatar_url_for_person(person: User): string { if (person.avatar_url) { - return format_small_avatar_url(person.avatar_url); + return person.avatar_url; } if (person.avatar_url === null) { return gravatar_url_for_email(person.email); } - return format_small_avatar_url(`/avatar/${person.user_id}`); + return `/avatar/${person.user_id}`; } function medium_gravatar_url_for_email(email: string): string { @@ -876,7 +868,7 @@ export function small_avatar_url(message: Message): string { // or if the avatar was missing. We do this verbosely to avoid false // positives on line coverage (we don't do branch checking). if (message.avatar_url) { - return format_small_avatar_url(message.avatar_url); + return message.avatar_url; } if (person && person.avatar_url === undefined) { @@ -885,7 +877,7 @@ export function small_avatar_url(message: Message): string { // required to take advantage of the user_avatar_url_field_optional // optimization, which saves a huge amount of network traffic on // servers with 10,000s of user accounts. - return format_small_avatar_url(`/avatar/${person.user_id}`); + return `/avatar/${person.user_id}`; } // For computing the user's email, we first trust the person diff --git a/web/tests/composebox_typeahead.test.js b/web/tests/composebox_typeahead.test.js index 1108aae5b4..c8e85548d0 100644 --- a/web/tests/composebox_typeahead.test.js +++ b/web/tests/composebox_typeahead.test.js @@ -1131,7 +1131,7 @@ test("initialize", ({override, override_rewire, mock_template}) => { actual_value = options.highlighter_html(othello_item); expected_value = ` \n` + - ` \n` + + ` \n` + '
\n' + ' Othello, the Moor of Venice othello@zulip.com' + "
\n"; diff --git a/web/tests/people.test.js b/web/tests/people.test.js index 466b1ad0ce..340baf7fb0 100644 --- a/web/tests/people.test.js +++ b/web/tests/people.test.js @@ -895,7 +895,7 @@ test_people("message_methods", () => { assert.equal( people.small_avatar_url_for_person(maria), - "https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon&s=50", + "https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon", ); assert.equal( people.medium_avatar_url_for_person(maria), @@ -907,7 +907,7 @@ test_people("message_methods", () => { muted_users.add_muted_user(30); assert.deepEqual(people.sender_info_for_recent_view_row([30]), [ { - avatar_url_small: "http://zulip.zulipdev.com/avatar/30?s=50", + avatar_url_small: "/avatar/30", is_muted: true, email: "me@example.com", full_name: me.full_name, @@ -929,7 +929,7 @@ test_people("message_methods", () => { assert.equal(people.pm_with_url(message), "#narrow/dm/301,302-group"); assert.equal(people.pm_perma_link(message), "#narrow/dm/30,301,302-group"); assert.equal(people.pm_reply_to(message), "Athens@example.com,charles@example.com"); - assert.equal(people.small_avatar_url(message), "http://charles.com/foo.png?s=50"); + assert.equal(people.small_avatar_url(message), "http://charles.com/foo.png"); message = { type: "private", @@ -939,7 +939,7 @@ test_people("message_methods", () => { assert.equal(people.pm_with_url(message), "#narrow/dm/302-Maria-Athens"); assert.equal(people.pm_perma_link(message), "#narrow/dm/30,302-dm"); assert.equal(people.pm_reply_to(message), "Athens@example.com"); - assert.equal(people.small_avatar_url(message), "http://zulip.zulipdev.com/legacy.png?s=50"); + assert.equal(people.small_avatar_url(message), "legacy.png"); message = { avatar_url: undefined, @@ -947,7 +947,7 @@ test_people("message_methods", () => { }; assert.equal( people.small_avatar_url(message), - "https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon&s=50", + "https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon", ); blueslip.expect("error", "Unknown user_id in maybe_get_user_by_id"); @@ -958,16 +958,13 @@ test_people("message_methods", () => { }; assert.equal( people.small_avatar_url(message), - "https://secure.gravatar.com/avatar/b48def645758b95537d4424c84d1a9ff?d=identicon&s=50", + "https://secure.gravatar.com/avatar/b48def645758b95537d4424c84d1a9ff?d=identicon", ); message = { sender_id: ashton.user_id, }; - assert.equal( - people.small_avatar_url(message), - `http://zulip.zulipdev.com/avatar/${ashton.user_id}?s=50`, - ); + assert.equal(people.small_avatar_url(message), `/avatar/${ashton.user_id}`); message = { type: "private", diff --git a/web/tests/search.test.js b/web/tests/search.test.js index 1dd5968736..d8b814eaa8 100644 --- a/web/tests/search.test.js +++ b/web/tests/search.test.js @@ -130,7 +130,7 @@ run_test("initialize", ({override, override_rewire, mock_template}) => { has_image: true, id: 7, img_src: - "https://secure.gravatar.com/avatar/0f030c97ab51312c7bbffd3966198ced?d=identicon&version=1&s=50", + "https://secure.gravatar.com/avatar/0f030c97ab51312c7bbffd3966198ced?d=identicon&version=1", }, }, ], @@ -149,7 +149,7 @@ run_test("initialize", ({override, override_rewire, mock_template}) => { has_image: true, id: 7, img_src: - "https://secure.gravatar.com/avatar/0f030c97ab51312c7bbffd3966198ced?d=identicon&version=1&s=50", + "https://secure.gravatar.com/avatar/0f030c97ab51312c7bbffd3966198ced?d=identicon&version=1", }, }, ], @@ -168,7 +168,7 @@ run_test("initialize", ({override, override_rewire, mock_template}) => { has_image: true, id: 7, img_src: - "https://secure.gravatar.com/avatar/0f030c97ab51312c7bbffd3966198ced?d=identicon&version=1&s=50", + "https://secure.gravatar.com/avatar/0f030c97ab51312c7bbffd3966198ced?d=identicon&version=1", }, }, ], @@ -195,13 +195,13 @@ run_test("initialize", ({override, override_rewire, mock_template}) => { let expected_value = `
\n Search for zo\n
\n`; assert.equal(opts.highlighter_html(source[0]), expected_value); - expected_value = `
\n sent by\n \n
\n \n \n \n <strong>Zo</strong>e\n \n
\n \n
\n
\n \n
\n`; + expected_value = `
\n sent by\n \n
\n \n \n \n <strong>Zo</strong>e\n \n
\n \n
\n
\n \n
\n`; assert.equal(opts.highlighter_html(source[1]), expected_value); - expected_value = `
\n direct messages with\n \n
\n \n \n \n <strong>Zo</strong>e\n \n
\n \n
\n
\n \n
\n`; + expected_value = `
\n direct messages with\n \n
\n \n \n \n <strong>Zo</strong>e\n \n
\n \n
\n
\n \n
\n`; assert.equal(opts.highlighter_html(source[2]), expected_value); - expected_value = `
\n group direct messages including\n \n
\n \n \n \n <strong>Zo</strong>e\n \n
\n \n
\n
\n \n
\n`; + expected_value = `
\n group direct messages including\n \n
\n \n \n \n <strong>Zo</strong>e\n \n
\n \n
\n
\n \n
\n`; assert.equal(opts.highlighter_html(source[3]), expected_value); /* Test sorter */ diff --git a/web/tests/search_suggestion.test.js b/web/tests/search_suggestion.test.js index 3a327325b3..ca53129239 100644 --- a/web/tests/search_suggestion.test.js +++ b/web/tests/search_suggestion.test.js @@ -894,7 +894,7 @@ test("people_suggestions", ({override, mock_template}) => { test_full_name("dm:ted@zulip.com", expectedString); test_full_name("dm-including:ted@zulip.com", expectedString); - expectedString = example_avatar_url + "?s=50"; + expectedString = example_avatar_url; function test_avatar_url(q, avatar_url) { return suggestions.lookup_table.get(q).description_html.includes(avatar_url); diff --git a/web/tests/user_pill.test.js b/web/tests/user_pill.test.js index 425361fe9d..afcfe1eda3 100644 --- a/web/tests/user_pill.test.js +++ b/web/tests/user_pill.test.js @@ -37,7 +37,7 @@ const isaac_item = { type: "user", user_id: isaac.user_id, deactivated: false, - img_src: `http://zulip.zulipdev.com/avatar/${isaac.user_id}?s=50`, + img_src: `/avatar/${isaac.user_id}`, status_emoji_info: undefined, should_add_guest_user_indicator: false, }; @@ -50,7 +50,7 @@ const inaccessible_user_item = { type: "user", user_id: inaccessible_user_id, deactivated: false, - img_src: `http://zulip.zulipdev.com/avatar/${inaccessible_user_id}?s=50`, + img_src: `/avatar/${inaccessible_user_id}`, status_emoji_info: undefined, should_add_guest_user_indicator: false, };