Signal/Desktop
1
0
Fork 0
mirror of https://github.com/signalapp/Signal-Desktop.git synced 2025-12-26 21:28:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Import/export avatar colors

Browse Source
This commit is contained in:
Fedor Indutny
2025-03-05 10:56:23 -08:00
committed by GitHub
parent 16d36053ea
commit aff9a3213e
16 changed files with 340 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ts/util/getConversation.ts
View File

@@ -36,6 +36,7 @@ import {
canHaveUsername,
} from './getTitle';
import { hasDraft } from './hasDraft';
import { isAciString } from './isAciString';
import { isBlocked } from './isBlocked';
import { isConversationAccepted } from './isConversationAccepted';
import {
@@ -89,7 +90,12 @@ export function getConversation(model: ConversationModel): ConversationType {
const ourAci = window.textsecure.storage.user.getAci();
const ourPni = window.textsecure.storage.user.getPni();
const color = migrateColor(attributes.serviceId, attributes.color);
const color = migrateColor(attributes.color, {
aci: isAciString(attributes.serviceId) ? attributes.serviceId : undefined,
e164: attributes.e164,
pni: attributes.pni,
groupId: attributes.groupId,
});
const { draftTimestamp, draftEditMessage, timestamp } = attributes;
const draftPreview = getDraftPreview(attributes);