diff --git a/package.json b/package.json index 3a4bd189b..fe6b5118b 100644 --- a/package.json +++ b/package.json @@ -126,9 +126,10 @@ "hast-util-sanitize": "^1.1.2", "history": "^4.9.0", "husky": "^0.14.3", + "jsmediatags": "^3.8.1", "json-loader": "^0.5.4", "lbry-format": "https://github.com/lbryio/lbry-format.git", - "lbry-redux": "lbryio/lbry-redux#3ebbb4470c6c64fdc730f071a94aa30fc4d8e60d", + "lbry-redux": "lbryio/lbry-redux#5f97dc03fd71bba01191310f0db33113810e87e2", "lbryinc": "lbryio/lbryinc#1ce266b3c52654190b955e9c869b8e302aa5c585", "lint-staged": "^7.0.2", "localforage": "^1.7.1", @@ -204,7 +205,7 @@ "yarn": "^1.3" }, "lbrySettings": { - "lbrynetDaemonVersion": "0.39.0", + "lbrynetDaemonVersion": "0.39.2", "lbrynetDaemonUrlTemplate": "https://github.com/lbryio/lbry/releases/download/vDAEMONVER/lbrynet-OSNAME.zip", "lbrynetDaemonDir": "static/daemon", "lbrynetDaemonFileName": "lbrynet" diff --git a/src/platforms/electron/createWindow.js b/src/platforms/electron/createWindow.js index dcb1b2543..60f9658f1 100644 --- a/src/platforms/electron/createWindow.js +++ b/src/platforms/electron/createWindow.js @@ -70,7 +70,9 @@ export default appState => { // is it a lbry://? pointing to an app page if (deepLinkingURI.includes(lbryProtoQ)) { - if (Object.values(PAGES).includes(deepLinkingURI.substr(lbryProtoQ.length))) { + let path = deepLinkingURI.substr(lbryProtoQ.length); + let page = path.indexOf('?') >= 0 ? path.substring(0, path.indexOf('?')) : path; + if (Object.values(PAGES).includes(page)) { deepLinkingURI = deepLinkingURI.replace(lbryProtoQ, '#/$/'); } else { deepLinkingURI = ''; diff --git a/static/locales/en.json b/static/locales/en.json index a08fe78c8..0ff949d2c 100644 --- a/static/locales/en.json +++ b/static/locales/en.json @@ -641,6 +641,7 @@ "Refreshed!": "Refreshed!", "Starting...": "Starting...", "Spin Spin Sugar": "Spin Spin Sugar", + "URI does not include name.": "URI does not include name.", "You're not following any channels.": "You're not following any channels.", "Look what's trending for everyone": "Look what's trending for everyone", "or": "or", @@ -673,4 +674,4 @@ "Greek": "Greek", "Hide": "Hide", "'contentName' should no longer be used. Use 'streamName' instead": "'contentName' should no longer be used. Use 'streamName' instead" -} \ No newline at end of file +} diff --git a/yarn.lock b/yarn.lock index ac3ece794..2120ce4ac 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6704,6 +6704,13 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha1-597mbjXW/Bb3EP6R1c9p9w8IkR0= +jsmediatags@^3.8.1: + version "3.9.2" + resolved "https://registry.yarnpkg.com/jsmediatags/-/jsmediatags-3.9.2.tgz#c6846394ea125995c36f196c4a76277b574f0bad" + integrity sha512-kbdYK/Jka44aBfIs4+pvu5hJfVqmzcRLs3oT25q94QsT8D6fX31RSZ5nQ+FP/zvmPfllKYZpzw/uoWOE5DmN6Q== + dependencies: + xhr2 "^0.1.4" + json-buffer@3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/json-buffer/-/json-buffer-3.0.0.tgz#5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898" @@ -6894,9 +6901,9 @@ lazy-val@^1.0.3, lazy-val@^1.0.4: yargs "^13.2.2" zstd-codec "^0.1.1" -lbry-redux@lbryio/lbry-redux#3ebbb4470c6c64fdc730f071a94aa30fc4d8e60d: +lbry-redux@lbryio/lbry-redux#5f97dc03fd71bba01191310f0db33113810e87e2: version "0.0.1" - resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/3ebbb4470c6c64fdc730f071a94aa30fc4d8e60d" + resolved "https://codeload.github.com/lbryio/lbry-redux/tar.gz/5f97dc03fd71bba01191310f0db33113810e87e2" dependencies: proxy-polyfill "0.1.6" reselect "^3.0.0" @@ -12688,6 +12695,11 @@ xdg-basedir@^3.0.0: resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-3.0.0.tgz#496b2cc109eca8dbacfe2dc72b603c17c5870ad4" integrity sha1-SWsswQnsqNus/i3HK2A8F8WHCtQ= +xhr2@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/xhr2/-/xhr2-0.1.4.tgz#7f87658847716db5026323812f818cadab387a5f" + integrity sha1-f4dliEdxbbUCYyOBL4GMras4el8= + xhr@2.4.0: version "2.4.0" resolved "https://registry.yarnpkg.com/xhr/-/xhr-2.4.0.tgz#e16e66a45f869861eeefab416d5eff722dc40993"