fix: valid URL handing in wunderbar
Once parseURI can handle the spaces / return if the URI is valid, we can remove that part and the try/catch.
This commit is contained in:
parent
3eae6f8fdf
commit
46d98ff0c0
1 changed files with 16 additions and 5 deletions
|
@ -2,7 +2,7 @@
|
||||||
import * as ICONS from 'constants/icons';
|
import * as ICONS from 'constants/icons';
|
||||||
import * as PAGES from 'constants/pages';
|
import * as PAGES from 'constants/pages';
|
||||||
import React, { useEffect, Fragment } from 'react';
|
import React, { useEffect, Fragment } from 'react';
|
||||||
import { regexInvalidURI } from 'lbry-redux';
|
import { regexInvalidURI, parseURI } from 'lbry-redux';
|
||||||
import ClaimPreview from 'component/claimPreview';
|
import ClaimPreview from 'component/claimPreview';
|
||||||
import ClaimList from 'component/claimList';
|
import ClaimList from 'component/claimList';
|
||||||
import Page from 'component/page';
|
import Page from 'component/page';
|
||||||
|
@ -35,10 +35,21 @@ export default function SearchPage(props: Props) {
|
||||||
}
|
}
|
||||||
|
|
||||||
const INVALID_URI_CHARS = new RegExp(regexInvalidURI, 'gu');
|
const INVALID_URI_CHARS = new RegExp(regexInvalidURI, 'gu');
|
||||||
const modifiedUrlQuery = urlQuery
|
let isValid = false;
|
||||||
.trim()
|
let path;
|
||||||
.replace(/\s+/g, '-')
|
try {
|
||||||
.replace(INVALID_URI_CHARS, '');
|
({ path } = parseURI(urlQuery.replace(/ /g, '-').replace(/:/g, '#')));
|
||||||
|
isValid = true;
|
||||||
|
} catch (e) {
|
||||||
|
isValid = false;
|
||||||
|
}
|
||||||
|
|
||||||
|
const modifiedUrlQuery = isValid
|
||||||
|
? path
|
||||||
|
: urlQuery
|
||||||
|
.trim()
|
||||||
|
.replace(/\s+/g, '-')
|
||||||
|
.replace(INVALID_URI_CHARS, '');
|
||||||
const uriFromQuery = `lbry://${modifiedUrlQuery}`;
|
const uriFromQuery = `lbry://${modifiedUrlQuery}`;
|
||||||
|
|
||||||
useEffect(() => {
|
useEffect(() => {
|
||||||
|
|
Loading…
Add table
Reference in a new issue