Merge release back into master #1973

Merged
neb-b merged 8 commits from release.0.25.1 into master 2018-09-19 01:07:37 +02:00
6 changed files with 28 additions and 12 deletions

View file

@ -39,7 +39,7 @@ script:
docker run $ENVS --rm \ docker run $ENVS --rm \
-v ${PWD}:/project \ -v ${PWD}:/project \
electronuserland/builder:wine \ 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 fi
- if [ "$TARGET" == "mac" ]; then yarn build --publish onTag; fi - if [ "$TARGET" == "mac" ]; then yarn build --publish onTag; fi
- if [ "$TARGET" == "linux" ]; then yarn --link-duplicates --pure-lockfile && yarn - if [ "$TARGET" == "linux" ]; then yarn --link-duplicates --pure-lockfile && yarn

View file

@ -9,11 +9,18 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Changed ### Changed
### Fixed
## [0.25.1] - 2018-09-18
### Fixed ### Fixed
* Paragraph rendering now properly includes a margin for new paragraphs ([#1939](https://github.com/lbryio/lbry-desktop/pull/1939)) * 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)) * 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)) * 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 ## [0.25.0] - 2018-08-29

View file

@ -1,6 +1,6 @@
{ {
"name": "LBRY", "name": "LBRY",
"version": "0.25.0", "version": "0.25.1",
"description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.",
"keywords": [ "keywords": [
"lbry" "lbry"

View file

@ -124,14 +124,14 @@ class FileViewer extends React.PureComponent<Props> {
} }
handleAutoplay = (props: Props) => { 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; const playable = autoplay && playingUri !== uri && metadata && !metadata.nsfw;
if (playable && costInfo && costInfo.cost === 0 && !fileInfo && !isDownloading) { if (playable && costInfo && costInfo.cost === 0 && !fileInfo && !isDownloading) {
play(uri); this.playContent();
} else if (playable && fileInfo && fileInfo.blobs_completed > 0) { } else if (playable && fileInfo && fileInfo.blobs_completed > 0) {
play(uri); this.playContent();
} }
}; };

View file

@ -31,6 +31,7 @@ import {
import { makeSelectClientSetting, selectosNotificationsEnabled } from 'redux/selectors/settings'; import { makeSelectClientSetting, selectosNotificationsEnabled } from 'redux/selectors/settings';
import setBadge from 'util/setBadge'; import setBadge from 'util/setBadge';
import setProgressBar from 'util/setProgressBar'; import setProgressBar from 'util/setProgressBar';
import analytics from 'analytics';
const DOWNLOAD_POLL_INTERVAL = 250; const DOWNLOAD_POLL_INTERVAL = 250;
@ -265,7 +266,7 @@ function handleLoadVideoError(uri, errorType = '') {
}; };
} }
export function doLoadVideo(uri) { export function doLoadVideo(uri, shouldRecordViewEvent) {
return dispatch => { return dispatch => {
dispatch({ dispatch({
type: ACTIONS.LOADING_VIDEO_STARTED, type: ACTIONS.LOADING_VIDEO_STARTED,
@ -283,6 +284,14 @@ export function doLoadVideo(uri) {
dispatch(handleLoadVideoError(uri, 'timeout')); dispatch(handleLoadVideoError(uri, 'timeout'));
} else { } else {
dispatch(doDownloadFile(uri, streamInfo)); dispatch(doDownloadFile(uri, streamInfo));
if (shouldRecordViewEvent) {
analytics.apiLogView(
`${streamInfo.claim_name}#${streamInfo.claim_id}`,
streamInfo.outpoint,
streamInfo.claim_id
);
}
} }
}) })
.catch(() => { .catch(() => {
@ -291,7 +300,7 @@ export function doLoadVideo(uri) {
}; };
} }
export function doPurchaseUri(uri, specificCostInfo) { export function doPurchaseUri(uri, specificCostInfo, shouldRecordViewEvent) {
return (dispatch, getState) => { return (dispatch, getState) => {
const state = getState(); const state = getState();
const balance = selectBalance(state); const balance = selectBalance(state);
@ -303,7 +312,7 @@ export function doPurchaseUri(uri, specificCostInfo) {
if (cost > 0 && (!instantPurchaseMax || cost > instantPurchaseMax)) { if (cost > 0 && (!instantPurchaseMax || cost > instantPurchaseMax)) {
dispatch(doNotify({ id: MODALS.AFFIRM_PURCHASE }, { uri })); dispatch(doNotify({ id: MODALS.AFFIRM_PURCHASE }, { uri }));
} else { } 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 // 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 // file manually on their file system, so we need to dispatch a
// doLoadVideo action to reconstruct the file from the blobs // 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(); Promise.resolve();
return; return;

View file

@ -175,7 +175,7 @@ export const doCheckSubscription = (subscriptionUri: string, notify?: boolean) =
} }
if (shouldDownload) { if (shouldDownload) {
downloadCount += 1; downloadCount += 1;
dispatch(doPurchaseUri(uri, { cost: 0 })); dispatch(doPurchaseUri(uri, { cost: 0 }, true));
} }
}); });
} }