refactor: url parser

src/components/Content/index.tsx

@@ -3,13 +3,10 @@ import {
   EmbeddedEmojiParser,
   EmbeddedEventParser,
   EmbeddedHashtagParser,
-  EmbeddedImageParser,
   EmbeddedLNInvoiceParser,
-  EmbeddedMediaParser,
   EmbeddedMentionParser,
-  EmbeddedNormalUrlParser,
+  EmbeddedUrlParser,
   EmbeddedWebsocketUrlParser,
-  EmbeddedYoutubeParser,
   parseContent
 } from '@/lib/content-parser'
 import { getImageInfosFromEvent } from '@/lib/event'
@@ -40,10 +37,7 @@ const Content = memo(
     if (!_content) return null
 
     const nodes = parseContent(_content, [
-      EmbeddedYoutubeParser,
-      EmbeddedImageParser,
-      EmbeddedMediaParser,
-      EmbeddedNormalUrlParser,
+      EmbeddedUrlParser,
       EmbeddedLNInvoiceParser,
       EmbeddedWebsocketUrlParser,
       EmbeddedEventParser,

src/components/ContentPreview/Content.tsx

@@ -1,9 +1,8 @@
 import {
   EmbeddedEmojiParser,
   EmbeddedEventParser,
-  EmbeddedImageParser,
   EmbeddedMentionParser,
-  EmbeddedMediaParser,
+  EmbeddedUrlParser,
   parseContent
 } from '@/lib/content-parser'
 import { cn } from '@/lib/utils'
@@ -25,8 +24,7 @@ export default function Content({
   const { t } = useTranslation()
   const nodes = useMemo(() => {
     return parseContent(content, [
-      EmbeddedImageParser,
-      EmbeddedMediaParser,
+      EmbeddedUrlParser,
       EmbeddedEventParser,
       EmbeddedMentionParser,
       EmbeddedEmojiParser
@@ -36,9 +34,6 @@ export default function Content({
   return (
     <span className={cn('pointer-events-none', className)}>
       {nodes.map((node, index) => {
-        if (node.type === 'text') {
-          return node.data
-        }
         if (node.type === 'image' || node.type === 'images') {
           return index > 0 ? ` [${t('image')}]` : `[${t('image')}]`
         }
@@ -57,6 +52,7 @@ export default function Content({
           if (!emoji) return node.data
           return <Emoji key={index} emoji={emoji} classNames={{ img: 'mb-1' }} />
         }
+        return node.data
       })}
     </span>
   )

src/components/ProfileAbout/index.tsx

@@ -1,21 +1,21 @@
 import {
   EmbeddedHashtagParser,
   EmbeddedMentionParser,
-  EmbeddedNormalUrlParser,
+  EmbeddedUrlParser,
   EmbeddedWebsocketUrlParser,
   parseContent
 } from '@/lib/content-parser'
 import { detectLanguage } from '@/lib/utils'
+import { useTranslationService } from '@/providers/TranslationServiceProvider'
 import { useMemo, useState } from 'react'
 import { useTranslation } from 'react-i18next'
+import { toast } from 'sonner'
 import {
   EmbeddedHashtag,
   EmbeddedMention,
   EmbeddedNormalUrl,
   EmbeddedWebsocketUrl
 } from '../Embedded'
-import { useTranslationService } from '@/providers/TranslationServiceProvider'
-import { toast } from 'sonner'
 
 export default function ProfileAbout({ about, className }: { about?: string; className?: string }) {
   const { t, i18n } = useTranslation()
@@ -33,14 +33,11 @@ export default function ProfileAbout({ about, className }: { about?: string; cla
 
     const nodes = parseContent(translatedAbout ?? about, [
       EmbeddedWebsocketUrlParser,
-      EmbeddedNormalUrlParser,
+      EmbeddedUrlParser,
       EmbeddedHashtagParser,
       EmbeddedMentionParser
     ])
     return nodes.map((node, index) => {
-      if (node.type === 'text') {
-        return node.data
-      }
       if (node.type === 'url') {
         return <EmbeddedNormalUrl key={index} url={node.data} />
       }
@@ -53,6 +50,7 @@ export default function ProfileAbout({ about, className }: { about?: string; cla
       if (node.type === 'mention') {
         return <EmbeddedMention key={index} userId={node.data.split(':')[1]} />
       }
+      return node.data
     })
   }, [about, translatedAbout])