extras
/
wildebeest
mirror of https://github.com/cloudflare/wildebeest.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #395 from chroju/fix_url_regex 

Fix status enrichment that includes URLs with single-letter second-level domains
This commit is contained in:
Dario Piotrowicz 2023-03-12 13:57:29 +00:00 committed by GitHub
parent 86df301550 615448ae23
commit 5dae3b998b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/mastodon/microformats.ts
View File

@ -11,7 +11,7 @@ function tag(name: string, content: string, attrs: Record<string, string> = {}):
return `<${name}${htmlAttrs}>${content}</${name}>`
}
const linkRegex = /(^|\s|\b)(https?:\/\/[-\w@:%._+~#=]{2,256}\.[a-z]{2,6}\b(?:[-\w@:%_+.~#?&/=]*))(\b|\s|$)/g
const linkRegex = /(^|\s|\b)(https?:\/\/[-\w@:%._+~#=]{1,256}\.[a-z]{2,6}\b(?:[-\w@:%_+.~#?&/=]*))(\b|\s|$)/g
const mentionedEmailRegex = /(^|\s|\b|\W)@(\w+(?:[.-]?\w+)+@\w+(?:[.-]?\w+)+(?:\.\w{2,63})+)(\b|\s|$)/g
const tagRegex = /(^|\s|\b|\W)#(\w{2,63})(\b|\s|$)/g

3
backend/test/mastodon.spec.ts
View File

@ -187,6 +187,9 @@ describe('Mastodon APIs', () => {
'http://www.cloudflare.co.uk?test=test@123',
'http://www.cloudflare.com/.com/?test=test@~123&a=b',
'https://developers.cloudflare.com/workers/runtime-apis/request/#background',
'https://a.test',
'https://a.test/test',
'https://a.test/test?test=test',
]
linksToTest.forEach((link) => {
const url = new URL(link)