fix: Fixed compatibility with WhatsApp >= 2.2238.5

wppconnect-team · Oct 8, 2022 · 28fd5f6 · 28fd5f6
1 parent 5872e53
commit 28fd5f6
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 80 deletions.
diff --git a/src/chat/events/registerLiveLocationUpdateEvent.ts b/src/chat/events/registerLiveLocationUpdateEvent.ts
@@ -19,12 +19,12 @@ import { internalEv } from '../../eventEmitter';
 import * as webpack from '../../webpack';
 import {
   ChatStore,
-  Clock,
   LiveLocationStore,
   MsgModel,
   MsgStore,
   Wid,
 } from '../../whatsapp';
+import { unixTime } from '../../whatsapp/functions';
 
 webpack.onInjected(() => registerLiveLocationUpdateEvent());
 
@@ -51,7 +51,7 @@ function processLocation(e: LocationUpdate | LocationDisable) {
   if (e.type === 'update') {
     internalEv.emit('chat.live_location_update', {
       id: e.jid,
-      lastUpdated: Clock.globalUnixTime() - e.elapsed,
+      lastUpdated: unixTime() - e.elapsed,
       elapsed: e.elapsed,
       lat: e.lat,
       lng: e.lng,

diff --git a/src/chat/functions/mute.ts b/src/chat/functions/mute.ts
@@ -16,7 +16,8 @@
 
 import { assertGetChat, assertWid } from '../../assert';
 import { WPPError } from '../../util';
-import { Clock, Wid } from '../../whatsapp';
+import { Wid } from '../../whatsapp';
+import { unixTime } from '../../whatsapp/functions';
 
 /**
  * Mute a chat, you can use duration or expiration
@@ -55,12 +56,12 @@ export async function mute(
       expiration = time.expiration.getTime() / 1000;
     }
   } else if ('duration' in time) {
-    expiration = Clock.globalUnixTime() + time.duration;
+    expiration = unixTime() + time.duration;
   } else {
     throw new WPPError('invalid_time_mute', 'Invalid time for mute', { time });
   }
 
-  if (expiration < Clock.globalUnixTime()) {
+  if (expiration < unixTime()) {
     throw new WPPError('negative_time_mute', 'Negative duration for mute', {
       time,
     });

diff --git a/src/chat/functions/prepareRawMessage.ts b/src/chat/functions/prepareRawMessage.ts
@@ -17,15 +17,9 @@
 import { assertWid } from '../../assert';
 import { getParticipants } from '../../group';
 import { WPPError } from '../../util';
-import {
-  ChatModel,
-  Clock,
-  MsgKey,
-  MsgModel,
-  UserPrefs,
-  Wid,
-} from '../../whatsapp';
+import { ChatModel, MsgKey, MsgModel, UserPrefs, Wid } from '../../whatsapp';
 import { ACK } from '../../whatsapp/enums';
+import { unixTime } from '../../whatsapp/functions';
 import { defaultSendMessageOptions, RawMessage, SendMessageOptions } from '..';
 import { generateMessageID, getMessageById } from '.';
 
@@ -45,7 +39,7 @@ export async function prepareRawMessage<T extends RawMessage>(
   };
 
   message = {
-    t: Clock.globalUnixTime(),
+    t: unixTime(),
     from: UserPrefs.getMaybeMeUser(),
     to: chat.id,
     self: 'out',

diff --git a/src/util/linkPreview.ts b/src/util/linkPreview.ts
@@ -17,8 +17,8 @@
 import Debug from 'debug';
 
 import { config } from '../config';
-import { Base64, Clock, OpaqueData } from '../whatsapp';
-import { uploadThumbnail } from '../whatsapp/functions';
+import { Base64, OpaqueData } from '../whatsapp';
+import { unixTime, uploadThumbnail } from '../whatsapp/functions';
 import { downloadImage } from './downloadImage';
 import { fetchDataFromPNG } from './fetchDataFromPNG';
 
@@ -173,7 +173,7 @@ export async function generateThumbnailLinkPreviewData(url: string) {
     (window.crypto.getRandomValues(e),
     {
       key: Base64.encodeB64(e),
-      timestamp: Clock.globalUnixTime(),
+      timestamp: unixTime(),
     });
 
   const abort = new AbortController();

diff --git a/src/whatsapp/misc/Clock.ts b/src/whatsapp/misc/Clock.ts
diff --git a/src/whatsapp/misc/index.ts b/src/whatsapp/misc/index.ts
@@ -17,7 +17,6 @@
 export * from './Base64';
 export * from './Browser';
 export * from './ChatPresence';
-export * from './Clock';
 export * from './Cmd';
 export * from './Conn';
 export * from './Constants';