From ad810d5c9ece47b23603aea827846ae5a0aecb14 Mon Sep 17 00:00:00 2001 From: Akinwale Ariwodola Date: Thu, 5 Sep 2019 16:43:07 +0100 Subject: [PATCH] canonical url and transform updates --- package-lock.json | 4 ++-- package.json | 2 +- src/component/AppNavigator.js | 4 ++-- src/component/claimList/view.js | 7 +------ src/component/uriBar/view.js | 19 +++++++++++++------ src/page/splash/view.js | 4 ++-- src/utils/helper.js | 8 +++++++- 7 files changed, 28 insertions(+), 20 deletions(-) diff --git a/package-lock.json b/package-lock.json index 824a37d..c04365c 100644 --- a/package-lock.json +++ b/package-lock.json @@ -5574,8 +5574,8 @@ } }, "lbry-redux": { - "version": "github:lbryio/lbry-redux#c74deed2a63e1acd0d1827ed9b954242d74e2a1e", - "from": "github:lbryio/lbry-redux#c74deed2a63e1acd0d1827ed9b954242d74e2a1e", + "version": "github:lbryio/lbry-redux#362d764c4c0de23032b6871b4d54207dc548028c", + "from": "github:lbryio/lbry-redux#362d764c4c0de23032b6871b4d54207dc548028c", "requires": { "proxy-polyfill": "0.1.6", "reselect": "^3.0.0", diff --git a/package.json b/package.json index d94945e..fceea1c 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "base-64": "^0.1.0", "@expo/vector-icons": "^8.1.0", "gfycat-style-urls": "^1.0.3", - "lbry-redux": "lbryio/lbry-redux#c74deed2a63e1acd0d1827ed9b954242d74e2a1e", + "lbry-redux": "lbryio/lbry-redux#362d764c4c0de23032b6871b4d54207dc548028c", "lbryinc": "lbryio/lbryinc#4c761084990557d379c85e1c998fcae7e5db143a", "lodash": ">=4.17.11", "merge": ">=1.2.1", diff --git a/src/component/AppNavigator.js b/src/component/AppNavigator.js index 9b5c1b7..c737581 100644 --- a/src/component/AppNavigator.js +++ b/src/component/AppNavigator.js @@ -40,7 +40,7 @@ import { } from 'lbryinc'; import { makeSelectClientSetting } from 'redux/selectors/settings'; import { decode as atob } from 'base-64'; -import { dispatchNavigateBack, dispatchNavigateToUri } from 'utils/helper'; +import { dispatchNavigateBack, dispatchNavigateToUri, transformUrl } from 'utils/helper'; import AsyncStorage from '@react-native-community/async-storage'; import Colors from 'styles/colors'; import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api @@ -413,7 +413,7 @@ class AppWithNavigationState extends React.Component { ); } } else { - dispatchNavigateToUri(dispatch, nav, evt.url); + dispatchNavigateToUri(dispatch, nav, transformUrl(evt.url)); } } }; diff --git a/src/component/claimList/view.js b/src/component/claimList/view.js index 208e8c6..3f447d1 100644 --- a/src/component/claimList/view.js +++ b/src/component/claimList/view.js @@ -204,12 +204,7 @@ class ClaimList extends React.PureComponent { const options = this.buildClaimSearchOptions(); const claimSearchKey = createNormalizedClaimSearchKey(options); - let uris = claimSearchByQuery[claimSearchKey]; - - if (uris) { - // temporary workaround for missing short_urls - uris = uris.filter(uri => uri && uri.length > 0); - } + const uris = claimSearchByQuery[claimSearchKey]; if (Constants.ORIENTATION_VERTICAL === orientation) { return ( diff --git a/src/component/uriBar/view.js b/src/component/uriBar/view.js index 1097ec7..8a2b605 100644 --- a/src/component/uriBar/view.js +++ b/src/component/uriBar/view.js @@ -2,7 +2,7 @@ import React from 'react'; import { SEARCH_TYPES, isNameValid, isURIValid, normalizeURI } from 'lbry-redux'; import { FlatList, Keyboard, Text, TextInput, TouchableOpacity, View } from 'react-native'; -import { navigateToUri } from 'utils/helper'; +import { navigateToUri, transformUrl } from 'utils/helper'; import Constants from 'constants'; // eslint-disable-line node/no-deprecated-api import UriBarItem from './internal/uri-bar-item'; import Icon from 'react-native-vector-icons/FontAwesome5'; @@ -109,12 +109,19 @@ class UriBar extends React.PureComponent { handleSubmitEditing = () => { const { navigation, onSearchSubmitted, updateSearchQuery } = this.props; if (this.state.inputText) { - let inputText = this.state.inputText; - if (inputText.startsWith('lbry://') && isURIValid(inputText)) { + let inputText = this.state.inputText, + inputTextIsUrl = false; + if (inputText.startsWith('lbry://')) { + const transformedUrl = transformUrl(inputText); // if it's a URI (lbry://...), open the file page - const uri = normalizeURI(inputText); - navigateToUri(navigation, uri); - } else { + if (transformedUrl && isURIValid(transformedUrl)) { + inputTextIsUrl = true; + navigateToUri(navigation, transformedUrl); + } + } + + // couldn't parse the inputText as a URL for some reason, so do a search instead + if (!inputTextIsUrl) { updateSearchQuery(inputText); // Not a URI, default to a search request if (onSearchSubmitted) { diff --git a/src/page/splash/view.js b/src/page/splash/view.js index 90f1ed3..59e5d08 100644 --- a/src/page/splash/view.js +++ b/src/page/splash/view.js @@ -3,7 +3,7 @@ import { Lbry } from 'lbry-redux'; import { ActivityIndicator, Linking, NativeModules, Platform, Text, View } from 'react-native'; import { NavigationActions, StackActions } from 'react-navigation'; import { decode as atob } from 'base-64'; -import { navigateToUri } from 'utils/helper'; +import { navigateToUri, transformUrl } from 'utils/helper'; import moment from 'moment'; import AsyncStorage from '@react-native-community/async-storage'; import Button from 'component/button'; @@ -81,7 +81,7 @@ class SplashScreen extends React.PureComponent { }); } } else { - navigateToUri(navigation, launchUrl); + navigateToUri(navigation, transformUrl(launchUrl)); } } }; diff --git a/src/utils/helper.js b/src/utils/helper.js index 6bc6d50..7152c40 100644 --- a/src/utils/helper.js +++ b/src/utils/helper.js @@ -1,5 +1,5 @@ import { NavigationActions, StackActions } from 'react-navigation'; -import { buildURI, isURIValid } from 'lbry-redux'; +import { buildURI, isURIValid, normalizeURI } from 'lbry-redux'; import { doPopDrawerStack, doPushDrawerStack, doSetPlayerVisible } from 'redux/actions/drawer'; import Constants, { DrawerRoutes } from 'constants'; // eslint-disable-line node/no-deprecated-api @@ -246,6 +246,12 @@ export function getOrderBy(item) { return orderBy; } +// replace occurrences of ':' with '#' in a url (entered in the URI bar) +export function transformUrl(url) { + const start = 'lbry://'.length; + return normalizeURI(url.substring(start).replace(/:/g, '#')); +} + // i18n placeholder until we find a good react-native i18n module export function __(str) { return str;