From 72590e0240c59c7d0c3b51428205df4a566e7bdb Mon Sep 17 00:00:00 2001 From: Christian Bager Bach Houmann <christian@bagerbach.com> Date: Fri, 26 Aug 2022 20:29:37 +0200 Subject: [PATCH] fix: url extension detection match by regular expression for accuracy --- src/utility/getUrlExtension.ts | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/src/utility/getUrlExtension.ts b/src/utility/getUrlExtension.ts index cc9845e..983751f 100644 --- a/src/utility/getUrlExtension.ts +++ b/src/utility/getUrlExtension.ts @@ -1,10 +1,13 @@ export default function getUrlExtension(url: string): string { - const extension = url.split('.').pop()?.split(/[#?]/).pop(); + const regexp = new RegExp(/\.([0-9a-z]+)(?:[?#]|$)/i); + const match = regexp.exec(url); - if (extension?.contains(url)) { - // Extraction failed - return ""; + if (!match) { + return ''; } - return extension ?? ""; + const [, extension] = match; + + return extension; } + -- GitLab