From 506eac507f74ec9620f305587c1cbf913d645516 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 30 Nov 2018 11:26:58 -0500 Subject: [PATCH 01/11] proposed readme changes --- README.md | 48 ++++++++++++++++++++---------------------------- 1 file changed, 20 insertions(+), 28 deletions(-) diff --git a/README.md b/README.md index 009ba6ae..25160d4f 100644 --- a/README.md +++ b/README.md @@ -1,19 +1,15 @@ # Spee.ch -Spee.ch is a [NodeJS](https://nodejs.org) React web app that reads and publishes images and videos to and from the [LBRY](https://lbry.io/) blockchain. +Spee.ch is a [NodeJS](https://nodejs.org) React web app that reads and publishes images, videos and other assets to and from the [LBRY](https://lbry.io/) blockchain. -You can create your own custom version of spee.ch by installing this code base and then creating your own custom components and styles to override the defaults. (More details/guide on how to do that coming soon.) +Succinctly, via spee.ch, you can have a user-friendly, custom-designed image and video hosting site that is backed by a decentralized network. Via just a set of config files, you can spin your entire site back up including assets, with no backing up necessary. -Spee.ch depends on two other lbry technologies: - * [chainquery](https://github.com/lbryio/chainquery) - a normalized database of the blockchain data. We've provided credentials to use a public chainquery service. You can also install it on your own server to avoid being affected by the commons. - * [lbrynet](https://github.com/lbryio/lbry) - a daemon that handles your wallet and transactions. -![App GIF](https://spee.ch/e/speechgif.gif) +## Installation -## Install +### Ubuntu Step-by-Step -### Ubuntu Step by Step -[Ubuntu Install Guide](./docs/ubuntuinstall.md) +[Step-by-step Ubuntu Install Guide](./docs/ubuntuinstall.md) -### Quickstart Overview +### Full Instructions #### Get some information ready: * mysqlusername @@ -21,7 +17,7 @@ Spee.ch depends on two other lbry technologies: * domainname or 'http://localhost' * speechport = 3000 -#### Install and Set Up System Dependencies: +#### Install and Set Up Dependencies * Firewall open ports * 22 * 80 @@ -49,7 +45,7 @@ Spee.ch depends on two other lbry technologies: * _note: even running on http://localhost, you must redirect http or https to port 3000_ -#### Clone a spee.ch repo (choose one) +#### Clone spee.ch * release version for stable production ``` $ git clone -b release https://github.com/lbryio/spee.ch.git @@ -95,8 +91,8 @@ Check out the [customization guide](https://github.com/lbryio/spee.ch/blob/readm #### (optional) add custom components and update the styles - * Create custom components by creating React components in `site/custom/src/` (further instructions coming soon) - * Update the CSS by changing the files in `site/custom/scss` (further instructions and refactor coming soon) + * Create custom components by creating React components in `site/custom/src/` + * Update or override the CSS by changing the files in `site/custom/scss` #### (optional) install your own chainquery Instructions are coming at [lbry-docker] to install your own chainquery instance using docker-compose. This will require 50GB of preferably SSD space and at least 10 minutes to download, possibly much longer. @@ -222,7 +218,8 @@ Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain a * To run only tests that do not require LBC, run `npm run test:no-lbc` ### URL formats -Spee.ch has a few types of URL formats that return different assets from the LBRY network. Below is a list of all possible URLs for the content on spee.ch +Spee.ch has a few types of URL formats that return different assets from the LBRY network. Below is a list of all possible URLs for the content on spee.ch. You can learn more about LBRY URLs [here](https://lbry.tech/resources/uri). + * retrieve the controlling `LBRY` claim: * https://spee.ch/`claim` * https://spee.ch/`claim`.`ext` (serve) @@ -240,22 +237,17 @@ Spee.ch has a few types of URL formats that return different assets from the LBR * https://spee.ch/`@channel`:`channel_id`/`claim` * https://spee.ch/`@channel`:`channel_id`/`claim`.`ext` (serve) +### Dependencies + +Spee.ch depends on two other lbry technologies: + * [chainquery](https://github.com/lbryio/chainquery) - a normalized database of the blockchain data. We've provided credentials to use a public chainquery service. You can also install it on your own server to avoid being affected by the commons. + * [lbrynet](https://github.com/lbryio/lbry) - a daemon that handles your wallet and transactions. +![App GIF](https://spee.ch/e/speechgif.gif) + + ### Bugs If you find a bug or experience a problem, please report your issue here on GitHub and find us in the lbry discord! -### Issue tags in this repo -#### level 1 -Issues that anyone with basic web development can handle; little-to-no experience with the spee.ch codebase is required. - -#### level 2 -Familiarity with web apps is required, but little-to-no familiarity with the lbry daemon is necessary - -#### level 3 -Familiarity with the spee.ch code base and how the lbry daemon functions is required - -#### level 4 -Issues with lbry (e.g. the spee.ch wallet, lbrynet configuration, etc.) that require strong familiarity with the lbry daemon and/or network to fix. Generally these issues are best suited for the `lbry` `protocol team` but are reported in this repo because they are part of the spee.ch implementation - ## License This project is MIT licensed. For the full license, see [LICENSE](LICENSE). From 82c6b966e4131325eca3cfe7f5a29c1e170c4837 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 4 Dec 2018 11:35:59 -0500 Subject: [PATCH 02/11] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 25160d4f..9f203a2b 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,11 @@ # Spee.ch -Spee.ch is a [NodeJS](https://nodejs.org) React web app that reads and publishes images, videos and other assets to and from the [LBRY](https://lbry.io/) blockchain. -Succinctly, via spee.ch, you can have a user-friendly, custom-designed image and video hosting site that is backed by a decentralized network. Via just a set of config files, you can spin your entire site back up including assets, with no backing up necessary. +spee.ch provides a user-friendly, custom-designed, image and video hosting site backed by a decentralized network and +blockchain ([LBRY](https://lbry.tech/)). Via just a small set of config files, you can spin your an entire spee.ch site back up including assets. + +For a completely open, unrestricted example of a spee.ch site, check out https://www.spee.ch. + +For a closed, custom-hosted and branded example, check out https://lbry.theantimedia.com/. ## Installation From 959c06746d6302a9181ad1c3b857ebb4b7cd4a45 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Tue, 4 Dec 2018 11:38:48 -0500 Subject: [PATCH 03/11] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f203a2b..2e505ab2 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,8 @@ spee.ch provides a user-friendly, custom-designed, image and video hosting site backed by a decentralized network and blockchain ([LBRY](https://lbry.tech/)). Via just a small set of config files, you can spin your an entire spee.ch site back up including assets. +![App GIF](https://spee.ch/e/speechgif.gif) + For a completely open, unrestricted example of a spee.ch site, check out https://www.spee.ch. For a closed, custom-hosted and branded example, check out https://lbry.theantimedia.com/. @@ -246,8 +248,6 @@ Spee.ch has a few types of URL formats that return different assets from the LBR Spee.ch depends on two other lbry technologies: * [chainquery](https://github.com/lbryio/chainquery) - a normalized database of the blockchain data. We've provided credentials to use a public chainquery service. You can also install it on your own server to avoid being affected by the commons. * [lbrynet](https://github.com/lbryio/lbry) - a daemon that handles your wallet and transactions. -![App GIF](https://spee.ch/e/speechgif.gif) - ### Bugs If you find a bug or experience a problem, please report your issue here on GitHub and find us in the lbry discord! From 204686b690048d5821c82be0f9c068196b166550 Mon Sep 17 00:00:00 2001 From: jessop Date: Tue, 4 Dec 2018 12:43:37 -0500 Subject: [PATCH 04/11] checks bidstate on top-free claimnames --- server/chainquery/bundle.js | 5 ++--- server/chainquery/queries/claimQueries.js | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/server/chainquery/bundle.js b/server/chainquery/bundle.js index 4a96169b..a859bd5d 100644 --- a/server/chainquery/bundle.js +++ b/server/chainquery/bundle.js @@ -873,8 +873,7 @@ var claimQueries = (db, table, sequelize) => ({ logger$1.debug(`claim.getAllChannelClaims for ${channelClaimId}`); const defaultWhereClauses = { - bid_state: - { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] } + bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] } }; const addWhereClauses = (whereClauses, params) => { @@ -969,7 +968,7 @@ var claimQueries = (db, table, sequelize) => ({ getTopFreeClaimIdByClaimName: async (name) => { return await table.findAll({ // TODO: Limit 1 - where: { name }, + where: { name, bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] } }, order: [['effective_amount', 'DESC'], ['height', 'ASC']], }).then(result => { if(result.length === 0) { diff --git a/server/chainquery/queries/claimQueries.js b/server/chainquery/queries/claimQueries.js index cf4b532b..521cda04 100644 --- a/server/chainquery/queries/claimQueries.js +++ b/server/chainquery/queries/claimQueries.js @@ -72,8 +72,7 @@ export default (db, table, sequelize) => ({ logger.debug(`claim.getAllChannelClaims for ${channelClaimId}`); const defaultWhereClauses = { - bid_state: - { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] } + bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] } }; const addWhereClauses = (whereClauses, params) => { @@ -168,7 +167,7 @@ export default (db, table, sequelize) => ({ getTopFreeClaimIdByClaimName: async (name) => { return await table.findAll({ // TODO: Limit 1 - where: { name }, + where: { name, bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] } }, order: [['effective_amount', 'DESC'], ['height', 'ASC']], }).then(result => { if(result.length === 0) { From 3c6b378611a5a1d9c531b5a62c047ea101503684 Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 4 Dec 2018 12:11:14 -0600 Subject: [PATCH 05/11] Increase file wait delay --- server/controllers/api/claim/get/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/server/controllers/api/claim/get/index.js b/server/controllers/api/claim/get/index.js index 2bfbf2b1..47423119 100644 --- a/server/controllers/api/claim/get/index.js +++ b/server/controllers/api/claim/get/index.js @@ -38,7 +38,7 @@ const claimGet = async ({ ip, originalUrl, params }, res) => { try { await waitOn({ resources: [ lbrynetResult.file_name ], - delay : 100, + delay : 500, timeout : 10000, // 10 seconds }); } catch (e) {} From 9c0e0b789e15a238f3f7e5663da697fda4745a6c Mon Sep 17 00:00:00 2001 From: jessop Date: Tue, 4 Dec 2018 13:11:24 -0500 Subject: [PATCH 06/11] fixes bug in lbryurl copy --- client/src/containers/AssetInfo/view.jsx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx index a5c58941..9fc1899e 100644 --- a/client/src/containers/AssetInfo/view.jsx +++ b/client/src/containers/AssetInfo/view.jsx @@ -27,6 +27,7 @@ class AssetInfo extends React.Component { shortId: channelShortId, }; channelCanonicalUrl = `${createCanonicalLink({channel})}`; + console.log(channelName) } return (
@@ -120,7 +121,7 @@ class AssetInfo extends React.Component { } content={ } From d8e13cbfcf1170b36c7acc6ef2b4c87aaae72a81 Mon Sep 17 00:00:00 2001 From: Shawn K Date: Tue, 4 Dec 2018 12:14:15 -0600 Subject: [PATCH 07/11] Update view.jsx --- client/src/containers/AssetInfo/view.jsx | 1 - 1 file changed, 1 deletion(-) diff --git a/client/src/containers/AssetInfo/view.jsx b/client/src/containers/AssetInfo/view.jsx index 9fc1899e..6876d8a1 100644 --- a/client/src/containers/AssetInfo/view.jsx +++ b/client/src/containers/AssetInfo/view.jsx @@ -27,7 +27,6 @@ class AssetInfo extends React.Component { shortId: channelShortId, }; channelCanonicalUrl = `${createCanonicalLink({channel})}`; - console.log(channelName) } return (
From b49cb4484c531b0ba0e970bccb4710d87af62f8e Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Mon, 12 Nov 2018 08:25:48 -0500 Subject: [PATCH 08/11] mark pending claims; move them to front of list; show proper notification --- client/src/containers/AssetDisplay/view.jsx | 28 +++++++++++-------- .../api/channel/claims/getChannelClaims.js | 6 ++++ server/utils/getClaimData.js | 1 + 3 files changed, 24 insertions(+), 11 deletions(-) diff --git a/client/src/containers/AssetDisplay/view.jsx b/client/src/containers/AssetDisplay/view.jsx index 98a78366..2102f12b 100644 --- a/client/src/containers/AssetDisplay/view.jsx +++ b/client/src/containers/AssetDisplay/view.jsx @@ -46,7 +46,7 @@ class AssetDisplay extends React.Component { } render () { const { status, error, asset } = this.props; - const { name, claimData: { claimId, contentType, thumbnail, outpoint } } = asset; + const { name, claimData: { claimId, contentType, thumbnail, outpoint, pending } } = asset; // the outpoint is added to force the browser to re-download the asset after an update // issue: https://github.com/lbryio/spee.ch/issues/607 let fileExt; @@ -68,16 +68,22 @@ class AssetDisplay extends React.Component {

Curious what magic is happening here? Learn more.

} - {(status === ERROR) && -
- -

Unfortunately, we couldn't download your asset from LBRY. You can help us out by sharing the following error message in the LBRY discord.

- - -

{error}

- -
- } + {(status === ERROR) && ( + pending ? ( +
+

This content is pending confirmation on the LBRY blockchain. It should be available in the next few minutes, please check back or refresh.

+
+ ) : ( +
+ +

Unfortunately, we couldn't download your asset from LBRY. You can help us out by sharing the following error message in the LBRY discord.

+ + +

{error}

+ +
+ ) + )} {(status === AVAILABLE) && { channelClaims = await chainquery.claim.queries.getAllChannelClaims(channelId, params); } + const split = channelClaims.reduce( + (acc, val) => val.dataValues.height === 0 ? { ...acc, zero: acc.zero.concat(val) } : { ...acc, nonzero: acc.nonzero.concat(val) }, + { zero: [], nonzero: [] } + ); + channelClaims = split.zero.concat(split.nonzero); + const processingChannelClaims = channelClaims ? channelClaims.map((claim) => getClaimData(claim)) : []; const processedChannelClaims = await Promise.all(processingChannelClaims); diff --git a/server/utils/getClaimData.js b/server/utils/getClaimData.js index 0271f36b..ea5f080b 100644 --- a/server/utils/getClaimData.js +++ b/server/utils/getClaimData.js @@ -28,5 +28,6 @@ module.exports = async (data) => { thumbnail : data.generated_thumbnail || data.thumbnail_url || data.thumbnail, outpoint : data.transaction_hash_id || data.outpoint, host, + pending: Boolean(data.height === 0), }); }; From cdbd5eee804bdd5e282372ef8e6a52e88d2a1051 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Wed, 14 Nov 2018 19:51:25 -0800 Subject: [PATCH 09/11] add pending marker --- client/scss/_asset-preview.scss | 4 ++++ client/scss/_claim-pending.scss | 12 ++++++++++++ client/scss/all.scss | 1 + client/src/components/AssetPreview/index.jsx | 18 +++++++++++++++++- 4 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 client/scss/_claim-pending.scss diff --git a/client/scss/_asset-preview.scss b/client/scss/_asset-preview.scss index f420531d..a05c2a2c 100644 --- a/client/scss/_asset-preview.scss +++ b/client/scss/_asset-preview.scss @@ -1,3 +1,7 @@ +.asset-preview { + position: relative; +} + .asset-preview__image { width : 100%; padding: 0; diff --git a/client/scss/_claim-pending.scss b/client/scss/_claim-pending.scss new file mode 100644 index 00000000..906743ee --- /dev/null +++ b/client/scss/_claim-pending.scss @@ -0,0 +1,12 @@ +.claim-pending { + display: inline-block; + position: absolute; + top: 10px; + left: 10px; + padding: 5px; + border-radius: 5px; + border: 2px solid red; + color: red; + font-weight: bold; + background-color: white; +} diff --git a/client/scss/all.scss b/client/scss/all.scss index 07601eb5..8414492e 100644 --- a/client/scss/all.scss +++ b/client/scss/all.scss @@ -18,6 +18,7 @@ @import '~scss/_button'; @import '~scss/_button-primary'; @import '~scss/_button-secondary'; +@import '~scss/_claim-pending'; @import '~scss/_click-to-copy'; @import '~scss/_form-feedback'; @import '~scss/_horizontal-split'; diff --git a/client/src/components/AssetPreview/index.jsx b/client/src/components/AssetPreview/index.jsx index 13b17ef9..8c139f45 100644 --- a/client/src/components/AssetPreview/index.jsx +++ b/client/src/components/AssetPreview/index.jsx @@ -2,8 +2,14 @@ import React from 'react'; import { Link } from 'react-router-dom'; import createCanonicalLink from '../../../../utils/createCanonicalLink'; +const ClaimPending = () => { + return ( +
PENDING
+ ); +}; + const AssetPreview = ({ defaultThumbnail, claimData }) => { - const {name, fileExt, contentType, thumbnail, title} = claimData; + const {name, fileExt, contentType, thumbnail, title, pending} = claimData; const showUrl = createCanonicalLink({asset: {...claimData}}); const embedUrl = `${showUrl}.${fileExt}`; switch (contentType) { @@ -27,6 +33,7 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => { return (
+<<<<<<< HEAD
{

{title}

+======= + {pending && } + {name} +

{title}

+>>>>>>> add pending marker
); From d05cf1e71e69801947d10a1fba20ba3da56c5f72 Mon Sep 17 00:00:00 2001 From: Travis Eden Date: Wed, 14 Nov 2018 19:51:51 -0800 Subject: [PATCH 10/11] hide pending images on channel page --- client/src/components/AssetPreview/index.jsx | 3 +++ 1 file changed, 3 insertions(+) diff --git a/client/src/components/AssetPreview/index.jsx b/client/src/components/AssetPreview/index.jsx index 8c139f45..209b42b2 100644 --- a/client/src/components/AssetPreview/index.jsx +++ b/client/src/components/AssetPreview/index.jsx @@ -17,6 +17,9 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => { case 'image/jpg': case 'image/png': case 'image/gif': + if (pending) { + return null; + } return (
From d089554fe42ed5acab84b277d1ea5db61246b312 Mon Sep 17 00:00:00 2001 From: Shawn Date: Tue, 4 Dec 2018 12:22:26 -0600 Subject: [PATCH 11/11] Add unsaved resolved file conflicts --- client/src/components/AssetPreview/index.jsx | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/client/src/components/AssetPreview/index.jsx b/client/src/components/AssetPreview/index.jsx index 209b42b2..5599709e 100644 --- a/client/src/components/AssetPreview/index.jsx +++ b/client/src/components/AssetPreview/index.jsx @@ -17,9 +17,6 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => { case 'image/jpg': case 'image/png': case 'image/gif': - if (pending) { - return null; - } return (
@@ -36,7 +33,6 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => { return (
-<<<<<<< HEAD
{

{title}

-======= - {pending && } - {name} -

{title}

->>>>>>> add pending marker
);