From 61afe1cdc1e81762ecac1aa314d8497acfb24988 Mon Sep 17 00:00:00 2001 From: Bob <115008575+bobslavtriev@users.noreply.github.com> Date: Sun, 16 Jun 2024 09:33:01 -0300 Subject: [PATCH] Fix linting generateMessageIDV2 (#871) * Update messages-send.ts * Update generics.ts --- src/Socket/messages-send.ts | 2 +- src/Utils/generics.ts | 24 ++++++++++++------------ 2 files changed, 13 insertions(+), 13 deletions(-) diff --git a/src/Socket/messages-send.ts b/src/Socket/messages-send.ts index 320cca2..4e61f8e 100644 --- a/src/Socket/messages-send.ts +++ b/src/Socket/messages-send.ts @@ -4,7 +4,7 @@ import NodeCache from 'node-cache' import { proto } from '../../WAProto' import { DEFAULT_CACHE_TTLS, WA_DEFAULT_EPHEMERAL } from '../Defaults' import { AnyMessageContent, MediaConnInfo, MessageReceiptType, MessageRelayOptions, MiscMessageGenerationOptions, SocketConfig, WAMessageKey } from '../Types' -import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, decryptMediaRetryData, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageID, generateMessageIDV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils' +import { aggregateMessageKeysNotFromMe, assertMediaContent, bindWaitForEvent, decryptMediaRetryData, encodeSignedDeviceIdentity, encodeWAMessage, encryptMediaRetryRequest, extractDeviceJids, generateMessageIDV2, generateWAMessage, getStatusCodeForMediaRetry, getUrlFromDirectPath, getWAUploadToServer, parseAndInjectE2ESessions, unixTimestampSeconds } from '../Utils' import { getUrlInfo } from '../Utils/link-preview' import { areJidsSameUser, BinaryNode, BinaryNodeAttributes, getBinaryNodeChild, getBinaryNodeChildren, isJidGroup, isJidUser, jidDecode, jidEncode, jidNormalizedUser, JidWithDevice, S_WHATSAPP_NET } from '../WABinary' import { makeGroupsSocket } from './groups' diff --git a/src/Utils/generics.ts b/src/Utils/generics.ts index 82a9d81..1976014 100644 --- a/src/Utils/generics.ts +++ b/src/Utils/generics.ts @@ -173,22 +173,22 @@ export async function promiseTimeout(ms: number | undefined, promise: (resolv // inspired from whatsmeow code // https://github.com/tulir/whatsmeow/blob/64bc969fbe78d31ae0dd443b8d4c80a5d026d07a/send.go#L42 export const generateMessageIDV2 = (userId?: string): string => { - const data = Buffer.alloc(8 + 20 + 16) - data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000))) + const data = Buffer.alloc(8 + 20 + 16) + data.writeBigUInt64BE(BigInt(Math.floor(Date.now() / 1000))) - if (userId) { - const id = jidDecode(userId) - if (id?.user) { - data.write(id.user, 8) - data.write('@c.us', 8 + id.user.length) + if (userId) { + const id = jidDecode(userId) + if (id?.user) { + data.write(id.user, 8) + data.write('@c.us', 8 + id.user.length) + } } - } - const random = randomBytes(16) - random.copy(data, 28) + const random = randomBytes(16) + random.copy(data, 28) - const hash = createHash('sha256').update(data).digest() - return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18) + const hash = createHash('sha256').update(data).digest() + return '3EB0' + hash.toString('hex').toUpperCase().substring(0, 18) } // generate a random ID to attach to a message