LBRYFoundation/lbry-desktop
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/lbry-desktop.git synced 2025-08-30 08:51:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #2026 from lbryio/fix-bad-url

Browse source 
fix 1972 - invalid characters in URL
This commit is contained in:
Sean Yesmunt 2018-10-11 16:25:43 -04:00 • committed by GitHub
commit 512bf4512e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 23 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/renderer/component/wunderbar/index.js
View file

@ -7,6 +7,7 @@ import {
doFocusSearchInput, doFocusSearchInput,
doBlurSearchInput, doBlurSearchInput,
doSearch, doSearch,
doNotify,
} from 'lbry-redux'; } from 'lbry-redux';
import { makeSelectClientSetting } from 'redux/selectors/settings'; import { makeSelectClientSetting } from 'redux/selectors/settings';
import * as settings from 'constants/settings'; import * as settings from 'constants/settings';
@ -38,6 +39,7 @@ const perform = dispatch => ({
updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)), updateSearchQuery: query => dispatch(doUpdateSearchQuery(query)),
doFocus: () => dispatch(doFocusSearchInput()), doFocus: () => dispatch(doFocusSearchInput()),
doBlur: () => dispatch(doBlurSearchInput()), doBlur: () => dispatch(doBlurSearchInput()),
doShowSnackBar: (modal, props) => dispatch(doNotify(modal, props)),
}); });
export default connect( export default connect(

16
src/renderer/component/wunderbar/view.jsx
View file

@ -1,7 +1,7 @@
// @flow // @flow
import React from 'react'; import React from 'react';
import classnames from 'classnames'; import classnames from 'classnames';
import { normalizeURI, SEARCH_TYPES } from 'lbry-redux'; import { normalizeURI, SEARCH_TYPES, isURIValid } from 'lbry-redux';
import Icon from 'component/common/icon'; import Icon from 'component/common/icon';
import { parseQueryParams } from 'util/query_params'; import { parseQueryParams } from 'util/query_params';
import * as icons from 'constants/icons'; import * as icons from 'constants/icons';
@ -101,9 +101,16 @@ class WunderBar extends React.PureComponent<Props> {
if (suggestion.type === 'search') { if (suggestion.type === 'search') {
onSearch(query, resultCount); onSearch(query, resultCount);
} else { } else {
if (isURIValid(query)) {
const params = getParams(); const params = getParams();
const uri = normalizeURI(query); const uri = normalizeURI(query);
onSubmit(uri, params); onSubmit(uri, params);
} else {
this.props.doShowSnackBar({
message: __('Invalid LBRY URL entered. Only A-Z, a-z, and - allowed.'),
displayType: ['snackbar'],
})
}
} }
return; return;
@ -112,9 +119,16 @@ class WunderBar extends React.PureComponent<Props> {
// Currently no suggestion is highlighted. The user may have started // Currently no suggestion is highlighted. The user may have started
// typing, then lost focus and came back later on the same page // typing, then lost focus and came back later on the same page
try { try {
if (isURIValid(query)) {
const uri = normalizeURI(query); const uri = normalizeURI(query);
const params = getParams(); const params = getParams();
onSubmit(uri, params); onSubmit(uri, params);
} else {
this.props.doShowSnackBar({
message: __('Invalid LBRY URL entered. Only A-Z, a-z, and - allowed.'),
displayType: ['snackbar'],
})
}
} catch (e) { } catch (e) {
onSearch(query, resultCount); onSearch(query, resultCount);
} }