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

people: Cache gravatar url on person object.

This commit is contained in:
evykassirer 2024-10-25 12:29:14 -07:00 committed by Tim Abbott
parent c39ae45d95
commit 774f230074
2 changed files with 53 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
web/src/people.ts
View File

@ -809,27 +809,28 @@ export function small_avatar_url_for_person(person: User): string {
}
if (person.avatar_url === null) {
return gravatar_url_for_email(person.email);
person.avatar_url = gravatar_url_for_email(person.email);
return person.avatar_url;
}
return `/avatar/${person.user_id}`;
}
function medium_gravatar_url_for_email(email: string): string {
const hash = md5(email.toLowerCase());
const avatar_url = "https://secure.gravatar.com/avatar/" + hash + "?d=identicon";
const url = new URL(avatar_url, window.location.origin);
url.search += (url.search ? "&" : "") + "s=500";
return url.href;
}
export function medium_avatar_url_for_person(person: User): string {
/* Unlike the small avatar URL case, we don't generally have a
* medium avatar URL included in person objects. So only have the
* gravatar and server endpoints here. */
if (person.avatar_url === null) {
return medium_gravatar_url_for_email(person.email);
person.avatar_url = gravatar_url_for_email(person.email);
}
if (person.avatar_url !== undefined) {
const url = new URL(person.avatar_url, window.location.origin);
if (url.origin === "https://secure.gravatar.com") {
url.search += (url.search ? "&" : "") + "s=500";
return url.href;
}
}
// We need to attach a version to the URL as a cache-breaker so that the browser

42
web/tests/people.test.js
View File

@ -214,6 +214,22 @@ const maria = {
avatar_url: null,
};
const cedar = {
email: "Cedar@example.com",
user_id: 305,
full_name: "Cedar Athens",
// With client_gravatar enabled, requests that client compute gravatar
avatar_url: null,
};
const leo = {
email: "Leo@example.com",
user_id: 306,
full_name: "Leo Athens",
// With client_gravatar enabled, requests that client compute gravatar
avatar_url: null,
};
const ashton = {
email: "ashton@example.com",
user_id: 303,
@ -889,6 +905,8 @@ test_people("concat_direct_message_group", () => {
test_people("message_methods", () => {
people.add_active_user(charles);
people.add_active_user(maria);
people.add_active_user(cedar);
people.add_active_user(leo);
people.add_active_user(ashton);
// We don't rely on Maria to have all flags set explicitly--
@ -899,10 +917,24 @@ test_people("message_methods", () => {
people.small_avatar_url_for_person(maria),
"https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon",
);
assert.equal(
maria.avatar_url,
"https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon",
);
// This will use the cached gravatar url
assert.equal(
people.medium_avatar_url_for_person(maria),
"https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon&s=500",
);
// This will create a new gravatar url
assert.equal(
people.medium_avatar_url_for_person(cedar),
"https://secure.gravatar.com/avatar/2e6ed9fc1de54b7b5bc98ced46fe7a14?d=identicon&s=500",
);
assert.equal(
cedar.avatar_url,
"https://secure.gravatar.com/avatar/2e6ed9fc1de54b7b5bc98ced46fe7a14?d=identicon",
);
assert.equal(people.medium_avatar_url_for_person(charles), "/avatar/301/medium?version=0");
assert.equal(people.medium_avatar_url_for_person(ashton), "/avatar/303/medium?version=0");
@ -952,6 +984,16 @@ test_people("message_methods", () => {
"https://secure.gravatar.com/avatar/6dbdd7946b58d8b11351fcb27e5cdd55?d=identicon",
);
// No gravatar url cached yet
message = {
avatar_url: undefined,
sender_id: leo.user_id,
};
assert.equal(
people.small_avatar_url(message),
"https://secure.gravatar.com/avatar/ce9581fbf1beefbad43a4233aa65954c?d=identicon",
);
blueslip.expect("error", "Unknown user_id in maybe_get_user_by_id");
message = {
avatar_url: undefined,