StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-03-16 14:11:50 +00:00
Code Releases Activity

Allow getUrlsInString() to match urls that start mid-word with a protocol

Browse source
This commit is contained in:
Dragory 2020-04-23 18:57:31 +03:00
parent ee3978797b
commit 4cf8c2ae92
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
backend/src/utils.ts
View file

@ -387,7 +387,10 @@ export async function findRelevantAuditLogEntry(
} }
} }
const urlRegex = /(\S+\.\S+)/g; const realLinkRegex = /https?:\/\/\S+/; // http://anything or https://anything
const plainLinkRegex = /((?!https?:\/\/)\S)+\.\S+/; // anything.anything, without http:// or https:// preceding it
// Both of the above, with precedence on the first one
const urlRegex = new RegExp(`(${realLinkRegex.source}|${plainLinkRegex.source})`, "g");
const protocolRegex = /^[a-z]+:\/\//; const protocolRegex = /^[a-z]+:\/\//;
interface MatchedURL extends url.URL { interface MatchedURL extends url.URL {