From 461227a47f994d3cf823ccfa3a7d00aeada49350 Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Wed, 11 Nov 2020 16:32:47 -0400 Subject: [PATCH 1/2] bring up to par with master --- config/defaults.js | 2 +- utils/lndJobs.js | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/config/defaults.js b/config/defaults.js index 204b19f5..c6cce6b3 100644 --- a/config/defaults.js +++ b/config/defaults.js @@ -46,7 +46,7 @@ module.exports = (mainnet = false) => { logfile: "shockapi.log", lndLogFile: parsePath(`${lndDirectory}/logs/bitcoin/${network}/lnd.log`), lndDirPath: lndDirectory, - peers: ['http://gun.shock.network:8765/gun'], + peers: ['https://gun.shock.network:8765/gun'], useTLS: false, tokenExpirationMS: 259200000 }; diff --git a/utils/lndJobs.js b/utils/lndJobs.js index 8b0a5726..0c5791f2 100644 --- a/utils/lndJobs.js +++ b/utils/lndJobs.js @@ -36,7 +36,7 @@ const _lookupInvoice = hash => }) }) -const _getPostTipInfo = ({ postID, page }) => +const _getPostTipInfo = ({ postID }) => new Promise((resolve, reject) => { getUser() .get(Key.POSTS_NEW) @@ -44,7 +44,6 @@ const _getPostTipInfo = ({ postID, page }) => .once(post => { if (post && post.date) { const { tipCounter, tipValue } = post - console.log(post) resolve({ tipCounter: typeof tipCounter === 'number' ? tipCounter : 0, tipValue: typeof tipValue === 'number' ? tipValue : 0 From f61e75d89981ccfd0dad96feba347d09dcee1e3b Mon Sep 17 00:00:00 2001 From: Daniel Lugo Date: Wed, 11 Nov 2020 16:35:48 -0400 Subject: [PATCH 2/2] bring up to par with master --- .github/workflows/main.yml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml index 55e939ff..726e1641 100644 --- a/.github/workflows/main.yml +++ b/.github/workflows/main.yml @@ -5,6 +5,12 @@ on: branches: [ 'master' ] pull_request: branches: [ 'master' ] + workflow_dispatch: + inputs: + name: + description: 'Bump Wizard Version' + required: false + default: 'yes' jobs: dispatch: