diff options
Diffstat (limited to 'app/javascript/flavours/glitch/utils')
-rw-r--r-- | app/javascript/flavours/glitch/utils/counter.js | 9 | ||||
-rw-r--r-- | app/javascript/flavours/glitch/utils/url_regex.js | 30 |
2 files changed, 0 insertions, 39 deletions
diff --git a/app/javascript/flavours/glitch/utils/counter.js b/app/javascript/flavours/glitch/utils/counter.js deleted file mode 100644 index 7aa9e87b1..000000000 --- a/app/javascript/flavours/glitch/utils/counter.js +++ /dev/null @@ -1,9 +0,0 @@ -import { urlRegex } from './url_regex'; - -const urlPlaceholder = '$2xxxxxxxxxxxxxxxxxxxxxxx'; - -export function countableText(inputText) { - return inputText - .replace(urlRegex, urlPlaceholder) - .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3'); -}; diff --git a/app/javascript/flavours/glitch/utils/url_regex.js b/app/javascript/flavours/glitch/utils/url_regex.js deleted file mode 100644 index 9c2005c53..000000000 --- a/app/javascript/flavours/glitch/utils/url_regex.js +++ /dev/null @@ -1,30 +0,0 @@ -import regexSupplant from 'twitter-text/dist/lib/regexSupplant'; -import validUrlPrecedingChars from 'twitter-text/dist/regexp/validUrlPrecedingChars'; -import validDomain from 'twitter-text/dist/regexp/validDomain'; -import validPortNumber from 'twitter-text/dist/regexp/validPortNumber'; -import validUrlPath from 'twitter-text/dist/regexp/validUrlPath'; -import validUrlQueryChars from 'twitter-text/dist/regexp/validUrlQueryChars'; -import validUrlQueryEndingChars from 'twitter-text/dist/regexp/validUrlQueryEndingChars'; - -// The difference with twitter-text's extractURL is that the protocol isn't -// optional. - -export const urlRegex = regexSupplant( - '(' + // $1 URL - '(#{validUrlPrecedingChars})' + // $2 - '(https?:\\/\\/)' + // $3 Protocol - '(#{validDomain})' + // $4 Domain(s) - '(?::(#{validPortNumber}))?' + // $5 Port number (optional) - '(\\/#{validUrlPath}*)?' + // $6 URL Path - '(\\?#{validUrlQueryChars}*#{validUrlQueryEndingChars})?' + // $7 Query String - ')', - { - validUrlPrecedingChars, - validDomain, - validPortNumber, - validUrlPath, - validUrlQueryChars, - validUrlQueryEndingChars, - }, - 'gi', -); |