☄ Retrieve url from entity instead of regex

Rnbsov · Mar 15, 2024 · f997755 · f997755
1 parent 2d13ba9
commit f997755
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/src/utils/getUrlAndLabels.ts b/src/utils/getUrlAndLabels.ts
@@ -28,10 +28,12 @@ export function getUrlAndLabels(ctx: Filter<MyContext, 'message:entities:url'>)
     }
     labels = []
   } else {
-    // retrieve the first url from the message
-    const urlMatch = message.match(/(?:https?:\/\/|www\.)\S+?(?=\s|$)/);
-    url = urlMatch ? urlMatch[0] : '';
-    labels = [];
+    // retrieve the first url from the message/post
+    const urlEntity = ctx.entities('url').find((entity) => entity.type === 'url')
+    if (urlEntity && urlEntity.text) {
+      url = urlEntity.text
+    }
+    labels = []
   }
 
   // add default label