From 451ebed12e0ffa2ca20205d4db52f7f80eb97cb2 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Wed, 12 Sep 2018 15:14:51 -0400 Subject: [PATCH 1/8] changelog update --- CHANGELOG.md | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 91545dfea..93a3bf391 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,11 +9,17 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Changed +### Fixed + + +## [0.25.1] - 2018-09-18 + ### Fixed * Paragraph rendering now properly includes a margin for new paragraphs ([#1939](https://github.com/lbryio/lbry-desktop/pull/1939)) * Alignment of "navigate to page" input next to pagination on channel pages ([#1941](https://github.com/lbryio/lbry-desktop/pull/1941)) * Table spacing with claim name in transactions table ([#1942](https://github.com/lbryio/lbry-desktop/pull/1942)) - + * Ability to click away from tip screen without the cancel button ([#1944](https://github.com/lbryio/lbry-desktop/pull/1944)) + * Disallow invalid tip amounts ([#1947](https://github.com/lbryio/lbry-desktop/pull/1947)) ## [0.25.0] - 2018-08-29 -- 2.45.2 From d0c24902022c15f6c9d069996cde8362c7a94190 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 12 Sep 2018 15:50:04 -0400 Subject: [PATCH 2/8] fix: ensure file_view events for autoplay/subscriptions --- src/renderer/component/fileViewer/view.jsx | 6 +++--- src/renderer/redux/actions/content.js | 17 +++++++++++++---- src/renderer/redux/actions/subscriptions.js | 2 +- 3 files changed, 17 insertions(+), 8 deletions(-) diff --git a/src/renderer/component/fileViewer/view.jsx b/src/renderer/component/fileViewer/view.jsx index 21451e123..e16a438b7 100644 --- a/src/renderer/component/fileViewer/view.jsx +++ b/src/renderer/component/fileViewer/view.jsx @@ -124,14 +124,14 @@ class FileViewer extends React.PureComponent { } handleAutoplay = (props: Props) => { - const { autoplay, playingUri, fileInfo, costInfo, isDownloading, uri, play, metadata } = props; + const { autoplay, playingUri, fileInfo, costInfo, isDownloading, uri, metadata } = props; const playable = autoplay && playingUri !== uri && metadata && !metadata.nsfw; if (playable && costInfo && costInfo.cost === 0 && !fileInfo && !isDownloading) { - play(uri); + this.playContent(); } else if (playable && fileInfo && fileInfo.blobs_completed > 0) { - play(uri); + this.playContent(); } }; diff --git a/src/renderer/redux/actions/content.js b/src/renderer/redux/actions/content.js index b8073d820..e39508808 100644 --- a/src/renderer/redux/actions/content.js +++ b/src/renderer/redux/actions/content.js @@ -31,6 +31,7 @@ import { import { makeSelectClientSetting, selectosNotificationsEnabled } from 'redux/selectors/settings'; import setBadge from 'util/setBadge'; import setProgressBar from 'util/setProgressBar'; +import analytics from 'analytics'; const DOWNLOAD_POLL_INTERVAL = 250; @@ -265,7 +266,7 @@ function handleLoadVideoError(uri, errorType = '') { }; } -export function doLoadVideo(uri) { +export function doLoadVideo(uri, shouldRecordViewEvent) { return dispatch => { dispatch({ type: ACTIONS.LOADING_VIDEO_STARTED, @@ -283,6 +284,14 @@ export function doLoadVideo(uri) { dispatch(handleLoadVideoError(uri, 'timeout')); } else { dispatch(doDownloadFile(uri, streamInfo)); + + if (shouldRecordViewEvent) { + analytics.apiLogView( + `${streamInfo.claim_name}#${streamInfo.claim_id}`, + streamInfo.outpoint, + streamInfo.claim_id + ); + } } }) .catch(() => { @@ -291,7 +300,7 @@ export function doLoadVideo(uri) { }; } -export function doPurchaseUri(uri, specificCostInfo) { +export function doPurchaseUri(uri, specificCostInfo, shouldRecordViewEvent) { return (dispatch, getState) => { const state = getState(); const balance = selectBalance(state); @@ -303,7 +312,7 @@ export function doPurchaseUri(uri, specificCostInfo) { if (cost > 0 && (!instantPurchaseMax || cost > instantPurchaseMax)) { dispatch(doNotify({ id: MODALS.AFFIRM_PURCHASE }, { uri })); } else { - dispatch(doLoadVideo(uri)); + dispatch(doLoadVideo(uri, shouldRecordViewEvent)); } } @@ -312,7 +321,7 @@ export function doPurchaseUri(uri, specificCostInfo) { // If written_bytes is false that means the user has deleted/moved the // file manually on their file system, so we need to dispatch a // doLoadVideo action to reconstruct the file from the blobs - if (!fileInfo.written_bytes) dispatch(doLoadVideo(uri)); + if (!fileInfo.written_bytes) dispatch(doLoadVideo(uri, shouldRecordViewEvent)); Promise.resolve(); return; diff --git a/src/renderer/redux/actions/subscriptions.js b/src/renderer/redux/actions/subscriptions.js index 0b7a39f78..1f4f320aa 100644 --- a/src/renderer/redux/actions/subscriptions.js +++ b/src/renderer/redux/actions/subscriptions.js @@ -175,7 +175,7 @@ export const doCheckSubscription = (subscriptionUri: string, notify?: boolean) = } if (shouldDownload) { downloadCount += 1; - dispatch(doPurchaseUri(uri, { cost: 0 })); + dispatch(doPurchaseUri(uri, { cost: 0 }, true)); } }); } -- 2.45.2 From d758de0e67bf580188d4372ad8c317c575107633 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 12 Sep 2018 15:55:09 -0400 Subject: [PATCH 3/8] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 93a3bf391..0856356be 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,6 +20,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). * Table spacing with claim name in transactions table ([#1942](https://github.com/lbryio/lbry-desktop/pull/1942)) * Ability to click away from tip screen without the cancel button ([#1944](https://github.com/lbryio/lbry-desktop/pull/1944)) * Disallow invalid tip amounts ([#1947](https://github.com/lbryio/lbry-desktop/pull/1947)) + * Ensure we record views for downloaded content from subscriptions and autoplay ([#1962](https://github.com/lbryio/lbry-desktop/pull/1962)) ## [0.25.0] - 2018-08-29 -- 2.45.2 From ded2df89dc1096ced683f6d012d8af44a5bdbdab Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Thu, 13 Sep 2018 15:36:50 -0400 Subject: [PATCH 4/8] 0.25.1-rc.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 261c816c2..aa2aa5347 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.25.0", + "version": "0.25.1-rc.1", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" -- 2.45.2 From 22478225922e52c399f7b145152f451e05b2da78 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Wed, 5 Sep 2018 21:00:52 -0400 Subject: [PATCH 5/8] Merge pull request #1934 from lbryio/travis-changes Travis env vars --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 248a9ea4f..9eef9b11b 100644 --- a/.travis.yml +++ b/.travis.yml @@ -73,4 +73,4 @@ env: #CSC_KEY_PASSWORD - secure: TDKeF7/WGwR+di+JhNp29x7NPzVMO/q+72n58zB5goI1NUKaeKgjeWbfVYx9f+4G9a9/pdDVUfORt8i6OW8ZhhqYS4E8G5F56q+oX3nrjNqM8NqoK09ehZS/wdYGbenG9oTfXYenDdwusZV4Fq0BRRLjqAIXPQCKg3//MKseh/1fHDGVGXpYUimHRSCkwspbbfB/9Qw9KEBjweeXiAwB+5F+E7fPlVtqsIvtkkED1hKe0Z8HdECC6JTZ0ZHPDDFGV3aondXQDgUlfchnZ6HDdNDO5y/hPEj0laiZQ7BssenJ8Z7qjHc5O9AKXfG+6WFICHvtgjQ0+x6rk6gpvJcyI1x2+Kck/s0EcSkFY+Yz81BxdehIeKPn9U8LpGaFbtxsp01661yeaIpAqT/PqFsdj/kFXFT6gwZlGGPMBm2WgQR4A61qkOO1jokqz/z6CnY+MNeE8E1Fh4bFoZ0JwUJFJugoyDahHpVlLw5lZaSipJO6RZ1xjoZ3XGmxvtkM4dQ16xQ++Q8EgD878uCWn2jZ5YTQdKANfXYTKSiQfoEjLeX0T6I6GSdim4ZURjcolmGNMH/3jhISOXj+e2UkLc6jwO4Ek084o6ciJ2JjqEhXvXOCeRJ2I9cf2dEk7CvtbitiDly6XATo2FP4hqNdcNNWyj/jFvuTwFT6hzBqLk1BCBc= #WIN_CSC_KEY_PASSWORD - - secure: LBwkNMw5paoxpeLcNvAbrSLghLH0kXmgctBkUK6hgqJ/6WReWKlERUCwWQp/NcAB5Nb8fUTV8hXz1UjeQG1HH65geRcxya9sf9xu446e2gRdYGfYk7AhZdIw97IlwTYv2tpnjejiVXIoClQjKRYtOkRC4BIGW+Ydun1hwEUXTVMCplOzPhpLrkJCIDDDdM4eJjWm6ZMshCKRlnt42sNdx63FHBAH72rqBnt2jd+ISIadASnWz0nQlN5aIvXR6cLZfSl8Qt/JDL+LXzWX+pNA4BegCtW3hBoLrW18QdNPxrvPCvKjRCC3LHuv+KEGbzGv/QkXg5f9BKZehIZ/hjYgxysjeHBI8yOfCoyrDafxSIso5ja2TtL9lLpW90gbkbtEFiaL2XOMUbQcwWQ6RShSoLZxgiAl6zUmrq3UtS30OjnjWgMj+WnU2BcgpmpPzU0Hz/fblX6/EnwXhPNRYZvm5JyhVRYLZypLWuV4XsWGuLbUOOrsYi7UvU+xo+3AaxbUW4A6XuQ/DUh0ZVNlpPGcVi7A2tx4/46Wm0oLwQ5NYVukHbEiHWZ4HuKqSionwtgG0T2a6/7JQdH7gb+/86z4YHmK89dd/aE84hBUGTB/pNvvtDBYBE3c60SzL0CFPJZrbz9E0gVhLfsHO+5/VCFIipgM8mYoVzsq+cONKbqUPCg= \ No newline at end of file + - secure: LBwkNMw5paoxpeLcNvAbrSLghLH0kXmgctBkUK6hgqJ/6WReWKlERUCwWQp/NcAB5Nb8fUTV8hXz1UjeQG1HH65geRcxya9sf9xu446e2gRdYGfYk7AhZdIw97IlwTYv2tpnjejiVXIoClQjKRYtOkRC4BIGW+Ydun1hwEUXTVMCplOzPhpLrkJCIDDDdM4eJjWm6ZMshCKRlnt42sNdx63FHBAH72rqBnt2jd+ISIadASnWz0nQlN5aIvXR6cLZfSl8Qt/JDL+LXzWX+pNA4BegCtW3hBoLrW18QdNPxrvPCvKjRCC3LHuv+KEGbzGv/QkXg5f9BKZehIZ/hjYgxysjeHBI8yOfCoyrDafxSIso5ja2TtL9lLpW90gbkbtEFiaL2XOMUbQcwWQ6RShSoLZxgiAl6zUmrq3UtS30OjnjWgMj+WnU2BcgpmpPzU0Hz/fblX6/EnwXhPNRYZvm5JyhVRYLZypLWuV4XsWGuLbUOOrsYi7UvU+xo+3AaxbUW4A6XuQ/DUh0ZVNlpPGcVi7A2tx4/46Wm0oLwQ5NYVukHbEiHWZ4HuKqSionwtgG0T2a6/7JQdH7gb+/86z4YHmK89dd/aE84hBUGTB/pNvvtDBYBE3c60SzL0CFPJZrbz9E0gVhLfsHO+5/VCFIipgM8mYoVzsq+cONKbqUPCg= -- 2.45.2 From 267411f30e2eb5f75cbbbc227822fabfe3fa4479 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 17 Sep 2018 14:35:22 -0400 Subject: [PATCH 6/8] remove special characters from travis ENVs --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 9eef9b11b..2a883d6f9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -39,7 +39,7 @@ script: docker run $ENVS --rm \ -v ${PWD}:/project \ electronuserland/builder:wine \ - /bin/bash -c "yarn --link-duplicates --pure-lockfile && yarn build --win --publish onTag"; + /bin/bash -c "env | grep -v '\r' | grep -iE 'DEBUG|TARGET|NODE_|ELECTRON_|YARN_|NPM_|CI|CIRCLE|TRAVIS|APPVEYOR_|CSC_|GH_|GITHUB_|BT_|AWS_|STRIP|BUILD_|WIN_' && yarn --link-duplicates --pure-lockfile && yarn build --win --publish onTag"; fi - if [ "$TARGET" == "mac" ]; then yarn build --publish onTag; fi - if [ "$TARGET" == "linux" ]; then yarn --link-duplicates --pure-lockfile && yarn -- 2.45.2 From 2f42a57e2115ba4f7d7daff7855615bfa889645d Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Mon, 17 Sep 2018 14:35:49 -0400 Subject: [PATCH 7/8] 0.25.1-rc.2 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index aa2aa5347..720f49fd8 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.25.1-rc.1", + "version": "0.25.1-rc.2", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" -- 2.45.2 From 32ae269f34ae916d7241dcca743d102db9867094 Mon Sep 17 00:00:00 2001 From: Sean Yesmunt Date: Tue, 18 Sep 2018 11:01:57 -0400 Subject: [PATCH 8/8] v0.25.1 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 720f49fd8..00a4053ac 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.25.1-rc.2", + "version": "0.25.1", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "keywords": [ "lbry" -- 2.45.2