fix: Fixed link-preview function

wppconnect-team · Feb 28, 2023 · 2fc38b1 · 2fc38b1
1 parent 106beb5
commit 2fc38b1
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 21 deletions.
diff --git a/src/chat/functions/prepareLinkPreview.ts b/src/chat/functions/prepareLinkPreview.ts
@@ -108,13 +108,15 @@ webpack.onReady(() => {
   wrapModuleFunction(genMinimalLinkPreview, async (func, ...args) => {
     const [uri] = args;
 
+    const url = typeof uri === 'string' ? uri : uri.url;
+
     // eslint-disable-next-line no-async-promise-executor
     return new Promise(async (resolve) => {
       try {
-        const previewData = await fetchRemoteLinkPreviewData(uri.url);
+        const previewData = await fetchRemoteLinkPreviewData(url);
 
         if (!previewData) {
-          throw new Error(`preview not found for ${uri.url}`);
+          throw new Error(`preview not found for ${url}`);
         }
 
         const { imageUrl, ...data } = previewData;
@@ -127,7 +129,7 @@ webpack.onReady(() => {
         }
 
         const result = {
-          url: uri.url,
+          url: url,
           data: {
             ...data,
             ...thumbnailData,

diff --git a/src/whatsapp/functions/fetchLinkPreview.ts b/src/whatsapp/functions/fetchLinkPreview.ts
@@ -17,6 +17,22 @@
 import * as webpack from '../../webpack';
 import { exportModule } from '../exportModule';
 
+export interface LinkUrlData {
+  anchor: undefined;
+  domain?: string;
+  href: string;
+  index: number;
+  input: string;
+  isHttp: boolean;
+  params?: string;
+  path?: string;
+  port?: number;
+  scheme: string;
+  suspiciousCharacters?: string;
+  url: string;
+  username?: string;
+}
+
 export interface LinkPreviewResult {
   url: string;
   data: {
@@ -36,7 +52,7 @@ export interface LinkPreviewResult {
  * @whatsapp 632590 >= 2.2228.4
  */
 export declare function fetchLinkPreview(
-  url: string
+  url: LinkUrlData
 ): Promise<null | LinkPreviewResult>;
 
 exportModule(

diff --git a/src/whatsapp/functions/findFirstWebLink.ts b/src/whatsapp/functions/findFirstWebLink.ts
@@ -15,12 +15,15 @@
  */
 
 import { exportModule } from '../exportModule';
+import { LinkUrlData } from './fetchLinkPreview';
 
 /** @whatsapp 29929
  * @whatsapp 31042 >= 2.2204.13
  * @whatsapp 829929 >= 2.2222.8
  */
-export declare function findFirstWebLink(message: string): undefined | string;
+export declare function findFirstWebLink(
+  message: string
+): undefined | LinkUrlData;
 
 exportModule(
   exports,

diff --git a/src/whatsapp/functions/genMinimalLinkPreview.ts b/src/whatsapp/functions/genMinimalLinkPreview.ts
@@ -15,28 +15,16 @@
  */
 
 import { exportModule } from '../exportModule';
-import { LinkPreviewResult } from './fetchLinkPreview';
+import { LinkPreviewResult, LinkUrlData } from './fetchLinkPreview';
 
 /**
  * @whatsapp 92375
  * @whatsapp 692375 >= 2.2222.8
  * @whatsapp 321120 >= 2.2228.4
  */
-export declare function genMinimalLinkPreview(data: {
-  anchor: undefined;
-  domain?: string;
-  href: string;
-  index: number;
-  input: string;
-  isHttp: boolean;
-  params?: string;
-  path?: string;
-  port?: number;
-  scheme: string;
-  suspiciousCharacters?: string;
-  url: string;
-  username?: string;
-}): Promise<null | LinkPreviewResult>;
+export declare function genMinimalLinkPreview(
+  data: LinkUrlData
+): Promise<null | LinkPreviewResult>;
 
 exportModule(
   exports,