Merge pull request #2605 from zxawry/minor-fixes

Minor fixes

src/ui/component/externalLink/view.jsx

@@ -5,6 +5,7 @@ import * as React from 'react';
 import { isURIValid } from 'lbry-redux';
 import Button from 'component/button';
 import ClaimLink from 'component/claimLink';
+import { isLBRYDomain } from 'util/uri';
 
 type Props = {
   href: string,
@@ -37,7 +38,10 @@ class ExternalLink extends React.PureComponent<Props> {
           title={title || href}
           label={children}
           className="button--external-link"
-          onClick={() => openModal(MODALS.CONFIRM_EXTERNAL_RESOURCE, { uri: href })}
+          onClick={() => {
+            const isTrusted = isLBRYDomain(href);
+            openModal(MODALS.CONFIRM_EXTERNAL_RESOURCE, { uri: href, isTrusted: isTrusted });
+          }}
         />
       );
     }

src/ui/component/fileDownloadLink/index.js

@@ -4,6 +4,7 @@ import {
   makeSelectDownloadingForUri,
   makeSelectLoadingForUri,
   makeSelectClaimForUri,
+  makeSelectClaimIsMine,
 } from 'lbry-redux';
 import { makeSelectCostInfoForUri } from 'lbryinc';
 import { doOpenModal } from 'redux/actions/app';
@@ -17,6 +18,7 @@ const select = (state, props) => ({
   costInfo: makeSelectCostInfoForUri(props.uri)(state),
   loading: makeSelectLoadingForUri(props.uri)(state),
   claim: makeSelectClaimForUri(props.uri)(state),
+  claimIsMine: makeSelectClaimIsMine(props.uri)(state),
 });
 
 const perform = dispatch => ({

src/ui/component/fileDownloadLink/view.jsx

@@ -8,6 +8,7 @@ import analytics from 'analytics';
 
 type Props = {
   claim: StreamClaim,
+  claimIsMine: boolean,
   uri: string,
   downloading: boolean,
   fileInfo: ?{
@@ -44,7 +45,18 @@ class FileDownloadLink extends React.PureComponent<Props> {
   uri: ?string;
 
   render() {
-    const { fileInfo, downloading, uri, openModal, purchaseUri, costInfo, loading, pause, claim } = this.props;
+    const {
+      fileInfo,
+      downloading,
+      uri,
+      openModal,
+      purchaseUri,
+      costInfo,
+      loading,
+      pause,
+      claim,
+      claimIsMine,
+    } = this.props;
 
     if (loading || downloading) {
       const progress = fileInfo && fileInfo.written_bytes ? (fileInfo.written_bytes / fileInfo.total_bytes) * 100 : 0;
@@ -81,7 +93,7 @@ class FileDownloadLink extends React.PureComponent<Props> {
             icon={ICONS.EXTERNAL}
             onClick={() => {
               pause();
-              openModal(MODALS.CONFIRM_EXTERNAL_RESOURCE, { path: fileInfo.download_path });
+              openModal(MODALS.CONFIRM_EXTERNAL_RESOURCE, { path: fileInfo.download_path, isMine: claimIsMine });
             }}
           />
         </ToolTip>

src/ui/component/wunderbar/index.js

@@ -3,12 +3,10 @@ import {
   doFocusSearchInput,
   doBlurSearchInput,
   doUpdateSearchQuery,
-  doSearch,
   doToast,
   selectSearchValue,
   selectSearchSuggestions,
   selectSearchBarFocused,
-  parseURI,
 } from 'lbry-redux';
 import analytics from 'analytics';
 import Wunderbar from './view';
@@ -24,6 +22,7 @@ const select = state => ({
 const perform = (dispatch, ownProps) => ({
   onSearch: query => {
     ownProps.history.push({ pathname: `/$/search`, search: `?q=${encodeURIComponent(query)}` });
+    dispatch(doUpdateSearchQuery(query));
     analytics.apiLogSearch();
   },
   onSubmit: uri => {

src/ui/modal/modalAutoGenerateThumbnail/view.jsx

@@ -1,6 +1,7 @@
 // @flow
 import React, { useRef } from 'react';
 import { Modal } from 'modal/modal';
+import { formatPathForWeb } from 'util/uri';
 
 type Props = {
   upload: Buffer => void,
@@ -12,10 +13,7 @@ type Props = {
 function ModalAutoGenerateThumbnail(props: Props) {
   const { closeModal, filePath, upload, showToast } = props;
   const playerRef = useRef();
-
-  let src = filePath.replace(/\\/g, '/');
-  src = src[0] !== '/' ? `/${src}` : src;
-  src = encodeURI(`file://${src}`).replace(/[?#]/g, encodeURIComponent);
+  const videoSrc = formatPathForWeb(filePath);
 
   function uploadImage() {
     const imageBuffer = captureSnapshot();
@@ -73,7 +71,7 @@ function ModalAutoGenerateThumbnail(props: Props) {
     >
       <section className="card__content">
         <p className="card__subtitle">{__('Pause at any time to select a thumbnail from your video')}.</p>
-        <video ref={playerRef} src={src} onLoadedMetadata={resize} onError={onError} controls />
+        <video ref={playerRef} src={videoSrc} onLoadedMetadata={resize} onError={onError} controls />
       </section>
     </Modal>
   );

src/ui/modal/modalOpenExternalResource/view.jsx

@@ -1,20 +1,27 @@
 // @flow
 import React from 'react';
 import { Modal } from 'modal/modal';
-import { formatLbryUriForWeb } from 'util/uri';
+import { formatPathForWeb } from 'util/uri';
 // @if TARGET='app'
 import { shell } from 'electron';
 // @endif
 
 type Props = {
   uri: string,
+  isTrusted: boolean,
   path: string,
+  isMine: boolean,
   closeModal: () => void,
 };
 
-class ModalOpenExternalResource extends React.PureComponent<Props> {
-  openExternalResource() {
-    const { uri, path, closeModal } = this.props;
+function ModalOpenExternalResource(props: Props) {
+  const { uri, isTrusted, path, isMine, closeModal } = props;
+
+  if ((uri && isTrusted) || (path && isMine)) {
+    openResource();
+  }
+
+  function openResource() {
     // @if TARGET='app'
     const { openExternal, openItem, showItemInFolder } = shell;
     if (uri) {
@@ -30,43 +37,33 @@ class ModalOpenExternalResource extends React.PureComponent<Props> {
     if (uri) {
       window.open(uri);
     } else if (path) {
-      // Converintg path into uri, like "file://path/to/file"
-      let _uri = path.replace(/\\/g, '/');
-      // Windows drive letter must be prefixed with a slash
-      if (_uri[0] !== '/') {
-        _uri = `/${_uri}`;
-      }
-      _uri = encodeURI(`file://${_uri}`).replace(/[?#]/g, encodeURIComponent);
-      window.open(_uri);
+      window.open(formatPathForWeb(path));
     }
     // @endif
 
     closeModal();
   }
 
-  render() {
-    const { uri, path, closeModal } = this.props;
-    return (
-      <Modal
-        isOpen
-        title={__('Warning!')}
-        contentLabel={__('Confirm External Resource')}
-        type="confirm"
-        confirmButtonLabel={__('Continue')}
-        onConfirmed={() => this.openExternalResource()}
-        onAborted={closeModal}
-      >
-        <section className="card__content">
-          <p>
-            {(uri && __('This link leads to an external website.')) ||
-              (path && __('This file has been shared with you by other people.'))}
-          </p>
-          <blockquote>{uri || path}</blockquote>
-          <p>{__('LBRY Inc is not responsible for its content, click continue to proceed at your own risk.')}</p>
-        </section>
-      </Modal>
-    );
-  }
+  return (
+    <Modal
+      isOpen
+      title={__('Warning!')}
+      contentLabel={__('Confirm External Resource')}
+      type="confirm"
+      confirmButtonLabel={__('Continue')}
+      onConfirmed={() => openResource()}
+      onAborted={closeModal}
+    >
+      <section className="card__content">
+        <p>
+          {(uri && __('This link leads to an external website.')) ||
+            (path && __('This file has been shared with you by other people.'))}
+        </p>
+        <blockquote>{uri || path}</blockquote>
+        <p>{__('LBRY Inc is not responsible for its content, click continue to proceed at your own risk.')}</p>
+      </section>
+    </Modal>
+  );
 }
 
 export default ModalOpenExternalResource;

src/ui/util/uri.js

@@ -1,6 +1,8 @@
 // @flow
 import { parseURI } from 'lbry-redux';
 
+const LBRY_INC_DOMAINS = ['lbry.io', 'lbry.com', 'lbry.tv', 'lbry.tech', 'lbry.fund', 'spee.ch'];
+
 export const formatLbryUriForWeb = (uri: string) => {
   const { claimName, claimId } = parseURI(uri);
 
@@ -11,3 +13,34 @@ export const formatLbryUriForWeb = (uri: string) => {
 
   return webUrl;
 };
+
+export const formatPathForWeb = (path: string) => {
+  if (!path) {
+    return;
+  }
+
+  let webUrl = path.replace(/\\/g, '/');
+
+  if (webUrl[0] !== '/') {
+    webUrl = `/${webUrl}`;
+  }
+
+  return encodeURI(`file://${webUrl}`).replace(/[?#]/g, encodeURIComponent);
+};
+
+export const isLBRYDomain = (uri: string) => {
+  if (!uri) {
+    return;
+  }
+
+  const myURL = new URL(uri);
+  const hostname = myURL.hostname;
+
+  for (let domain of LBRY_INC_DOMAINS) {
+    if (hostname.endsWith(domain)) {
+      return true;
+    }
+  }
+
+  return false;
+};