Browse Source

feat: update some regexes

imwald
codytseng 1 year ago
parent
commit
f1ceac09bb
  1. 2
      src/components/Embedded/EmbeddedNormalUrl.tsx
  2. 2
      src/components/Embedded/EmbeddedWebsocketUrl.tsx
  3. 2
      src/constants.ts

2
src/components/Embedded/EmbeddedNormalUrl.tsx

@ -15,7 +15,7 @@ export function EmbeddedNormalUrl({ url }: { url: string }) { @@ -15,7 +15,7 @@ export function EmbeddedNormalUrl({ url }: { url: string }) {
}
export const embeddedNormalUrlRenderer: TEmbeddedRenderer = {
regex: /(https?:\/\/[^\s]+)/g,
regex: /(https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_,:!~*]+)/gu,
render: (url: string, index: number) => {
return <EmbeddedNormalUrl key={`normal-url-${index}-${url}`} url={url} />
}

2
src/components/Embedded/EmbeddedWebsocketUrl.tsx

@ -19,7 +19,7 @@ export function EmbeddedWebsocketUrl({ url }: { url: string }) { @@ -19,7 +19,7 @@ export function EmbeddedWebsocketUrl({ url }: { url: string }) {
}
export const embeddedWebsocketUrlRenderer: TEmbeddedRenderer = {
regex: /(wss?:\/\/[^\s]+)/g,
regex: /(wss?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_,:!~*]+)/gu,
render: (url: string, index: number) => {
return <EmbeddedWebsocketUrl key={`websocket-url-${index}-${url}`} url={url} />
}

2
src/constants.ts

@ -23,5 +23,5 @@ export const SEARCHABLE_RELAY_URLS = ['wss://relay.nostr.band/', 'wss://search.n @@ -23,5 +23,5 @@ export const SEARCHABLE_RELAY_URLS = ['wss://relay.nostr.band/', 'wss://search.n
export const PICTURE_EVENT_KIND = 20
export const COMMENT_EVENT_KIND = 1111
export const URL_REGEX = /(https?:\/\/[^\s"']+)/g
export const URL_REGEX = /https?:\/\/[\w\p{L}\p{N}\p{M}&.-/?=#\-@%+_,:!~*]+/gu
export const EMAIL_REGEX = /^[a-zA-Z0-9._%+-]+@[a-zA-Z0-9.-]+\.[a-zA-Z]{2,}$/

Loading…
Cancel
Save