From 38e0f2c0e60705c734f49a21c69e3de237b28191 Mon Sep 17 00:00:00 2001
From: Rajeh Taher <rajeh@reforward.dev>
Date: Sat, 4 Oct 2025 15:30:04 +0300
Subject: [PATCH] Signal, messages-recv: Fix previous commit, fix log

---
 .../Group/sender-key-distribution-message.ts       | 14 ++++++++++----
 src/Signal/Group/sender-key-message.ts             |  6 ++++--
 src/Socket/chats.ts                                |  1 +
 src/Socket/messages-recv.ts                        |  4 ++--
 4 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/Signal/Group/sender-key-distribution-message.ts b/src/Signal/Group/sender-key-distribution-message.ts
index 7f9f3cd4..9888ae38 100644
--- a/src/Signal/Group/sender-key-distribution-message.ts
+++ b/src/Signal/Group/sender-key-distribution-message.ts
@@ -4,8 +4,8 @@ import { CiphertextMessage } from './ciphertext-message'
 interface SenderKeyDistributionMessageStructure {
 	id: number
 	iteration: number
-	chainKey: Uint8Array
-	signingKey: Uint8Array
+	chainKey: string | Uint8Array
+	signingKey: string | Uint8Array
 }
 
 export class SenderKeyDistributionMessage extends CiphertextMessage {
@@ -34,8 +34,14 @@ export class SenderKeyDistributionMessage extends CiphertextMessage {
 				this.serialized = serialized
 				this.id = distributionMessage.id
 				this.iteration = distributionMessage.iteration
-				this.chainKey = distributionMessage.chainKey
-				this.signatureKey = distributionMessage.signingKey
+				this.chainKey =
+					typeof distributionMessage.chainKey === 'string'
+						? Buffer.from(distributionMessage.chainKey, 'base64')
+						: distributionMessage.chainKey
+				this.signatureKey =
+					typeof distributionMessage.signingKey === 'string'
+						? Buffer.from(distributionMessage.signingKey, 'base64')
+						: distributionMessage.signingKey
 			} catch (e) {
 				throw new Error(String(e))
 			}
diff --git a/src/Signal/Group/sender-key-message.ts b/src/Signal/Group/sender-key-message.ts
index 7cbf7048..22244c7d 100644
--- a/src/Signal/Group/sender-key-message.ts
+++ b/src/Signal/Group/sender-key-message.ts
@@ -5,7 +5,7 @@ import { CiphertextMessage } from './ciphertext-message'
 interface SenderKeyMessageStructure {
 	id: number
 	iteration: number
-	ciphertext: Buffer
+	ciphertext: string | Buffer
 }
 
 export class SenderKeyMessage extends CiphertextMessage {
@@ -36,7 +36,9 @@ export class SenderKeyMessage extends CiphertextMessage {
 			this.messageVersion = (version & 0xff) >> 4
 			this.keyId = senderKeyMessage.id
 			this.iteration = senderKeyMessage.iteration
-			this.ciphertext = senderKeyMessage.ciphertext
+			this.ciphertext = typeof senderKeyMessage.ciphertext === 'string'
+				? Buffer.from(senderKeyMessage.ciphertext, 'base64')
+				: senderKeyMessage.ciphertext
 			this.signature = signature
 		} else {
 			const version = (((this.CURRENT_VERSION << 4) | this.CURRENT_VERSION) & 0xff) % 256
diff --git a/src/Socket/chats.ts b/src/Socket/chats.ts
index 5b11df78..fca85087 100644
--- a/src/Socket/chats.ts
+++ b/src/Socket/chats.ts
@@ -601,6 +601,7 @@ export const makeChatsSocket = (config: SocketConfig) => {
 	 * type = "image for the high res picture"
 	 */
 	const profilePictureUrl = async (jid: string, type: 'preview' | 'image' = 'preview', timeoutMs?: number) => {
+		// TOOD: Add support for tctoken, existingID, and newsletter + group options
 		jid = jidNormalizedUser(jid)
 		const result = await query(
 			{
diff --git a/src/Socket/messages-recv.ts b/src/Socket/messages-recv.ts
index 6e08b7dc..f9417a2a 100644
--- a/src/Socket/messages-recv.ts
+++ b/src/Socket/messages-recv.ts
@@ -447,8 +447,8 @@ export const makeMessagesRecvSocket = (config: SocketConfig) => {
 				// Schedule phone request with delay (like whatsmeow)
 				messageRetryManager.schedulePhoneRequest(msgId, async () => {
 					try {
-						const msgId = await requestPlaceholderResend(msgKey)
-						logger.debug(`sendRetryRequest: requested placeholder resend for message ${msgId} (scheduled)`)
+						const requestId = await requestPlaceholderResend(msgKey)
+						logger.debug(`sendRetryRequest: requested placeholder resend (${requestId}) for message ${msgId} (scheduled)`)
 					} catch (error) {
 						logger.warn({ error, msgId }, 'failed to send scheduled phone request')
 					}