nostr/coracle
1
0
Fork 0
mirror of https://github.com/coracle-social/coracle.git synced 2024-09-18 19:23:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify url regex

Browse Source
This commit is contained in:
Jonathan Staab 2023-06-09 06:34:45 -07:00
parent c50d373e5c
commit 4c92782c3a
1 changed files with 9 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/util/nostr.ts
View File

@ -263,11 +263,7 @@ export const parseContent = ({content, tags = []}) => {
}
const parseUrl = () => {
const raw = first(
text.match(
/^((http|ws)s?:\/\/)?[-a-z0-9:%_\+~#@,=\.\*\(\)]+\.[a-z]{1,6}[-a-z0-9:%_\+~#\?&\/=;#@,\.\(\)]*/gi
)
)
const raw = first(text.match(/^([a-z\+:]{2,30}:\/\/)?[^\s]+\.[a-z]{2,6}[^\s]*[^\.!?,:\s]/gi))
// Skip url if it's just the end of a filepath
if (raw) {
@ -280,10 +276,8 @@ export const parseContent = ({content, tags = []}) => {
let url = raw
// Skip ellipses and very short non-urls
if (!url.match(/\.\./) && url.length > 4) {
// It's common for punctuation to end a url, trim it off
if (url.match(/[\.\?,:]$/)) {
url = url.slice(0, -1)
if (url.match(/\.\./)) {
return
}
if (!url.match("://")) {
@ -293,7 +287,6 @@ export const parseContent = ({content, tags = []}) => {
return ["link", raw, url]
}
}
}
while (text) {
const part = parseNewline() || parseMention() || parseTopic() || parseBech32() || parseUrl()