From dfe8bb32838b46afda6e0d7e02d23a4fa4ab8a59 Mon Sep 17 00:00:00 2001
From: w3nder <unktools@gmail.com>
Date: Wed, 30 Apr 2025 00:59:19 -0300
Subject: [PATCH] refactor(messageId): update all remaining usages to v2 format
 consistently

---
 src/Socket/groups.ts        | 6 +++---
 src/Utils/messages-media.ts | 6 +++---
 src/Utils/messages.ts       | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/Socket/groups.ts b/src/Socket/groups.ts
index f112fc6..2c576f4 100644
--- a/src/Socket/groups.ts
+++ b/src/Socket/groups.ts
@@ -1,6 +1,6 @@
 import { proto } from '../../WAProto'
 import { GroupMetadata, GroupParticipant, ParticipantAction, SocketConfig, WAMessageKey, WAMessageStubType } from '../Types'
-import { generateMessageID, generateMessageIDV2, unixTimestampSeconds } from '../Utils'
+import { generateMessageIDV2, unixTimestampSeconds } from '../Utils'
 import { BinaryNode, getBinaryNodeChild, getBinaryNodeChildren, getBinaryNodeChildString, jidEncode, jidNormalizedUser } from '../WABinary'
 import { makeChatsSocket } from './chats'
 
@@ -82,7 +82,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
 		...sock,
 		groupMetadata,
 		groupCreate: async(subject: string, participants: string[]) => {
-			const key = generateMessageID()
+			const key = generateMessageIDV2()
 			const result = await groupQuery(
 				'@g.us',
 				'set',
@@ -207,7 +207,7 @@ export const makeGroupsSocket = (config: SocketConfig) => {
 					{
 						tag: 'description',
 						attrs: {
-							...(description ? { id: generateMessageID() } : { delete: 'true' }),
+							...(description ? { id: generateMessageIDV2() } : { delete: 'true' }),
 							...(prev ? { prev } : {})
 						},
 						content: description ? [
diff --git a/src/Utils/messages-media.ts b/src/Utils/messages-media.ts
index eb811df..0816131 100644
--- a/src/Utils/messages-media.ts
+++ b/src/Utils/messages-media.ts
@@ -14,7 +14,7 @@ import { DEFAULT_ORIGIN, MEDIA_HKDF_KEY_MAPPING, MEDIA_PATH_MAP } from '../Defau
 import { BaileysEventMap, DownloadableMessage, MediaConnInfo, MediaDecryptionKeyInfo, MediaType, MessageType, SocketConfig, WAGenericMediaMessage, WAMediaPayloadURL, WAMediaUpload, WAMediaUploadFunction, WAMessageContent } from '../Types'
 import { BinaryNode, getBinaryNodeChild, getBinaryNodeChildBuffer, jidNormalizedUser } from '../WABinary'
 import { aesDecryptGCM, aesEncryptGCM, hkdf } from './crypto'
-import { generateMessageID } from './generics'
+import { generateMessageIDV2 } from './generics'
 import { ILogger } from './logger'
 
 const getTmpFilesDirectory = () => tmpdir()
@@ -305,7 +305,7 @@ export async function generateThumbnail(
 			}
 		}
 	} else if(mediaType === 'video') {
-		const imgFilename = join(getTmpFilesDirectory(), generateMessageID() + '.jpg')
+		const imgFilename = join(getTmpFilesDirectory(), generateMessageIDV2() + '.jpg')
 		try {
 			await extractVideoThumb(file, imgFilename, '00:00:00', { width: 32, height: 32 })
 			const buff = await fs.readFile(imgFilename)
@@ -353,7 +353,7 @@ export const encryptedStream = async(
 	if(type === 'file') {
 		bodyPath = (media as WAMediaPayloadURL).url.toString()
 	} else if(saveOriginalFileIfRequired) {
-		bodyPath = join(getTmpFilesDirectory(), mediaType + generateMessageID())
+		bodyPath = join(getTmpFilesDirectory(), mediaType + generateMessageIDV2())
 		writeStream = createWriteStream(bodyPath)
 		didSaveToTmpPath = true
 	}
diff --git a/src/Utils/messages.ts b/src/Utils/messages.ts
index 2a5b648..b164fc8 100644
--- a/src/Utils/messages.ts
+++ b/src/Utils/messages.ts
@@ -25,7 +25,7 @@ import {
 } from '../Types'
 import { isJidGroup, isJidStatusBroadcast, jidNormalizedUser } from '../WABinary'
 import { sha256 } from './crypto'
-import { generateMessageID, getKeyAuthor, unixTimestampSeconds } from './generics'
+import { generateMessageIDV2, getKeyAuthor, unixTimestampSeconds } from './generics'
 import { ILogger } from './logger'
 import { downloadContentFromMessage, encryptedStream, generateThumbnail, getAudioDuration, getAudioWaveform, MediaDownloadOptions } from './messages-media'
 
@@ -606,7 +606,7 @@ export const generateWAMessageFromContent = (
 		key: {
 			remoteJid: jid,
 			fromMe: true,
-			id: options?.messageId || generateMessageID(),
+			id: options?.messageId || generateMessageIDV2(),
 		},
 		message: message,
 		messageTimestamp: timestamp,