diff --git a/src/constants.ts b/src/constants.ts
index a52c722e..caa7597d 100644
--- a/src/constants.ts
+++ b/src/constants.ts
@@ -44,8 +44,19 @@ export const ExtendedKind = {
   GROUP_METADATA: 39000
 }
 
-export const URL_REGEX = /https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+/gu
+export const URL_REGEX =
+  /https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+(?<![.,;:'")\]}!?，。；：""''！？】）])/gu
+export const WS_URL_REGEX =
+  /wss?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+(?<![.,;:'")\]}!?，。；：""''！？】）])/gu
+export const IMAGE_REGEX =
+  /https?:\/\/[\w\p{L}\p{N}\p{M}&.-]+\/(?:[^/\s?]*\/)*([^/\s?]*\.(jpg|jpeg|png|gif|webp|bmp|tiff|heic|svg|avif))(?!\w)(?:\?[\w\p{L}\p{N}\p{M}&=.-]*)?(?<![.,;:'")\]}!?，。；：""''！？】）])/giu
+export const VIDEO_REGEX =
+  /https?:\/\/[\w\p{L}\p{N}\p{M}&.-]+\/(?:[^/\s?]*\/)*([^/\s?]*\.(mp4|webm|ogg|mov))(?!\w)(?:\?[\w\p{L}\p{N}\p{M}&=.-]*)?(?<![.,;:'")\]}!?，。；：""''！？】）])/giu
 export const EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/
+export const EMOJI_SHORT_CODE_REGEX = /:[a-zA-Z0-9_-]+:/g
+export const EMBEDDED_EVENT_REGEX = /nostr:(note1[a-z0-9]{58}|nevent1[a-z0-9]+|naddr1[a-z0-9]+)/g
+export const EMBEDDED_MENTION_REGEX = /nostr:(npub1[a-z0-9]{58}|nprofile1[a-z0-9]+)/g
+export const HASHTAG_REGEX = /#[\p{L}\p{N}\p{M}_]+/gu
 
 export const MONITOR = '9bbbb845e5b6c831c29789900769843ab43bb5047abe697870cb50b6fc9bf923'
 export const MONITOR_RELAYS = ['wss://relay.nostr.watch/']
diff --git a/src/lib/content-parser.ts b/src/lib/content-parser.ts
index 2d112703..8e2e9095 100644
--- a/src/lib/content-parser.ts
+++ b/src/lib/content-parser.ts
@@ -1,3 +1,14 @@
+import {
+  EMBEDDED_EVENT_REGEX,
+  EMBEDDED_MENTION_REGEX,
+  EMOJI_SHORT_CODE_REGEX,
+  HASHTAG_REGEX,
+  IMAGE_REGEX,
+  URL_REGEX,
+  VIDEO_REGEX,
+  WS_URL_REGEX
+} from '@/constants'
+
 export type TEmbeddedNodeType =
   | 'text'
   | 'image'
@@ -25,12 +36,12 @@ type TContentParser = { type: Exclude<TEmbeddedNodeType, 'images'>; regex: RegEx
 
 export const EmbeddedHashtagParser: TContentParser = {
   type: 'hashtag',
-  regex: /#[\p{L}\p{N}\p{M}_]+/gu
+  regex: HASHTAG_REGEX
 }
 
 export const EmbeddedMentionParser: TContentParser = {
   type: 'mention',
-  regex: /nostr:(npub1[a-z0-9]{58}|nprofile1[a-z0-9]+)/g
+  regex: EMBEDDED_MENTION_REGEX
 }
 
 export const EmbeddedLegacyMentionParser: TContentParser = {
@@ -40,34 +51,32 @@ export const EmbeddedLegacyMentionParser: TContentParser = {
 
 export const EmbeddedEventParser: TContentParser = {
   type: 'event',
-  regex: /nostr:(note1[a-z0-9]{58}|nevent1[a-z0-9]+|naddr1[a-z0-9]+)/g
+  regex: EMBEDDED_EVENT_REGEX
 }
 
 export const EmbeddedImageParser: TContentParser = {
   type: 'image',
-  regex:
-    /https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+\.(jpg|jpeg|png|gif|webp|bmp|tiff|heic|svg)(\?[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+)?/giu
+  regex: IMAGE_REGEX
 }
 
 export const EmbeddedVideoParser: TContentParser = {
   type: 'video',
-  regex:
-    /https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+\.(mp4|webm|ogg|mov)(\?[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+)?/giu
+  regex: VIDEO_REGEX
 }
 
 export const EmbeddedWebsocketUrlParser: TContentParser = {
   type: 'websocket-url',
-  regex: /wss?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+/gu
+  regex: WS_URL_REGEX
 }
 
 export const EmbeddedNormalUrlParser: TContentParser = {
   type: 'url',
-  regex: /https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_:!~*]+/gu
+  regex: URL_REGEX
 }
 
 export const EmbeddedEmojiParser: TContentParser = {
   type: 'emoji',
-  regex: /:[a-zA-Z0-9_-]+:/g
+  regex: EMOJI_SHORT_CODE_REGEX
 }
 
 export function parseContent(content: string, parsers: TContentParser[]) {