From 4a3188bbf93e35a024ba197d90c388b5c0d91d50 Mon Sep 17 00:00:00 2001 From: Mikunj Date: Tue, 30 Jun 2020 15:59:45 +1000 Subject: [PATCH] minor fixes --- js/models/messages.js | 3 ++- .../outgoing/content/data/DeviceUnlinkMessage.ts | 2 +- .../content/data/ExpirationTimerUpdateMessage.ts | 2 +- .../content/data/GroupInvitationMessage.ts | 2 +- .../content/data/group/ClosedGroupMessage.ts | 14 +++++++------- .../content/data/mediumgroup/MediumGroupMessage.ts | 10 +++++----- ts/session/utils/SyncMessageUtils.ts | 1 + 7 files changed, 18 insertions(+), 16 deletions(-) diff --git a/js/models/messages.js b/js/models/messages.js index 1c88034d2..14ea44747 100644 --- a/js/models/messages.js +++ b/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'), diff --git a/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts b/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts index b08764e07..3b6bd99e2 100644 --- a/ts/session/messages/outgoing/content/data/DeviceUnlinkMessage.ts +++ b/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({ diff --git a/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts b/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts index 6329ec32b..f13d0717e 100644 --- a/ts/session/messages/outgoing/content/data/ExpirationTimerUpdateMessage.ts +++ b/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(); diff --git a/ts/session/messages/outgoing/content/data/GroupInvitationMessage.ts b/ts/session/messages/outgoing/content/data/GroupInvitationMessage.ts index 69c019230..c80ce06e5 100644 --- a/ts/session/messages/outgoing/content/data/GroupInvitationMessage.ts +++ b/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, diff --git a/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts b/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts index 7586cc3ab..701634d4f 100644 --- a/ts/session/messages/outgoing/content/data/group/ClosedGroupMessage.ts +++ b/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 { - const id = new Uint8Array(StringUtils.encode(this.groupId.key, 'utf8')); - - return new SignalService.GroupContext({ id }); - } - - protected dataProto(): SignalService.DataMessage { + public 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 }); + } } diff --git a/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupMessage.ts b/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupMessage.ts index 6f5f7514b..2f39a0b50 100644 --- a/ts/session/messages/outgoing/content/data/mediumgroup/MediumGroupMessage.ts +++ b/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 { - return new SignalService.MediumGroupUpdate({ groupId: this.groupId.key }); - } - - protected dataProto(): SignalService.DataMessage { + public 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 }); + } } diff --git a/ts/session/utils/SyncMessageUtils.ts b/ts/session/utils/SyncMessageUtils.ts index 33adb6b1c..c3e8b724a 100644 --- a/ts/session/utils/SyncMessageUtils.ts +++ b/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,