Merge pull request #1071 from lbryio/redirect2

prevent server side redirect

LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2017-2019 LBRY Inc.
+Copyright (c) 2017-2020 LBRY Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the
 "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish,

client/src/app.js

@@ -16,7 +16,7 @@ import EditPage from '@pages/EditPage';
 const App = () => {
   return (
     <Switch>
-      <Route exact path='/' component={HomePage} />
+      <Route exact path='/' component={AboutPage} />
       <Route exact path='/about' component={AboutPage} />
       <Route exact path='/tos' component={TosPage} />
       <Route exact path='/faq' component={FaqPage} />

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 (
     <div>
       <Row>
         <p className={'text--large'}>
-          <Link className={'link--primary'} to='/tos'>Terms of Service</Link>
-          <br />
-          <Link className={'link--primary'} to='/faq'>Frequently Asked Questions</Link>
-        </p>
-      </Row>
-      <Row>
-        <p className={'text--large'}>
-          Spee.ch is a media-hosting site that reads from and publishes content to the <a className='link--primary' href='https://lbry.com'>LBRY</a> blockchain.
-        </p>
-        <p className={'text--large'}>
-          Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the <a className='link--primary' href='https://lbry.com/get'>LBRY</a> network.  This means that your images are stored in multiple locations without a single point of failure.
-        </p>
-      </Row>
-      <Row>
-        <h3>Contribute</h3>
-        <p className={'text--large'}>
-          If you have an idea for your own spee.ch-like site on top of LBRY, fork our <a className='link--primary' href='https://github.com/lbryio/spee.ch'>github repo</a> and go to town!
-        </p>
-        <p className={'text--large'}>
-          If you want to improve spee.ch, join our <a className='link--primary' href='https://chat.lbry.com'>discord channel</a> or solve one of our <a className='link--primary' href='https://github.com/lbryio/spee.ch/issues'>github issues</a>.
+          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 <a className='link--primary' href='https://lbry.tv' target='_blank'>lbry.tv</a> and can't wait to see you over there for a fully featured experience.
         </p>
       </Row>
     </div>

client/src/components/AboutSpeechOverview/index.jsx

@@ -5,14 +5,13 @@ const AboutSpeechOverview = () => {
   return (
     <div>
       <Row>
-        <p className={'text--extra-large'}>Spee.ch is an open-source project.  Please contribute to the existing site, or fork it and make your own.</p>
+        <p className={'text--extra-large'}>Lbry is no longer supporting Spee.ch. However, we're excited to show you <a className='link--primary' href='https://lbry.tv' target='_blank'>lbry.tv</a>!</p>
       </Row>
       <Row>
         <div className={'text--large'}>
-          <a className='link--primary' target='_blank' href='https://twitter.com/spee_ch'>TWITTER</a><br/>
-          <a className='link--primary' target='_blank' href='https://github.com/lbryio/spee.ch'>GITHUB</a><br/>
+          <a className='link--primary' target='_blank' href='https://twitter.com/lbry'>TWITTER</a><br/>
+          <a className='link--primary' target='_blank' href='https://github.com/lbryio/'>GITHUB</a><br/>
           <a className='link--primary' target='_blank' href='https://discord.gg/YjYbwhS'>DISCORD CHANNEL</a><br/>
-          <a className='link--primary' target='_blank' href='https://github.com/lbryio/spee.ch/blob/master/README.md'>DOCUMENTATION</a><br/>
         </div>
       </Row>
     </div>

client/src/containers/NavigationLinks/view.jsx

@@ -33,14 +33,14 @@ class NavigationLinks extends React.Component {
     const { channelName, showPublish, closedRegistration } = this.props;
     return (
       <div className='navigation-links'>
-        {showPublish && <NavLink
-          className='nav-bar-link link--nav'
-          activeClassName='link--nav-active'
-          to='/'
-          exact
-        >
-          Publish
-        </NavLink>}
+        {/*{showPublish && <NavLink*/}
+        {/*  className='nav-bar-link link--nav'*/}
+        {/*  activeClassName='link--nav-active'*/}
+        {/*  to='/'*/}
+        {/*  exact*/}
+        {/*>*/}
+        {/*  Publish*/}
+        {/*</NavLink>}*/}
         <NavLink
           className='nav-bar-link link--nav'
           activeClassName='link--nav-active'
@@ -48,24 +48,24 @@ class NavigationLinks extends React.Component {
         >
           About
         </NavLink>
-        { channelName ? (
-          <NavBarChannelOptionsDropdown
-            channelName={this.props.channelName}
-            handleSelection={this.handleSelection}
-            defaultSelection={this.props.channelName}
-            VIEW={VIEW}
-            LOGOUT={LOGOUT}
-          />
-        ) : !closedRegistration && (
-          <NavLink
-            id='nav-bar-login-link'
-            className='nav-bar-link link--nav'
-            activeClassName='link--nav-active'
-            to='/login'
-          >
-            Channel
-          </NavLink>
-        )}
+        {/*{ channelName ? (*/}
+        {/*  <NavBarChannelOptionsDropdown*/}
+        {/*    channelName={this.props.channelName}*/}
+        {/*    handleSelection={this.handleSelection}*/}
+        {/*    defaultSelection={this.props.channelName}*/}
+        {/*    VIEW={VIEW}*/}
+        {/*    LOGOUT={LOGOUT}*/}
+        {/*  />*/}
+        {/*) : !closedRegistration && (*/}
+        {/*  <NavLink*/}
+        {/*    id='nav-bar-login-link'*/}
+        {/*    className='nav-bar-link link--nav'*/}
+        {/*    activeClassName='link--nav-active'*/}
+        {/*    to='/login'*/}
+        {/*  >*/}
+        {/*    Channel*/}
+        {/*  </NavLink>*/}
+        {/*)}*/}
       </div>
     );
   }

client/src/containers/PublishDisabledMessage/view.jsx

@@ -7,6 +7,9 @@ class PublishDisabledMessage extends React.Component {
       <div className={'publish-disabled-message'}>
         <div className={'message'}>
           <p className={'text--secondary'}>Publishing is currently disabled.</p>
+          <p className={'text--secondary'}>
+            Try <a className='link--primary' href='https://lbry.tv' target='_blank'>lbry.tv</a>
+          </p>
           <p className={'text--secondary'}>{message}</p>
         </div>
       </div>

client/src/pages/ContentPageWrapper/view.jsx

@@ -3,7 +3,7 @@ import ErrorPage from '@pages/ErrorPage';
 import ShowAssetLite from '@pages/ShowAssetLite';
 import ShowAssetDetails from '@pages/ShowAssetDetails';
 import ShowChannel from '@pages/ShowChannel';
-import { withRouter } from 'react-router-dom';
+import { withRouter, Redirect } from 'react-router-dom';
 
 import {
   CHANNEL,
@@ -15,15 +15,24 @@ import {
 class ContentPageWrapper extends React.Component {
   componentDidMount () {
     const { onHandleShowPageUri, match, homeChannel } = this.props;
-    onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
+    //onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
   }
   componentWillReceiveProps (nextProps) {
     if (nextProps.match.params !== this.props.match.params) {
-      this.props.onHandleShowPageUri(nextProps.match.params);
+      //this.props.onHandleShowPageUri(nextProps.match.params);
     }
   }
   render () {
-    const { error, requestType } = this.props;
+    const { error, requestType, match } = this.props;
+    const { params } = match;
+    const { claim, identifier } = params;
+    if (identifier && claim) {
+      return <Redirect to={`https://lbry.tv/${identifier}/${claim}`} />;
+    } else if (identifier) {
+      // return <Redirect to={`https://lbry.tv/${identifier}/`} />
+    } else {
+      return <Redirect to={`https://lbry.tv/${claim}`} />;
+    }
     if (error) {
       return (
         <ErrorPage error={error} />
@@ -31,13 +40,13 @@ class ContentPageWrapper extends React.Component {
     }
     switch (requestType) {
       case CHANNEL:
-        return <ShowChannel />;
+        // return <ShowChannel />;
       case ASSET_LITE:
-        return <ShowAssetLite />;
+        // return <ShowAssetLite />;
       case ASSET_DETAILS:
-        return <ShowAssetDetails />;
+        // return <ShowAssetDetails />;
       case SPECIAL_ASSET:
-        return <ShowChannel />;
+        // return <ShowChannel />;
       default:
         return <p>loading...</p>;
     }

server/chainquery/queries/claimQueries.js

@@ -82,6 +82,7 @@ export default (db, table, sequelize) => ({
     };
     const selectWhere = {
       ...whereClause,
+      claim_type: 1,
       publisher_id: channelClaimId,
     };
     return await table
@@ -103,6 +104,7 @@ export default (db, table, sequelize) => ({
       .findAll({
         where: {
           name: claimName,
+          claim_type: 1,
           publisher_id: channelClaimId,
           bid_state: { [sequelize.Op.or]: ['Controlling', 'Active', 'Accepted'] },
         },
@@ -214,6 +216,7 @@ export default (db, table, sequelize) => ({
       .findAll({
         where: {
           name: claimName,
+          claim_type: 1,
           publisher_id: channelId,
         },
       })

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({

server/routes/index.js

@@ -2,6 +2,6 @@ module.exports = {
   ...require('./pages').default,
   ...require('./api').default,
   ...require('./auth').default,
-  ...require('./assets').default,
+  // ...require('./assets').default,
   ...require('./fallback').default,
 };