From 32533ed7f6ebbd8bd70a0a871c43ee0b579b8ce8 Mon Sep 17 00:00:00 2001 From: allburov Date: Sun, 5 Nov 2023 19:48:02 +0700 Subject: [PATCH 1/3] fix: find platform type based on browser second argument fix #481 #228 --- src/Utils/validate-connection.ts | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/Utils/validate-connection.ts b/src/Utils/validate-connection.ts index 83e1838..6804840 100644 --- a/src/Utils/validate-connection.ts +++ b/src/Utils/validate-connection.ts @@ -79,6 +79,11 @@ export const generateLoginNode = (userJid: string, config: SocketConfig): proto. return proto.ClientPayload.fromObject(payload) } +const getPlatformType = (platform: string): proto.DeviceProps.PlatformType => { + const platformType = platform.toUpperCase() + return proto.DeviceProps.PlatformType[platformType] || proto.DeviceProps.PlatformType.DESKTOP +} + export const generateRegistrationNode = ( { registrationId, signedPreKey, signedIdentityKey }: SignalCreds, config: SocketConfig @@ -91,7 +96,7 @@ export const generateRegistrationNode = ( const companion: proto.IDeviceProps = { os: config.browser[0], - platformType: proto.DeviceProps.PlatformType.DESKTOP, + platformType: getPlatformType(config.browser[1]), requireFullSync: config.syncFullHistory, } @@ -211,4 +216,4 @@ export const encodeSignedDeviceIdentity = ( return proto.ADVSignedDeviceIdentity .encode(account) .finish() -} \ No newline at end of file +} From 73ffb2a0118788c37c9610913d49a11cb5a86bc0 Mon Sep 17 00:00:00 2001 From: allburov Date: Mon, 20 Nov 2023 15:03:00 +0700 Subject: [PATCH 2/3] fix: find platform type based on browser second argument (for pairing code) fix #481 #228 --- src/Socket/socket.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts index e08b045..58a84a1 100644 --- a/src/Socket/socket.ts +++ b/src/Socket/socket.ts @@ -525,7 +525,7 @@ export const makeSocket = (config: SocketConfig) => { { tag: 'companion_platform_display', attrs: {}, - content: config.browser[0] + content: `${config.browser[1]} (${config.browser[0]})` }, { tag: 'link_code_pairing_nonce', From 4807312f1ed1ef067fcd5e8b4b97a8f90eab4f59 Mon Sep 17 00:00:00 2001 From: allburov Date: Mon, 20 Nov 2023 16:59:41 +0700 Subject: [PATCH 3/3] Revert "fix: find platform type based on browser second argument (for pairing code)" This reverts commit 73ffb2a0118788c37c9610913d49a11cb5a86bc0. --- src/Socket/socket.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Socket/socket.ts b/src/Socket/socket.ts index 58a84a1..e08b045 100644 --- a/src/Socket/socket.ts +++ b/src/Socket/socket.ts @@ -525,7 +525,7 @@ export const makeSocket = (config: SocketConfig) => { { tag: 'companion_platform_display', attrs: {}, - content: `${config.browser[1]} (${config.browser[0]})` + content: config.browser[0] }, { tag: 'link_code_pairing_nonce',