From 5ed72b0e14f5b8ecc4f9b8c4a252f7888bd47564 Mon Sep 17 00:00:00 2001 From: jessop Date: Wed, 22 Apr 2020 20:24:23 -0400 Subject: [PATCH] update messaging, disable publish and channels --- client/src/app.js | 2 +- .../components/AboutSpeechDetails/index.jsx | 23 +------- .../components/AboutSpeechOverview/index.jsx | 7 ++- .../src/containers/NavigationLinks/view.jsx | 52 +++++++++---------- .../PublishDisabledMessage/view.jsx | 3 ++ .../assets/utils/getClaimIdAndServeAsset.js | 23 ++++---- 6 files changed, 47 insertions(+), 63 deletions(-) diff --git a/client/src/app.js b/client/src/app.js index c40691d6..86c8361c 100644 --- a/client/src/app.js +++ b/client/src/app.js @@ -16,7 +16,7 @@ import EditPage from '@pages/EditPage'; const App = () => { return ( - + diff --git a/client/src/components/AboutSpeechDetails/index.jsx b/client/src/components/AboutSpeechDetails/index.jsx index a49d7bb0..f045b4f5 100644 --- a/client/src/components/AboutSpeechDetails/index.jsx +++ b/client/src/components/AboutSpeechDetails/index.jsx @@ -1,32 +1,13 @@ import React from 'react'; import Row from '@components/Row'; -import {Link} from 'react-router-dom'; const AboutSpeechDetails = () => { return (

- Terms of Service -
- Frequently Asked Questions -

- - -

- Spee.ch is a media-hosting site that reads from and publishes content to the LBRY blockchain. -

-

- Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the LBRY network. This means that your images are stored in multiple locations without a single point of failure. -

- - -

Contribute

-

- If you have an idea for your own spee.ch-like site on top of LBRY, fork our github repo and go to town! -

-

- If you want to improve spee.ch, join our discord channel or solve one of our github issues. + Spee.ch's journey may be on hold, but LBRY is still on mission. We'd like to thank all of our testers and early adopters for helping us explore this use case. + We're really excited about lbry.tv and can't wait to see you over there for a fully featured experience.

diff --git a/client/src/components/AboutSpeechOverview/index.jsx b/client/src/components/AboutSpeechOverview/index.jsx index ef53812f..c50c7f6b 100644 --- a/client/src/components/AboutSpeechOverview/index.jsx +++ b/client/src/components/AboutSpeechOverview/index.jsx @@ -5,14 +5,13 @@ const AboutSpeechOverview = () => { return (
-

Spee.ch is an open-source project. Please contribute to the existing site, or fork it and make your own.

+

Lbry is no longer supporting Spee.ch. However, we're excited to show you lbry.tv!
diff --git a/client/src/containers/NavigationLinks/view.jsx b/client/src/containers/NavigationLinks/view.jsx index 7a9268d5..c868fc0a 100644 --- a/client/src/containers/NavigationLinks/view.jsx +++ b/client/src/containers/NavigationLinks/view.jsx @@ -33,14 +33,14 @@ class NavigationLinks extends React.Component { const { channelName, showPublish, closedRegistration } = this.props; return (
- {showPublish && - Publish - } + {/*{showPublish && */} + {/* Publish*/} + {/*}*/} About - { channelName ? ( - - ) : !closedRegistration && ( - - Channel - - )} + {/*{ channelName ? (*/} + {/* */} + {/*) : !closedRegistration && (*/} + {/* */} + {/* Channel*/} + {/* */} + {/*)}*/}
); } diff --git a/client/src/containers/PublishDisabledMessage/view.jsx b/client/src/containers/PublishDisabledMessage/view.jsx index 355ce75d..6a00f7e2 100644 --- a/client/src/containers/PublishDisabledMessage/view.jsx +++ b/client/src/containers/PublishDisabledMessage/view.jsx @@ -7,6 +7,9 @@ class PublishDisabledMessage extends React.Component {

Publishing is currently disabled.

+

+ Try lbry.tv +

{message}

diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js index 60df4e74..c976e582 100644 --- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js +++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js @@ -64,18 +64,19 @@ const getClaimIdAndServeAsset = ( claimDataValues.outpoint || `${claimDataValues.transaction_hash_id}:${claimDataValues.vout}`; logger.debug('Outpoint:', outpoint); - return db.Blocked.isNotBlocked(outpoint).then(() => { + return db.Blocked.isNotBlocked(outpoint) + // .then(() => { // If content was found, is approved, and not blocked - log a view. - if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) { - db.Views.create({ - time: Date.now(), - isChannel: false, - claimId: claimDataValues.claim_id || claimDataValues.claimId, - publisherId: claimDataValues.publisher_id || claimDataValues.certificateId, - ip, - }); - } - }); + // if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) { + // db.Views.create({ + // time: Date.now(), + // isChannel: false, + // claimId: claimDataValues.claim_id || claimDataValues.claimId, + // publisherId: claimDataValues.publisher_id || claimDataValues.certificateId, + // ip, + // }); + // } + // }); }) .then(() => { return db.File.findOne({