LBRYCommunity/lbry-desktop
1
0
Fork 0
Code Issues 596 Pull requests 6 Projects Releases 238 Packages Wiki Activity

Check search string for web URL prefixes and remove

Browse source
This commit is contained in:
ioancole 2020-09-11 23:34:53 +08:00 • committed by Sean Yesmunt
parent d9acb034e1
commit 7f00a01c2b
1 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
ui/component/wunderbar/view.jsx
View file

@ -104,12 +104,11 @@ class WunderBar extends React.PureComponent<Props, State> {
updateSearchQuery(value); updateSearchQuery(value);
} }
onSubmitWebUri(uri: string) { onSubmitWebUri(uri: string, prefix: string) {
// Allow copying a lbry.tv url and pasting it into the search bar // Allow copying a lbry.tv url and pasting it into the search bar
const { doSearch, navigateToUri, updateSearchQuery } = this.props; const { doSearch, navigateToUri, updateSearchQuery } = this.props;
const slashPosition = uri.indexOf('/'); let query = uri.slice(prefix.length);
let query = uri.slice(slashPosition);
query = query.replace(/:/g, '#'); query = query.replace(/:/g, '#');
if (query.includes(SEARCH_PREFIX)) { if (query.includes(SEARCH_PREFIX)) {
query = query.slice(SEARCH_PREFIX.length); query = query.slice(SEARCH_PREFIX.length);
@ -161,9 +160,16 @@ class WunderBar extends React.PureComponent<Props, State> {
let query = value.trim(); let query = value.trim();
this.input && this.input.blur(); this.input && this.input.blur();
const wasCopiedFromWeb = [WEB_DEV_PREFIX, WEB_LOCAL_PREFIX, WEB_PROD_PREFIX].some(p => query.includes(p)); const includesLbryTvProd = query.includes(WEB_PROD_PREFIX);
const includesLbryTvLocal = query.includes(WEB_LOCAL_PREFIX);
const includesLbryTvDev = query.includes(WEB_DEV_PREFIX);
const wasCopiedFromWeb = includesLbryTvDev || includesLbryTvLocal || includesLbryTvProd;
if (wasCopiedFromWeb) { if (wasCopiedFromWeb) {
this.onSubmitWebUri(query); let prefix = WEB_PROD_PREFIX;
if (includesLbryTvLocal) prefix = WEB_LOCAL_PREFIX;
if (includesLbryTvDev) prefix = WEB_DEV_PREFIX;
this.onSubmitWebUri(query, prefix);
} else if (suggestion) { } else if (suggestion) {
this.onClickSuggestion(query, suggestion); this.onClickSuggestion(query, suggestion);
} else { } else {