mirrors/signal-desktop
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 2 Wiki Activity Actions

Calls Tab: Show proper color in all default avatars

Browse source
This commit is contained in:
Scott Nonnenberg 2024-06-26 09:56:22 -07:00 committed by GitHub
parent fc08e70c0f
commit ce012823af
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 19 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ts/components/CallsList.tsx
View file

@ -790,6 +790,7 @@ export function CallsList({
<Avatar
acceptedMessageRequest
avatarPath={conversation.avatarPath}
color={conversation.color}
conversationType={conversation.type}
i18n={i18n}
isMe={false}

19
ts/util/callLinks.ts
View file

@ -30,6 +30,7 @@ import {
} from '../types/CallLink';
import type { LocalizerType } from '../types/Util';
import { isTestOrMockEnvironment } from '../environment';
import { AvatarColors } from '../types/Colors';
export const CALL_LINK_DEFAULT_STATE = {
name: '',
@ -92,10 +93,11 @@ export function callLinkToConversation(
callLink: CallLinkType,
i18n: LocalizerType
): CallLinkConversationType {
const { roomId, name } = callLink;
const { roomId, name, rootKey } = callLink;
return {
id: roomId,
type: 'callLink',
color: getColorForCallLink(rootKey),
isMe: false,
title: name || i18n('icu:calling__call-link-default-title'),
sharedGroupNames: [],
@ -103,6 +105,21 @@ export function callLinkToConversation(
badges: [],
};
}
// See https://github.com/signalapp/ringrtc/blob/49b4b8a16f997c7fa9a429e96aa83f80b2065c63/src/rust/src/lite/call_links/base16.rs#L8
const BASE_16_CONSONANT_ALPHABET = 'bcdfghkmnpqrstxz';
// See https://github.com/signalapp/ringrtc/blob/49b4b8a16f997c7fa9a429e96aa83f80b2065c63/src/rust/src/lite/call_links/base16.rs#L127-L139
export function getColorForCallLink(rootKey: string): string {
const rootKeyStart = rootKey.slice(0, 2);
const upper = BASE_16_CONSONANT_ALPHABET.indexOf(rootKeyStart[0]) || 0 * 16;
const lower = BASE_16_CONSONANT_ALPHABET.indexOf(rootKeyStart[1]) || 0;
const firstByte = upper + lower;
const index = firstByte % 12;
return AvatarColors[index];
}
export function getPlaceholderCallLinkConversation(
roomId: string,