Pipe device number through for sync'd sent story messages
This commit is contained in:
parent
b0203e8909
commit
5e63d8aadf
|
@ -3669,11 +3669,8 @@ export async function startApp(): Promise<void> {
|
||||||
);
|
);
|
||||||
log.info(
|
log.info(
|
||||||
logTitle,
|
logTitle,
|
||||||
source,
|
`${sourceUuid || source}.${sourceDevice}`,
|
||||||
sourceUuid,
|
|
||||||
sourceDevice,
|
|
||||||
envelopeTimestamp,
|
envelopeTimestamp,
|
||||||
sourceConversation?.id,
|
|
||||||
'for sent message',
|
'for sent message',
|
||||||
timestamp
|
timestamp
|
||||||
);
|
);
|
||||||
|
@ -3805,17 +3802,15 @@ export async function startApp(): Promise<void> {
|
||||||
|
|
||||||
log.info(
|
log.info(
|
||||||
'delivery receipt from',
|
'delivery receipt from',
|
||||||
source,
|
`${sourceUuid || source}.${sourceDevice}`,
|
||||||
sourceUuid,
|
|
||||||
sourceDevice,
|
|
||||||
sourceConversation?.id,
|
|
||||||
envelopeTimestamp,
|
envelopeTimestamp,
|
||||||
'for sent message',
|
'for sent message',
|
||||||
timestamp
|
timestamp,
|
||||||
|
`wasSentEncrypted=${wasSentEncrypted}`
|
||||||
);
|
);
|
||||||
|
|
||||||
if (!sourceConversation) {
|
if (!sourceConversation) {
|
||||||
log.info('no conversation for', source, sourceUuid);
|
log.info('onDeliveryReceipt: no conversation for', source, sourceUuid);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1447,7 +1447,7 @@ export default class MessageReceiver
|
||||||
new DeliveryEvent(
|
new DeliveryEvent(
|
||||||
{
|
{
|
||||||
timestamp: envelope.timestamp,
|
timestamp: envelope.timestamp,
|
||||||
envelopeTimestamp: envelope.serverTimestamp,
|
envelopeTimestamp: envelope.timestamp,
|
||||||
source: envelope.source,
|
source: envelope.source,
|
||||||
sourceUuid: envelope.sourceUuid,
|
sourceUuid: envelope.sourceUuid,
|
||||||
sourceDevice: envelope.sourceDevice,
|
sourceDevice: envelope.sourceDevice,
|
||||||
|
@ -1974,6 +1974,7 @@ export default class MessageReceiver
|
||||||
const ev = new SentEvent(
|
const ev = new SentEvent(
|
||||||
{
|
{
|
||||||
destinationUuid: envelope.destinationUuid.toString(),
|
destinationUuid: envelope.destinationUuid.toString(),
|
||||||
|
device: envelope.sourceDevice,
|
||||||
isRecipientUpdate: Boolean(sentMessage.isRecipientUpdate),
|
isRecipientUpdate: Boolean(sentMessage.isRecipientUpdate),
|
||||||
message,
|
message,
|
||||||
receivedAtCounter: envelope.receivedAtCounter,
|
receivedAtCounter: envelope.receivedAtCounter,
|
||||||
|
|
|
@ -26,6 +26,7 @@ export async function onStoryRecipientUpdate(
|
||||||
const conversation = window.ConversationController.get(destinationUuid);
|
const conversation = window.ConversationController.get(destinationUuid);
|
||||||
|
|
||||||
if (!conversation) {
|
if (!conversation) {
|
||||||
|
log.info(`onStoryRecipientUpdate no conversation for ${destinationUuid}`);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue