beenull/flame
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #81 from Samuel-Martineau/master

Browse source 
Add support for all protocols for urls (fix #74)
This commit is contained in:
pawelmalak 2021-08-28 11:36:53 +02:00 committed by GitHub
commit 19f95c433c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
client/src/utility/urlParser.ts
View file

@ -1,24 +1,23 @@
export const urlParser = (url: string): string[] => {
let parsedUrl: string;
let displayUrl: string;
const hasProtocol = (url: string): boolean => /^\w+:\/\//.test(url);
const isSteamUrl = (url: string): boolean => /^steam:\/\//.test(url);
const isWebUrl = (url: string): boolean => /^https?:\/\//.test(url);
if (/(https?|steam):\/\//.test(url)) {
// Url starts with http[s]:// or steam:// -> leave it as it is
parsedUrl = url;
} else {
export const urlParser = (url: string): string[] => {
if (!hasProtocol(url)) {
// No protocol -> apply http:// prefix
parsedUrl = `http://${url}`;
url = `http://${url}`;
}
// Create simplified url to display as text
if (/steam:\/\//.test(url)) {
let displayUrl: string;
if (isSteamUrl(url)) {
displayUrl = 'Run Steam App';
} else {
} else if (isWebUrl(url)) {
displayUrl = url
.replace(/https?:\/\//, '')
.replace('www.', '')
.replace(/\/$/, '');
}
return [displayUrl, parsedUrl]
}
.replace(/https?:\/\//, '')
.replace('www.', '')
.replace(/\/$/, '');
} else displayUrl = url;
return [displayUrl, url];
};