minor fixes

js/models/messages.js

@@ -1342,8 +1342,9 @@
 
       const syncMessage = new libsession.Message.Outgoing.SentSyncMessage({
         timestamp: this.get('sent_at'),
+        identifier: this.id,
         dataMessage,
-        destination: this.id,
+        destination: this.get('destination'),
         expirationStartTimestamp: this.get('expirationStartTimestamp'),
         sent_to: this.get('sent_to'),
         unidentifiedDeliveries: this.get('unidentifiedDeliveries'),

ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts

@@ -6,7 +6,7 @@ export class DeviceUnlinkMessage extends DataMessage {
     return 4 * 24 * 60 * 60 * 1000; // 4 days for device unlinking
   }
 
-  protected dataProto(): SignalService.DataMessage {
+  public dataProto(): SignalService.DataMessage {
     const flags = SignalService.DataMessage.Flags.UNPAIRING_REQUEST;
 
     return new SignalService.DataMessage({

ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts

@@ -29,7 +29,7 @@ export class ExpirationTimerUpdateMessage extends DataMessage {
     return this.getDefaultTTL();
   }
 
-  protected dataProto(): SignalService.DataMessage {
+  public dataProto(): SignalService.DataMessage {
     const data = new SignalService.DataMessage();
 
     const groupMessage = new SignalService.GroupContext();

ts/session/messages/outgoing/content/data/GroupInvitationMessage.ts

@@ -24,7 +24,7 @@ export class GroupInvitationMessage extends DataMessage {
     return this.getDefaultTTL();
   }
 
-  protected dataProto(): SignalService.DataMessage {
+  public dataProto(): SignalService.DataMessage {
     const groupInvitation = new SignalService.DataMessage.GroupInvitation({
       serverAddress: this.serverAddress,
       channelId: this.channelId,

ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts

@@ -23,16 +23,16 @@ export abstract class ClosedGroupMessage extends DataMessage {
     return this.getDefaultTTL();
   }
 
-  protected groupContext(): SignalService.GroupContext {
+  public dataProto(): SignalService.DataMessage {
-    const id = new Uint8Array(StringUtils.encode(this.groupId.key, 'utf8'));
-
-    return new SignalService.GroupContext({ id });
-  }
-
-  protected dataProto(): SignalService.DataMessage {
     const dataMessage = new SignalService.DataMessage();
     dataMessage.group = this.groupContext();
 
     return dataMessage;
   }
+
+  protected groupContext(): SignalService.GroupContext {
+    const id = new Uint8Array(StringUtils.encode(this.groupId.key, 'utf8'));
+
+    return new SignalService.GroupContext({ id });
+  }
 }

ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupMessage.ts

@@ -23,14 +23,14 @@ export abstract class MediumGroupMessage extends DataMessage {
     return this.getDefaultTTL();
   }
 
-  protected mediumGroupContext(): SignalService.MediumGroupUpdate {
+  public dataProto(): SignalService.DataMessage {
-    return new SignalService.MediumGroupUpdate({ groupId: this.groupId.key });
-  }
-
-  protected dataProto(): SignalService.DataMessage {
     const dataMessage = new SignalService.DataMessage();
     dataMessage.mediumGroupUpdate = this.mediumGroupContext();
 
     return dataMessage;
   }
+
+  protected mediumGroupContext(): SignalService.MediumGroupUpdate {
+    return new SignalService.MediumGroupUpdate({ groupId: this.groupId.key });
+  }
 }

ts/session/utils/SyncMessageUtils.ts

@@ -23,6 +23,7 @@ export function getSentSyncMessage(params: {
   const pubKey = PubKey.cast(params.destination);
   return new SentSyncMessage({
     timestamp: Date.now(),
+    identifier: params.message.identifier,
     destination: pubKey,
     dataMessage: params.message.dataProto(),
     expirationStartTimestamp: params.expirationStartTimestamp,