👾 Handle text-formatted links in messages (#9)

Makes possible #8
Rnbsov · Mar 10, 2024 · 77f444f · 77f444f
2 parents 9b3309a + 2c45bc4
commit 77f444f
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 2 deletions.
diff --git a/deno.lock b/deno.lock
diff --git a/src/utils/getSourceLabel.ts b/src/utils/getSourceLabel.ts
@@ -6,7 +6,7 @@ export function getSourceLabel(source: MessageOrigin) {
   if (source) {
     switch (source.type) {
       case 'user':
-        sourceLabel = { name: `${source.sender_user.first_name} ${source.sender_user.last_name}` }
+        sourceLabel = { name: `${source.sender_user.first_name} ${source.sender_user.last_name || ''}` }
         break;
       case 'hidden_user':
         sourceLabel = { name: source.sender_user_name } 

diff --git a/src/utils/getUrlAndLabels.ts b/src/utils/getUrlAndLabels.ts
@@ -19,7 +19,14 @@ export function getUrlAndLabels(ctx: Filter<MyContext, 'message:entities:url'>)
 
   // parse url from the message
   if (startsWithUrl(message)) {
-    ({ url, labels } = parseUrls(message)[0]);
+    ;({ url, labels } = parseUrls(message)[0])
+  } else if (ctx.entities('text_link')) {
+    // handle case when user sends a message with text formatted link
+    const linkEntity = ctx.entities('text_link').find((entity) => entity.type === 'text_link')
+    if (linkEntity && linkEntity.url) {
+      url = linkEntity.url
+    }
+    labels = []
   } else {
     // retrieve the first url from the message
     const urlMatch = message.match(/(?:https?:\/\/|www\.)\S+?(?=\s|$)/);