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

destinationServiceId in Sent

Browse Source
This commit is contained in:
Fedor Indutny
2023-06-29 21:17:27 +02:00
committed by GitHub
parent af4ad55c68
commit f90c2b7479
20 changed files with 322 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ts/models/messages.ts
View File

@@ -49,6 +49,7 @@ import { SendMessageProtoError } from '../textsecure/Errors';
import * as expirationTimer from '../util/expirationTimer';
import { getUserLanguages } from '../util/userLanguages';
import { getMessageSentTimestamp } from '../util/getMessageSentTimestamp';
import { getTaggedConversationUuid } from '../util/getConversationUuid';
import type { ReactionType } from '../types/Reactions';
import { UUID, UUIDKind } from '../types/UUID';
@@ -1823,7 +1824,7 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
...encodedContent,
timestamp,
destination: conv.get('e164'),
destinationUuid: conv.get('uuid'),
destinationUuid: getTaggedConversationUuid(conv.attributes),
expirationStartTimestamp:
this.get('expirationStartTimestamp') || null,
conversationIdsSentTo,
@@ -2221,14 +2222,16 @@ export class MessageModel extends window.Backbone.Model<MessageAttributesType> {
unidentifiedStatus.forEach(
({ destinationUuid, destination, unidentified }) => {
const identifier = destinationUuid || destination;
const identifier =
destinationUuid?.aci || destinationUuid?.pni || destination;
if (!identifier) {
return;
}
const { conversation: destinationConversation } =
window.ConversationController.maybeMergeContacts({
aci: destinationUuid,
aci: destinationUuid?.aci,
pni: destinationUuid?.pni,
e164: destination || undefined,
reason: `handleDataMessage(${initialMessage.timestamp})`,
});