Pipe device number through for sync'd sent story messages

ts/background.ts

@@ -3669,11 +3669,8 @@ export async function startApp(): Promise<void> {
     );
     log.info(
       logTitle,
-      source,
-      sourceUuid,
-      sourceDevice,
+      `${sourceUuid || source}.${sourceDevice}`,
       envelopeTimestamp,
-      sourceConversation?.id,
       'for sent message',
       timestamp
     );
@@ -3805,17 +3802,15 @@ export async function startApp(): Promise<void> {
 
     log.info(
       'delivery receipt from',
-      source,
-      sourceUuid,
-      sourceDevice,
-      sourceConversation?.id,
+      `${sourceUuid || source}.${sourceDevice}`,
       envelopeTimestamp,
       'for sent message',
-      timestamp
+      timestamp,
+      `wasSentEncrypted=${wasSentEncrypted}`
     );
 
     if (!sourceConversation) {
-      log.info('no conversation for', source, sourceUuid);
+      log.info('onDeliveryReceipt: no conversation for', source, sourceUuid);
       return;
     }
 

ts/textsecure/MessageReceiver.ts

@@ -1447,7 +1447,7 @@ export default class MessageReceiver
       new DeliveryEvent(
         {
           timestamp: envelope.timestamp,
-          envelopeTimestamp: envelope.serverTimestamp,
+          envelopeTimestamp: envelope.timestamp,
           source: envelope.source,
           sourceUuid: envelope.sourceUuid,
           sourceDevice: envelope.sourceDevice,
@@ -1974,6 +1974,7 @@ export default class MessageReceiver
       const ev = new SentEvent(
         {
           destinationUuid: envelope.destinationUuid.toString(),
+          device: envelope.sourceDevice,
           isRecipientUpdate: Boolean(sentMessage.isRecipientUpdate),
           message,
           receivedAtCounter: envelope.receivedAtCounter,

ts/util/onStoryRecipientUpdate.ts

@@ -26,6 +26,7 @@ export async function onStoryRecipientUpdate(
   const conversation = window.ConversationController.get(destinationUuid);
 
   if (!conversation) {
+    log.info(`onStoryRecipientUpdate no conversation for ${destinationUuid}`);
     return;
   }