diff --git a/protos/SignalService.proto b/protos/SignalService.proto index 513097cce..87560cb83 100644 --- a/protos/SignalService.proto +++ b/protos/SignalService.proto @@ -187,7 +187,6 @@ message DataMessage { message GroupInvitation { optional string serverAddress = 1; - optional uint32 channelId = 2; optional string serverName = 3; } diff --git a/ts/models/conversation.ts b/ts/models/conversation.ts index ad1965522..31691e856 100644 --- a/ts/models/conversation.ts +++ b/ts/models/conversation.ts @@ -670,7 +670,6 @@ export class ConversationModel extends Backbone.Model<ConversationAttributes> { identifier: id, timestamp: sentAt, serverName: groupInvitation.serverName, - channelId: 1, serverAddress: groupInvitation.serverAddress, expireTimer: this.get('expireTimer'), }); diff --git a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts b/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts index 48685ac12..2ff3bef36 100644 --- a/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts +++ b/ts/session/messages/outgoing/visibleMessage/GroupInvitationMessage.ts @@ -5,7 +5,6 @@ import { MessageParams } from '../Message'; interface GroupInvitationMessageParams extends MessageParams { serverAddress: string; - channelId: number; serverName: string; // if there is an expire timer set for the conversation, we need to set it. // otherwise, it will disable the expire timer on the receiving side. @@ -14,14 +13,12 @@ interface GroupInvitationMessageParams extends MessageParams { export class GroupInvitationMessage extends DataMessage { private readonly serverAddress: string; - private readonly channelId: number; private readonly serverName: string; private readonly expireTimer?: number; constructor(params: GroupInvitationMessageParams) { super({ timestamp: params.timestamp, identifier: params.identifier }); this.serverAddress = params.serverAddress; - this.channelId = params.channelId; this.serverName = params.serverName; this.expireTimer = params.expireTimer; } @@ -29,7 +26,6 @@ export class GroupInvitationMessage extends DataMessage { public dataProto(): SignalService.DataMessage { const groupInvitation = new SignalService.DataMessage.GroupInvitation({ serverAddress: this.serverAddress, - channelId: this.channelId, serverName: this.serverName, }); diff --git a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts index e50f94841..6b55d0122 100644 --- a/ts/test/session/unit/messages/GroupInvitationMessage_test.ts +++ b/ts/test/session/unit/messages/GroupInvitationMessage_test.ts @@ -9,14 +9,12 @@ describe('GroupInvitationMessage', () => { let message: GroupInvitationMessage; const timestamp = Date.now(); const serverAddress = 'http://localhost'; - const channelId = 1; const serverName = 'test'; beforeEach(() => { message = new GroupInvitationMessage({ timestamp, serverAddress, - channelId, serverName, }); }); @@ -26,7 +24,6 @@ describe('GroupInvitationMessage', () => { const decoded = SignalService.Content.decode(plainText); expect(decoded.dataMessage?.groupInvitation).to.have.property('serverAddress', serverAddress); - expect(decoded.dataMessage?.groupInvitation).to.have.property('channelId', channelId); expect(decoded.dataMessage?.groupInvitation).to.have.property('serverName', serverName); });