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

Allow any URL from known domain in wunderbar

Browse source 
## Issue
Closes 5598: support all URLs regarldess of domain on search bar

## Changes
- There is already a KNOWN_APP_DOMAINS[], so I just used that.
This commit is contained in:
infinite-persistence 2021-03-02 15:33:11 +08:00 committed by Sean Yesmunt
parent 0f096af963
commit df17504649
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
static/app-strings.json
View file

@ -1585,5 +1585,6 @@
"Level %current_level%": "Level %current_level%",
"Creator tools": "Creator tools",
"Interacting as %channelName%": "Interacting as %channelName%",
"Page Not Found": "Page Not Found",
"--end--": "--end--"
}

15
ui/component/wunderbarSuggestions/view.jsx
View file

@ -1,5 +1,5 @@
// @flow
import { URL, URL_LOCAL, URL_DEV } from 'config';
import { URL, URL_LOCAL, URL_DEV, KNOWN_APP_DOMAINS } from 'config';
import * as PAGES from 'constants/pages';
import * as ICONS from 'constants/icons';
import React from 'react';
@ -80,10 +80,10 @@ export default function WunderBarSuggestions(props: Props) {
doCloseMobileSearch();
const includesLbryTvProd = value.includes(WEB_PROD_PREFIX);
const includesLbryTvLocal = value.includes(WEB_LOCAL_PREFIX);
const includesLbryTvDev = value.includes(WEB_DEV_PREFIX);
const wasCopiedFromWeb = includesLbryTvDev || includesLbryTvLocal || includesLbryTvProd;
const knownAppDomains = KNOWN_APP_DOMAINS.map((x) => `https://${x}/`); // Match WEB_PROD_PREFIX's 'https://xx/' format.
const webDomainList = [WEB_PROD_PREFIX, ...knownAppDomains, WEB_LOCAL_PREFIX, WEB_DEV_PREFIX];
const webDomainIndex = webDomainList.findIndex((x) => value.includes(x));
const wasCopiedFromWeb = webDomainIndex !== -1;
const isLbryUrl = value.startsWith('lbry://');
if (inputRef.current) {
@ -91,10 +91,7 @@ export default function WunderBarSuggestions(props: Props) {
}
if (wasCopiedFromWeb) {
let prefix = WEB_PROD_PREFIX;
if (includesLbryTvLocal) prefix = WEB_LOCAL_PREFIX;
if (includesLbryTvDev) prefix = WEB_DEV_PREFIX;
const prefix = webDomainList[webDomainIndex];
let query = value.slice(prefix.length).replace(/:/g, '#');
if (query.includes(SEARCH_PREFIX)) {