From 61bddf3ea3b28bf2241a129c6962e5c48ab482db Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Tue, 12 Jun 2018 15:22:20 -0400 Subject: [PATCH 1/3] pass app version info to internal APIs --- src/renderer/redux/actions/user.js | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index 1893fb13a..f8e04f404 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -1,6 +1,6 @@ import * as ACTIONS from 'constants/action_types'; import Lbryio from 'lbryio'; -import { doNotify, MODALS } from 'lbry-redux'; +import { Lbry, doNotify, MODALS } from 'lbry-redux'; import { doClaimRewardType, doRewardList } from 'redux/actions/rewards'; import { selectEmailToVerify, @@ -9,6 +9,7 @@ import { } from 'redux/selectors/user'; import rewards from 'rewards'; import analytics from 'analytics'; +import pjson from 'package.json'; export function doFetchInviteStatus() { return dispatch => { @@ -35,6 +36,21 @@ export function doFetchInviteStatus() { }; } +export function doInstallNew() { + return dispatch => { + const payload = {app_version: pjson.version}; + Lbry.status().then(status => { + payload.app_id = status.installation_id; + Lbry.version().then(version => { + payload.daemon_version = version.lbrynet_version; + payload.platform = version.platform; + Lbryio.call('install', 'new', payload); + }); + }); + }; +} + + export function doAuthenticate() { return dispatch => { dispatch({ @@ -49,6 +65,7 @@ export function doAuthenticate() { }); dispatch(doRewardList()); dispatch(doFetchInviteStatus()); + dispatch(doInstallNew()); }) .catch(error => { dispatch(doNotify({ id: MODALS.AUTHENTICATION_FAILURE })); From 35942280691b57f4cac1a5faa3299793a4c39d48 Mon Sep 17 00:00:00 2001 From: Thomas Zarebczan Date: Tue, 12 Jun 2018 17:44:20 -0400 Subject: [PATCH 2/3] add operating system lbrynet-cli version { "build": "rc", "lbrynet_version": "0.20.0rc14", "lbryschema_version": "0.0.16rc2", "lbryum_version": "3.2.2rc1", "os_release": "10", "os_system": "Windows", "platform": "Windows-10-10.0.17134", "processor": "Intel64 Family 6 Model 158 Stepping 9, GenuineIntel", "python_version": "2.7.15" } --- src/renderer/redux/actions/user.js | 1 + 1 file changed, 1 insertion(+) diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index f8e04f404..cc247b32f 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -43,6 +43,7 @@ export function doInstallNew() { payload.app_id = status.installation_id; Lbry.version().then(version => { payload.daemon_version = version.lbrynet_version; + payload.operating_system = version.os_system; payload.platform = version.platform; Lbryio.call('install', 'new', payload); }); From 20dc820e06dacf1c58631190b93a13de4eaa4b17 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Wed, 13 Jun 2018 14:36:00 -0400 Subject: [PATCH 3/3] refactor doInstallNew w/o dispatch; call directly --- src/renderer/redux/actions/user.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/src/renderer/redux/actions/user.js b/src/renderer/redux/actions/user.js index cc247b32f..7b9e96d66 100644 --- a/src/renderer/redux/actions/user.js +++ b/src/renderer/redux/actions/user.js @@ -37,21 +37,18 @@ export function doFetchInviteStatus() { } export function doInstallNew() { - return dispatch => { - const payload = {app_version: pjson.version}; - Lbry.status().then(status => { - payload.app_id = status.installation_id; - Lbry.version().then(version => { - payload.daemon_version = version.lbrynet_version; - payload.operating_system = version.os_system; - payload.platform = version.platform; - Lbryio.call('install', 'new', payload); - }); + const payload = { app_version: pjson.version }; + Lbry.status().then(status => { + payload.app_id = status.installation_id; + Lbry.version().then(version => { + payload.daemon_version = version.lbrynet_version; + payload.operating_system = version.os_system; + payload.platform = version.platform; + Lbryio.call('install', 'new', payload); }); - }; + }); } - export function doAuthenticate() { return dispatch => { dispatch({ @@ -66,7 +63,7 @@ export function doAuthenticate() { }); dispatch(doRewardList()); dispatch(doFetchInviteStatus()); - dispatch(doInstallNew()); + doInstallNew(); }) .catch(error => { dispatch(doNotify({ id: MODALS.AUTHENTICATION_FAILURE }));