From 051dcb8454b4e0d5236e6189c1b61cf30010e0c3 Mon Sep 17 00:00:00 2001
From: Sean Yesmunt <sean@lbry.io>
Date: Mon, 10 Sep 2018 15:54:48 -0400
Subject: [PATCH 01/26] allow form submit with enter key

---
 client/src/components/ButtonPrimary/index.jsx    | 3 ++-
 client/src/containers/ChannelCreateForm/view.jsx | 5 +++--
 client/src/containers/ChannelLoginForm/view.jsx  | 5 +++--
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/client/src/components/ButtonPrimary/index.jsx b/client/src/components/ButtonPrimary/index.jsx
index 1011f902..6b8230d3 100644
--- a/client/src/components/ButtonPrimary/index.jsx
+++ b/client/src/components/ButtonPrimary/index.jsx
@@ -1,8 +1,9 @@
 import React from 'react';
 
-const ButtonPrimary  = ({ value, onClickHandler }) => {
+const ButtonPrimary  = ({ value, onClickHandler, type = 'button' }) => {
   return (
     <button
+      type={type}
       className={'button button-primary'}
       onClick={onClickHandler}
     >
diff --git a/client/src/containers/ChannelCreateForm/view.jsx b/client/src/containers/ChannelCreateForm/view.jsx
index 6f36ef11..bda30e12 100644
--- a/client/src/containers/ChannelCreateForm/view.jsx
+++ b/client/src/containers/ChannelCreateForm/view.jsx
@@ -59,7 +59,7 @@ class ChannelCreateForm extends React.Component {
     return (
       <div>
         { !status ? (
-          <div>
+          <form onSubmit={this.handleSubmit}>
             <ChannelCreateNameInput
               value={name.value}
               error={name.error}
@@ -74,10 +74,11 @@ class ChannelCreateForm extends React.Component {
               defaultMessage={'Choose a name and password for your channel'}
             />
             <ButtonPrimary
+              type={'submit'}
               value={'Create Channel'}
               onClickHandler={this.handleSubmit}
             />
-          </div>
+        </form>
         ) : (
           <div>
             <p className={'text--small text--secondary'}>{status}</p>
diff --git a/client/src/containers/ChannelLoginForm/view.jsx b/client/src/containers/ChannelLoginForm/view.jsx
index eb5389a1..54dd8ad2 100644
--- a/client/src/containers/ChannelLoginForm/view.jsx
+++ b/client/src/containers/ChannelLoginForm/view.jsx
@@ -49,7 +49,7 @@ class ChannelLoginForm extends React.Component {
   }
   render () {
     return (
-      <div>
+      <form onSubmit={this.loginToChannel}>
         <ChannelLoginNameInput
           channelName={this.state.channelName}
           handleInput={this.handleInput}
@@ -63,10 +63,11 @@ class ChannelLoginForm extends React.Component {
           defaultMessage={'Enter the name and password for your channel'}
         />
         <ButtonPrimary
+          type={'submit'}
           value={'Authenticate'}
           onClickHandler={this.loginToChannel}
         />
-      </div>
+    </form>
     );
   }
 }

From 3ca7f62414c244045667fd372bae07ade965e9ab Mon Sep 17 00:00:00 2001
From: Alex Grintsvayg <git@grin.io>
Date: Wed, 12 Sep 2018 17:08:37 -0400
Subject: [PATCH 02/26] fixed embed view path. fixes #597

---
 server/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/server/index.js b/server/index.js
index 85222a71..bd0cf4eb 100644
--- a/server/index.js
+++ b/server/index.js
@@ -66,7 +66,7 @@ function Server () {
     app.use(speechPassport.session());
 
     // configure handlebars & register it with express app
-    const viewsPath = Path.resolve(process.cwd(), 'node_modules/spee.ch/server/views');
+    const viewsPath = Path.resolve(process.cwd(), 'server/views');
     app.engine('handlebars', expressHandlebars({
       async        : false,
       dataType     : 'text',

From 1358215e6fa7249c2c830a54fa7337973f410b1c Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 17 Sep 2018 09:01:46 -0400
Subject: [PATCH 03/26] reject requests for content from unapproved channels
 when serveApprovedOnly

---
 server/controllers/api/channel/data/index.js  |  7 +++++
 .../assets/utils/getClaimIdAndServeAsset.js   | 26 ++++++++++++++++---
 server/models/claim.js                        |  5 ++++
 3 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/server/controllers/api/channel/data/index.js b/server/controllers/api/channel/data/index.js
index 610f1cb5..c9ceebf4 100644
--- a/server/controllers/api/channel/data/index.js
+++ b/server/controllers/api/channel/data/index.js
@@ -1,6 +1,7 @@
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 
 const getChannelData = require('./getChannelData.js');
+const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const NO_CHANNEL = 'NO_CHANNEL';
 
@@ -14,6 +15,12 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
   const channelName = params.channelName;
   let channelClaimId = params.channelClaimId;
   if (channelClaimId === 'none') channelClaimId = null;
+  if (serveOnlyApproved && approvedChannels && !approvedChannels.includes(channelClaimId)) {
+    return res.status(404).json({
+      success: false,
+      message: 'This spee.ch instance serves limited content which does not include this asset',
+    });
+  }
   getChannelData(channelName, channelClaimId)
     .then(data => {
       res.status(200).json({
diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
index 00bf9532..66486ba8 100644
--- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js
+++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
@@ -11,17 +11,28 @@ const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';
 const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
 const NO_FILE = 'NO_FILE';
+const UNAPPROVED_CHANNEL = 'UNAPPROVED_CHANNEL';
+
+const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId, originalUrl, ip, res) => {
   getClaimId(channelName, channelClaimId, claimName, claimId)
     .then(fullClaimId => {
       claimId = fullClaimId;
       logger.debug('Full claim id:', fullClaimId);
-      return db.Claim.getOutpoint(claimName, fullClaimId);
+      return db.Claim.findOne({
+        where: {
+          name   : claimName,
+          claimId: fullClaimId,
+        },
+      });
     })
-    .then(outpoint => {
-      logger.debug('Outpoint:', outpoint);
-      return db.Blocked.isNotBlocked(outpoint);
+    .then(claim => {
+      if (serveOnlyApproved && !approvedChannels.includes(claim.dataValues.certificateId)) {
+        throw new Error(UNAPPROVED_CHANNEL);
+      }
+      logger.debug('Outpoint:', claim.dataValues.outpoint);
+      return db.Blocked.isNotBlocked(claim.dataValues.outpoint);
     })
     .then(() => {
       return db.File.findOne({
@@ -52,6 +63,13 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
           message: 'No matching channel id could be found for that url',
         });
       }
+      if (error === UNAPPROVED_CHANNEL) {
+        logger.debug('unapproved channel');
+        return res.status(400).json({
+          success: false,
+          message: 'This spee.ch instance serves limited content which does not include this asset',
+        });
+      }
       if (error === BLOCKED_CLAIM) {
         logger.debug('claim was blocked');
         return res.status(451).json({
diff --git a/server/models/claim.js b/server/models/claim.js
index 6c1f4092..55010987 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -1,8 +1,10 @@
 const logger = require('winston');
 const returnShortId = require('./utils/returnShortId.js');
 const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('@config/siteConfig');
+const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const NO_CLAIM = 'NO_CLAIM';
+const NOT_ALLOWED = 'NOT_ALLOWED';
 
 function determineFileExtensionFromContentType (contentType) {
   switch (contentType) {
@@ -362,6 +364,9 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
           where: { name, claimId },
         })
         .then(claimArray => {
+          if (serveOnlyApproved && !approvedChannels.includes(claimArray[0].dataValues.certificateId)) {
+            reject(NOT_ALLOWED);
+          }
           switch (claimArray.length) {
             case 0:
               return resolve(null);

From 815149a2cd06574fccb4278dc7b8e1394cc71f53 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Wed, 19 Sep 2018 13:27:55 -0400
Subject: [PATCH 04/26] reject publishes for unapproved channels when
 publishOnlyApproved

---
 server/controllers/api/claim/publish/index.js | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index d636de8d..4f551053 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -3,6 +3,7 @@ const logger = require('winston');
 const { details: { host }, publishing: { disabled, disabledMessage } } = require('@config/siteConfig');
 
 const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
+const { publishing: { publishOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 
@@ -16,6 +17,7 @@ const parsePublishApiRequestFiles = require('./parsePublishApiRequestFiles.js');
 const authenticateUser = require('./authentication.js');
 
 const CLAIM_TAKEN = 'CLAIM_TAKEN';
+const UNAPPROVED_CHANNEL = 'UNAPPROVED_CHANNEL';
 
 /*
 
@@ -54,6 +56,13 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
   // check channel authorization
   authenticateUser(channelName, channelId, channelPassword, user)
     .then(({ channelName, channelClaimId }) => {
+      if (publishOnlyApproved && approvedChannels && !approvedChannels.includes(channelClaimId)) {
+        const error = {
+          name   : UNAPPROVED_CHANNEL,
+          message: 'This spee.ch instance only allows publishing to approved channels',
+        };
+        throw error;
+      }
       return Promise.all([
         checkClaimAvailability(name),
         createPublishParams(filePath, name, title, description, license, nsfw, thumbnail, channelName, channelClaimId),
@@ -98,6 +107,12 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
           message: error.message,
         });
       }
+      if (error.name === UNAPPROVED_CHANNEL) {
+        res.status(400).json({
+          success: false,
+          message: error.message,
+        });
+      }
       handleErrorResponse(originalUrl, ip, error, res);
     });
 };

From 845a0a3b0131d638603a3e07fda60fe03be534be Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Wed, 19 Sep 2018 15:14:20 -0400
Subject: [PATCH 05/26] disable signup when closedRegistration

---
 server/speechPassport/utils/local-signup.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/server/speechPassport/utils/local-signup.js b/server/speechPassport/utils/local-signup.js
index 1a2067e8..2662b721 100644
--- a/server/speechPassport/utils/local-signup.js
+++ b/server/speechPassport/utils/local-signup.js
@@ -2,6 +2,7 @@ const PassportLocalStrategy = require('passport-local').Strategy;
 const { createChannel } = require('../../lbrynet');
 const logger = require('winston');
 const db = require('../../models');
+const { publishing: { closedRegistration } } = require('@config/siteConfig');
 
 module.exports = new PassportLocalStrategy(
   {
@@ -9,10 +10,13 @@ module.exports = new PassportLocalStrategy(
     passwordField: 'password',
   },
   (username, password, done) => {
+    if (closedRegistration) {
+      return done('Registration is disabled');
+    }
+
     logger.verbose(`new channel signup request. user: ${username} pass: ${password} .`);
     let userInfo = {};
     // server-side validaton of inputs (username, password)
-
     // create the channel and retrieve the metadata
     return createChannel(`@${username}`)
       .then(tx => {

From 3c21ce36b7dac2b3248085f07557cb1fc8e9cf96 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Wed, 19 Sep 2018 16:35:10 -0400
Subject: [PATCH 06/26] hide unusable components based on site settings

---
 client/src/components/ChannelTools/index.jsx  | 21 --------------
 client/src/containers/ChannelTools/index.js   | 10 +++++++
 client/src/containers/ChannelTools/view.jsx   | 23 +++++++++++++++
 .../src/containers/NavigationLinks/index.jsx  |  3 +-
 .../src/containers/NavigationLinks/view.jsx   |  9 +++---
 client/src/pages/LoginPage/view.jsx           |  2 +-
 client/src/reducers/site.js                   | 29 ++++++++++++++-----
 7 files changed, 63 insertions(+), 34 deletions(-)
 delete mode 100644 client/src/components/ChannelTools/index.jsx
 create mode 100644 client/src/containers/ChannelTools/index.js
 create mode 100644 client/src/containers/ChannelTools/view.jsx

diff --git a/client/src/components/ChannelTools/index.jsx b/client/src/components/ChannelTools/index.jsx
deleted file mode 100644
index 5e640dd9..00000000
--- a/client/src/components/ChannelTools/index.jsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import ChannelLoginForm from '@containers/ChannelLoginForm';
-import ChannelCreateForm from '@containers/ChannelCreateForm';
-import Row from '@components/Row';
-
-const ChannelTools = () => {
-  return (
-    <div>
-      <Row>
-        <h3>Log in to an existing channel:</h3>
-        <ChannelLoginForm />
-      </Row>
-      <Row>
-        <h3>Create a brand new channel:</h3>
-        <ChannelCreateForm />
-      </Row>
-    </div>
-  );
-};
-
-export default ChannelTools;
diff --git a/client/src/containers/ChannelTools/index.js b/client/src/containers/ChannelTools/index.js
new file mode 100644
index 00000000..25b68fbc
--- /dev/null
+++ b/client/src/containers/ChannelTools/index.js
@@ -0,0 +1,10 @@
+import { connect } from 'react-redux';
+import View from './view';
+
+const mapStateToProps = ({ site: { closedRegistration } }) => {
+  return {
+    closedRegistration,
+  };
+};
+
+export default connect(mapStateToProps, null)(View);
diff --git a/client/src/containers/ChannelTools/view.jsx b/client/src/containers/ChannelTools/view.jsx
new file mode 100644
index 00000000..0be7bef0
--- /dev/null
+++ b/client/src/containers/ChannelTools/view.jsx
@@ -0,0 +1,23 @@
+import React from 'react';
+import ChannelLoginForm from '@containers/ChannelLoginForm';
+import ChannelCreateForm from '@containers/ChannelCreateForm';
+import Row from '@components/Row';
+
+class ChannelTools extends React.Component {
+  render () {
+    return (
+      <div>
+        <Row>
+          <h3>Log in to an existing channel:</h3>
+          <ChannelLoginForm />
+        </Row>
+        {!this.props.closedRegistration && (<Row>
+          <h3>Create a brand new channel:</h3>
+          <ChannelCreateForm />
+        </Row>)}
+      </div>
+    );
+  }
+}
+
+export default ChannelTools;
diff --git a/client/src/containers/NavigationLinks/index.jsx b/client/src/containers/NavigationLinks/index.jsx
index 264bb027..7ef8ff85 100644
--- a/client/src/containers/NavigationLinks/index.jsx
+++ b/client/src/containers/NavigationLinks/index.jsx
@@ -2,8 +2,9 @@ import { connect } from 'react-redux';
 import { logOutChannel, checkForLoggedInChannel } from '../../actions/channel';
 import View from './view';
 
-const mapStateToProps = ({ channel: { loggedInChannel: { name, shortId, longId } } }) => {
+const mapStateToProps = ({ site, channel: { loggedInChannel: { name, shortId, longId } } }) => {
   return {
+    site,
     channelName   : name,
     channelShortId: shortId,
     channelLongId : longId,
diff --git a/client/src/containers/NavigationLinks/view.jsx b/client/src/containers/NavigationLinks/view.jsx
index 929006d1..3876702e 100644
--- a/client/src/containers/NavigationLinks/view.jsx
+++ b/client/src/containers/NavigationLinks/view.jsx
@@ -28,16 +28,17 @@ class NavigationLinks extends React.Component {
     }
   }
   render () {
+    const { site, channelLongId, channelName } = this.props;
     return (
       <div className='navigation-links'>
-        <NavLink
+        {(!site.publishOnlyApproved || site.approvedChannels.includes(channelLongId)) && <NavLink
           className='nav-bar-link link--nav'
           activeClassName='link--nav-active'
           to='/'
           exact
         >
           Publish
-        </NavLink>
+        </NavLink>}
         <NavLink
           className='nav-bar-link link--nav'
           activeClassName='link--nav-active'
@@ -45,7 +46,7 @@ class NavigationLinks extends React.Component {
         >
           About
         </NavLink>
-        { this.props.channelName ? (
+        { channelName ? (
           <NavBarChannelOptionsDropdown
             channelName={this.props.channelName}
             handleSelection={this.handleSelection}
@@ -53,7 +54,7 @@ class NavigationLinks extends React.Component {
             VIEW={VIEW}
             LOGOUT={LOGOUT}
           />
-        ) : (
+        ) : !site.closedRegistration && (
           <NavLink
             id='nav-bar-login-link'
             className='nav-bar-link link--nav'
diff --git a/client/src/pages/LoginPage/view.jsx b/client/src/pages/LoginPage/view.jsx
index f102ec92..a3804e59 100644
--- a/client/src/pages/LoginPage/view.jsx
+++ b/client/src/pages/LoginPage/view.jsx
@@ -4,7 +4,7 @@ import PageLayout from '@components/PageLayout';
 import HorizontalSplit from '@components/HorizontalSplit';
 
 import ChannelAbout from '@components/ChannelAbout';
-import ChannelTools from '@components/ChannelTools';
+import ChannelTools from '@containers/ChannelTools';
 
 class LoginPage extends React.Component {
   componentWillReceiveProps (newProps) {
diff --git a/client/src/reducers/site.js b/client/src/reducers/site.js
index 6b0b3e61..f62a3f0c 100644
--- a/client/src/reducers/site.js
+++ b/client/src/reducers/site.js
@@ -1,13 +1,18 @@
 import siteConfig from '@config/siteConfig.json';
 
 let initialState = {
-  description       : 'default description',
-  googleAnalyticsId : 'default google id',
-  host              : 'default host',
-  title             : 'default title',
-  twitter           : 'default twitter',
-  defaultDescription: 'default description',
-  defaultThumbnail  : 'default thumbnail',
+  description        : 'default description',
+  googleAnalyticsId  : 'default google id',
+  host               : 'default host',
+  title              : 'default title',
+  twitter            : 'default twitter',
+  defaultDescription : 'default description',
+  defaultThumbnail   : 'default thumbnail',
+  closedRegistration : false,
+  serveOnlyApproved  : false,
+  publishOnlyApproved: false,
+  approvedChannels   : [],
+
 };
 
 if (siteConfig) {
@@ -25,6 +30,12 @@ if (siteConfig) {
       title,
       twitter,
     },
+    publishing: {
+      closedRegistration,
+      serveOnlyApproved,
+      publishOnlyApproved,
+      approvedChannels,
+    },
   } = siteConfig;
 
   initialState = {
@@ -35,6 +46,10 @@ if (siteConfig) {
     twitter,
     defaultDescription,
     defaultThumbnail,
+    closedRegistration,
+    serveOnlyApproved,
+    publishOnlyApproved,
+    approvedChannels,
   };
 }
 

From 0a74e5016753237ed02f1ca69c98046f877ebe9e Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Thu, 20 Sep 2018 13:34:53 -0400
Subject: [PATCH 07/26] refactor channel checks with isApprovedChannel

---
 client/src/containers/NavigationLinks/view.jsx       |  3 ++-
 client/src/utils/isApprovedChannel.js                |  9 +++++++++
 server/controllers/api/channel/data/index.js         | 12 ++++++++----
 server/controllers/api/claim/publish/index.js        |  5 +++--
 .../assets/utils/getClaimIdAndServeAsset.js          |  5 +++--
 server/models/claim.js                               |  5 +++--
 server/utils/isApprovedChannel.js                    | 11 +++++++++++
 7 files changed, 39 insertions(+), 11 deletions(-)
 create mode 100644 client/src/utils/isApprovedChannel.js
 create mode 100644 server/utils/isApprovedChannel.js

diff --git a/client/src/containers/NavigationLinks/view.jsx b/client/src/containers/NavigationLinks/view.jsx
index 3876702e..2f8ce8ca 100644
--- a/client/src/containers/NavigationLinks/view.jsx
+++ b/client/src/containers/NavigationLinks/view.jsx
@@ -1,6 +1,7 @@
 import React from 'react';
 import { NavLink, withRouter } from 'react-router-dom';
 import NavBarChannelOptionsDropdown from '@components/NavBarChannelOptionsDropdown';
+import isApprovedChannel from '../../utils/isApprovedChannel';
 
 const VIEW = 'VIEW';
 const LOGOUT = 'LOGOUT';
@@ -31,7 +32,7 @@ class NavigationLinks extends React.Component {
     const { site, channelLongId, channelName } = this.props;
     return (
       <div className='navigation-links'>
-        {(!site.publishOnlyApproved || site.approvedChannels.includes(channelLongId)) && <NavLink
+        {(!site.publishOnlyApproved || isApprovedChannel({ longId: channelLongId }, site.approvedChannels)) && <NavLink
           className='nav-bar-link link--nav'
           activeClassName='link--nav-active'
           to='/'
diff --git a/client/src/utils/isApprovedChannel.js b/client/src/utils/isApprovedChannel.js
new file mode 100644
index 00000000..aaf8dcf8
--- /dev/null
+++ b/client/src/utils/isApprovedChannel.js
@@ -0,0 +1,9 @@
+function isApprovedChannel (channel, channels) {
+  const { name, shortId: short, longId: long } = channel;
+  return Boolean(
+    (long && channels.find(chan => chan.longId === long)) ||
+    (name && short && channels.find(chan => chan.name === name && chan.shortId === short))
+  );
+}
+
+module.exports = isApprovedChannel;
diff --git a/server/controllers/api/channel/data/index.js b/server/controllers/api/channel/data/index.js
index c9ceebf4..440326b5 100644
--- a/server/controllers/api/channel/data/index.js
+++ b/server/controllers/api/channel/data/index.js
@@ -1,8 +1,7 @@
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
-
 const getChannelData = require('./getChannelData.js');
-const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
-
+const isApprovedChannel = require('../../../../utils/isApprovedChannel');
+const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
 const NO_CHANNEL = 'NO_CHANNEL';
 
 /*
@@ -15,12 +14,17 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
   const channelName = params.channelName;
   let channelClaimId = params.channelClaimId;
   if (channelClaimId === 'none') channelClaimId = null;
-  if (serveOnlyApproved && approvedChannels && !approvedChannels.includes(channelClaimId)) {
+
+  const chanObj = {};
+  if (channelName) chanObj.name = channelName;
+  if (channelClaimId) chanObj[(channelClaimId.length === 40 ? 'longId' : 'shortId')] = channelClaimId;
+  if (serveOnlyApproved && !isApprovedChannel(chanObj)) {
     return res.status(404).json({
       success: false,
       message: 'This spee.ch instance serves limited content which does not include this asset',
     });
   }
+
   getChannelData(channelName, channelClaimId)
     .then(data => {
       res.status(200).json({
diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index 4f551053..c5a2bdbb 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -3,7 +3,8 @@ const logger = require('winston');
 const { details: { host }, publishing: { disabled, disabledMessage } } = require('@config/siteConfig');
 
 const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
-const { publishing: { publishOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+const isApprovedChannel = require('../../../../utils/isApprovedChannel');
+const { publishing: { publishOnlyApproved } } = require('@config/siteConfig');
 
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 
@@ -56,7 +57,7 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
   // check channel authorization
   authenticateUser(channelName, channelId, channelPassword, user)
     .then(({ channelName, channelClaimId }) => {
-      if (publishOnlyApproved && approvedChannels && !approvedChannels.includes(channelClaimId)) {
+      if (publishOnlyApproved && !isApprovedChannel({ longId: channelClaimId })) {
         const error = {
           name   : UNAPPROVED_CHANNEL,
           message: 'This spee.ch instance only allows publishing to approved channels',
diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
index 66486ba8..af81162c 100644
--- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js
+++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
@@ -1,6 +1,7 @@
 const logger = require('winston');
 
 const db = require('../../../models');
+const isApprovedChannel = require('../../../utils/isApprovedChannel');
 
 const getClaimId = require('../../utils/getClaimId.js');
 const { handleErrorResponse } = require('../../utils/errorHandlers.js');
@@ -13,7 +14,7 @@ const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
 const NO_FILE = 'NO_FILE';
 const UNAPPROVED_CHANNEL = 'UNAPPROVED_CHANNEL';
 
-const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
 
 const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId, originalUrl, ip, res) => {
   getClaimId(channelName, channelClaimId, claimName, claimId)
@@ -28,7 +29,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
       });
     })
     .then(claim => {
-      if (serveOnlyApproved && !approvedChannels.includes(claim.dataValues.certificateId)) {
+      if (serveOnlyApproved && !isApprovedChannel({ longId: claim.dataValues.certificateId })) {
         throw new Error(UNAPPROVED_CHANNEL);
       }
       logger.debug('Outpoint:', claim.dataValues.outpoint);
diff --git a/server/models/claim.js b/server/models/claim.js
index 55010987..6917d189 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -1,7 +1,8 @@
 const logger = require('winston');
 const returnShortId = require('./utils/returnShortId.js');
 const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('@config/siteConfig');
-const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
+const isApprovedChannel = require('../utils/isApprovedChannel');
 
 const NO_CLAIM = 'NO_CLAIM';
 const NOT_ALLOWED = 'NOT_ALLOWED';
@@ -364,7 +365,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
           where: { name, claimId },
         })
         .then(claimArray => {
-          if (serveOnlyApproved && !approvedChannels.includes(claimArray[0].dataValues.certificateId)) {
+          if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId })) {
             reject(NOT_ALLOWED);
           }
           switch (claimArray.length) {
diff --git a/server/utils/isApprovedChannel.js b/server/utils/isApprovedChannel.js
new file mode 100644
index 00000000..e1b451e2
--- /dev/null
+++ b/server/utils/isApprovedChannel.js
@@ -0,0 +1,11 @@
+const { publishing: { approvedChannels } } = require('@config/siteConfig');
+
+function isApprovedChannel (channel, channels = approvedChannels) {
+  const { name, shortId: short, longId: long } = channel;
+  return Boolean(
+    (long && channels.find(chan => chan.longId === long)) ||
+    (name && short && channels.find(chan => chan.name === name && chan.shortId === short))
+  );
+}
+
+module.exports = isApprovedChannel;

From 208c56366fbd17fef6758807d03806823c57ac55 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Thu, 20 Sep 2018 14:09:01 -0400
Subject: [PATCH 08/26] refactor error messages for unavailable content

---
 server/controllers/api/channel/data/index.js              | 2 +-
 .../controllers/assets/utils/getClaimIdAndServeAsset.js   | 8 ++++----
 server/models/claim.js                                    | 5 ++---
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/server/controllers/api/channel/data/index.js b/server/controllers/api/channel/data/index.js
index 440326b5..b9513edc 100644
--- a/server/controllers/api/channel/data/index.js
+++ b/server/controllers/api/channel/data/index.js
@@ -21,7 +21,7 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
   if (serveOnlyApproved && !isApprovedChannel(chanObj)) {
     return res.status(404).json({
       success: false,
-      message: 'This spee.ch instance serves limited content which does not include this asset',
+      message: 'This content is unavailable',
     });
   }
 
diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
index af81162c..031bfc67 100644
--- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js
+++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
@@ -12,7 +12,7 @@ const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';
 const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
 const NO_FILE = 'NO_FILE';
-const UNAPPROVED_CHANNEL = 'UNAPPROVED_CHANNEL';
+const CONTENT_UNAVAILABLE = 'CONTENT_UNAVAILABLE';
 
 const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
 
@@ -30,7 +30,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
     })
     .then(claim => {
       if (serveOnlyApproved && !isApprovedChannel({ longId: claim.dataValues.certificateId })) {
-        throw new Error(UNAPPROVED_CHANNEL);
+        throw new Error(CONTENT_UNAVAILABLE);
       }
       logger.debug('Outpoint:', claim.dataValues.outpoint);
       return db.Blocked.isNotBlocked(claim.dataValues.outpoint);
@@ -64,11 +64,11 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
           message: 'No matching channel id could be found for that url',
         });
       }
-      if (error === UNAPPROVED_CHANNEL) {
+      if (error === CONTENT_UNAVAILABLE) {
         logger.debug('unapproved channel');
         return res.status(400).json({
           success: false,
-          message: 'This spee.ch instance serves limited content which does not include this asset',
+          message: 'This content is unavailable',
         });
       }
       if (error === BLOCKED_CLAIM) {
diff --git a/server/models/claim.js b/server/models/claim.js
index 6917d189..8987b7a1 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -1,11 +1,10 @@
 const logger = require('winston');
 const returnShortId = require('./utils/returnShortId.js');
+const isApprovedChannel = require('../utils/isApprovedChannel');
 const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('@config/siteConfig');
 const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
-const isApprovedChannel = require('../utils/isApprovedChannel');
 
 const NO_CLAIM = 'NO_CLAIM';
-const NOT_ALLOWED = 'NOT_ALLOWED';
 
 function determineFileExtensionFromContentType (contentType) {
   switch (contentType) {
@@ -366,7 +365,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
         })
         .then(claimArray => {
           if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId })) {
-            reject(NOT_ALLOWED);
+            reject('This content is unavailable');
           }
           switch (claimArray.length) {
             case 0:

From 31891a553ef65a0a10ec2d7b63f9f64b480729bf Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Fri, 21 Sep 2018 11:38:06 -0400
Subject: [PATCH 09/26] load home channel content on homepage when publishing
 is locked down and user is not logged in

---
 client/src/pages/ContentPageWrapper/view.jsx | 6 ++++--
 client/src/pages/HomePage/index.jsx          | 3 ++-
 client/src/pages/HomePage/view.jsx           | 7 +++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/client/src/pages/ContentPageWrapper/view.jsx b/client/src/pages/ContentPageWrapper/view.jsx
index e88f8001..9bb8e8cf 100644
--- a/client/src/pages/ContentPageWrapper/view.jsx
+++ b/client/src/pages/ContentPageWrapper/view.jsx
@@ -3,12 +3,14 @@ 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 { CHANNEL, ASSET_LITE, ASSET_DETAILS } from '../../constants/show_request_types';
 
 class ContentPageWrapper extends React.Component {
   componentDidMount () {
-    this.props.onHandleShowPageUri(this.props.match.params);
+    const { onHandleShowPageUri, match, homeChannel } = this.props;
+    onHandleShowPageUri(homeChannel ? { claim: homeChannel } : match.params);
   }
   componentWillReceiveProps (nextProps) {
     if (nextProps.match.params !== this.props.match.params) {
@@ -35,4 +37,4 @@ class ContentPageWrapper extends React.Component {
   }
 };
 
-export default ContentPageWrapper;
+export default withRouter(ContentPageWrapper);
diff --git a/client/src/pages/HomePage/index.jsx b/client/src/pages/HomePage/index.jsx
index f8357964..367e2675 100644
--- a/client/src/pages/HomePage/index.jsx
+++ b/client/src/pages/HomePage/index.jsx
@@ -2,10 +2,11 @@ import { connect } from 'react-redux';
 import { onHandleShowPageUri } from '../../actions/show';
 import View from './view';
 
-const mapStateToProps = ({ show }) => {
+const mapStateToProps = ({ show, site, channel }) => {
   return {
     error      : show.request.error,
     requestType: show.request.type,
+    homeChannel: site.publishOnlyApproved && !channel.loggedInChannel.name ? `${site.approvedChannels[0].name}:${site.approvedChannels[0].longId}` : null,
   };
 };
 
diff --git a/client/src/pages/HomePage/view.jsx b/client/src/pages/HomePage/view.jsx
index 8ca1e065..05adfe45 100644
--- a/client/src/pages/HomePage/view.jsx
+++ b/client/src/pages/HomePage/view.jsx
@@ -1,11 +1,14 @@
 import React from 'react';
 import PageLayout from '@components/PageLayout';
-
 import PublishTool from '@containers/PublishTool';
+import ContentPageWrapper from '@pages/ContentPageWrapper';
 
 class HomePage extends React.Component {
   render () {
-    return (
+    const { homeChannel } = this.props;
+    return homeChannel ? (
+      <ContentPageWrapper homeChannel={homeChannel} />
+    ) : (
       <PageLayout
         pageTitle={'Speech'}
         pageUri={''}

From ba3abd2eebd789efb3054464fd3498627619d2ea Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Fri, 21 Sep 2018 12:00:10 -0400
Subject: [PATCH 10/26] add multisite default config options

---
 cli/defaults/siteConfig.json | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/cli/defaults/siteConfig.json b/cli/defaults/siteConfig.json
index 8359f0e6..91efe08f 100644
--- a/cli/defaults/siteConfig.json
+++ b/cli/defaults/siteConfig.json
@@ -26,7 +26,11 @@
     "thumbnailChannelId": null,
     "additionalClaimAddresses": [],
     "disabled": false,
-    "disabledMessage": "Default publishing disabled message"
+    "disabledMessage": "Default publishing disabled message",
+    "closedRegistration": false,
+    "serveOnlyApproved": false,
+    "publishOnlyApproved": false,
+    "approvedChannels": []
   },
   "startup": {
     "performChecks": true,

From 69f82d814b7eac5a1dd63e682c34d52d34ac9240 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Fri, 21 Sep 2018 16:16:01 -0400
Subject: [PATCH 11/26] refactor isApprovedClaim to claims folder shared by
 client and server

---
 client/src/containers/NavigationLinks/view.jsx        |  2 +-
 server/controllers/api/channel/data/index.js          |  6 +++---
 server/controllers/api/claim/publish/index.js         |  6 +++---
 .../assets/utils/getClaimIdAndServeAsset.js           |  6 +++---
 server/models/claim.js                                |  6 +++---
 server/utils/isApprovedChannel.js                     | 11 -----------
 {client/src/utils => utils}/isApprovedChannel.js      |  0
 7 files changed, 13 insertions(+), 24 deletions(-)
 delete mode 100644 server/utils/isApprovedChannel.js
 rename {client/src/utils => utils}/isApprovedChannel.js (100%)

diff --git a/client/src/containers/NavigationLinks/view.jsx b/client/src/containers/NavigationLinks/view.jsx
index 2f8ce8ca..c1a71335 100644
--- a/client/src/containers/NavigationLinks/view.jsx
+++ b/client/src/containers/NavigationLinks/view.jsx
@@ -1,7 +1,7 @@
 import React from 'react';
 import { NavLink, withRouter } from 'react-router-dom';
 import NavBarChannelOptionsDropdown from '@components/NavBarChannelOptionsDropdown';
-import isApprovedChannel from '../../utils/isApprovedChannel';
+import isApprovedChannel from '../../../../utils/isApprovedChannel';
 
 const VIEW = 'VIEW';
 const LOGOUT = 'LOGOUT';
diff --git a/server/controllers/api/channel/data/index.js b/server/controllers/api/channel/data/index.js
index b9513edc..c0401e1f 100644
--- a/server/controllers/api/channel/data/index.js
+++ b/server/controllers/api/channel/data/index.js
@@ -1,7 +1,7 @@
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 const getChannelData = require('./getChannelData.js');
-const isApprovedChannel = require('../../../../utils/isApprovedChannel');
-const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
+const isApprovedChannel = require('../../../../../utils/isApprovedChannel');
+const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 const NO_CHANNEL = 'NO_CHANNEL';
 
 /*
@@ -18,7 +18,7 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
   const chanObj = {};
   if (channelName) chanObj.name = channelName;
   if (channelClaimId) chanObj[(channelClaimId.length === 40 ? 'longId' : 'shortId')] = channelClaimId;
-  if (serveOnlyApproved && !isApprovedChannel(chanObj)) {
+  if (serveOnlyApproved && !isApprovedChannel(chanObj, approvedChannels)) {
     return res.status(404).json({
       success: false,
       message: 'This content is unavailable',
diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index c5a2bdbb..7fa525d0 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -3,8 +3,8 @@ const logger = require('winston');
 const { details: { host }, publishing: { disabled, disabledMessage } } = require('@config/siteConfig');
 
 const { sendGATimingEvent } = require('../../../../utils/googleAnalytics.js');
-const isApprovedChannel = require('../../../../utils/isApprovedChannel');
-const { publishing: { publishOnlyApproved } } = require('@config/siteConfig');
+const isApprovedChannel = require('../../../../../utils/isApprovedChannel');
+const { publishing: { publishOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 
@@ -57,7 +57,7 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
   // check channel authorization
   authenticateUser(channelName, channelId, channelPassword, user)
     .then(({ channelName, channelClaimId }) => {
-      if (publishOnlyApproved && !isApprovedChannel({ longId: channelClaimId })) {
+      if (publishOnlyApproved && !isApprovedChannel({ longId: channelClaimId }, approvedChannels)) {
         const error = {
           name   : UNAPPROVED_CHANNEL,
           message: 'This spee.ch instance only allows publishing to approved channels',
diff --git a/server/controllers/assets/utils/getClaimIdAndServeAsset.js b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
index 031bfc67..1feb5ba2 100644
--- a/server/controllers/assets/utils/getClaimIdAndServeAsset.js
+++ b/server/controllers/assets/utils/getClaimIdAndServeAsset.js
@@ -1,7 +1,7 @@
 const logger = require('winston');
 
 const db = require('../../../models');
-const isApprovedChannel = require('../../../utils/isApprovedChannel');
+const isApprovedChannel = require('../../../../utils/isApprovedChannel');
 
 const getClaimId = require('../../utils/getClaimId.js');
 const { handleErrorResponse } = require('../../utils/errorHandlers.js');
@@ -14,7 +14,7 @@ const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
 const NO_FILE = 'NO_FILE';
 const CONTENT_UNAVAILABLE = 'CONTENT_UNAVAILABLE';
 
-const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
+const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId, originalUrl, ip, res) => {
   getClaimId(channelName, channelClaimId, claimName, claimId)
@@ -29,7 +29,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
       });
     })
     .then(claim => {
-      if (serveOnlyApproved && !isApprovedChannel({ longId: claim.dataValues.certificateId })) {
+      if (serveOnlyApproved && !isApprovedChannel({ longId: claim.dataValues.certificateId }, approvedChannels)) {
         throw new Error(CONTENT_UNAVAILABLE);
       }
       logger.debug('Outpoint:', claim.dataValues.outpoint);
diff --git a/server/models/claim.js b/server/models/claim.js
index 8987b7a1..0385cc02 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -1,8 +1,8 @@
 const logger = require('winston');
 const returnShortId = require('./utils/returnShortId.js');
-const isApprovedChannel = require('../utils/isApprovedChannel');
+const isApprovedChannel = require('../../utils/isApprovedChannel');
 const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('@config/siteConfig');
-const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
+const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
 
 const NO_CLAIM = 'NO_CLAIM';
 
@@ -364,7 +364,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
           where: { name, claimId },
         })
         .then(claimArray => {
-          if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId })) {
+          if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId }, approvedChannels)) {
             reject('This content is unavailable');
           }
           switch (claimArray.length) {
diff --git a/server/utils/isApprovedChannel.js b/server/utils/isApprovedChannel.js
deleted file mode 100644
index e1b451e2..00000000
--- a/server/utils/isApprovedChannel.js
+++ /dev/null
@@ -1,11 +0,0 @@
-const { publishing: { approvedChannels } } = require('@config/siteConfig');
-
-function isApprovedChannel (channel, channels = approvedChannels) {
-  const { name, shortId: short, longId: long } = channel;
-  return Boolean(
-    (long && channels.find(chan => chan.longId === long)) ||
-    (name && short && channels.find(chan => chan.name === name && chan.shortId === short))
-  );
-}
-
-module.exports = isApprovedChannel;
diff --git a/client/src/utils/isApprovedChannel.js b/utils/isApprovedChannel.js
similarity index 100%
rename from client/src/utils/isApprovedChannel.js
rename to utils/isApprovedChannel.js

From 6d6bb40fe65a756f841f663e36ed62a3fb0d30eb Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 24 Sep 2018 09:22:28 -0400
Subject: [PATCH 12/26] move approved channel check to its own method

---
 server/models/claim.js | 22 ++++++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/server/models/claim.js b/server/models/claim.js
index 0385cc02..63aa8b94 100644
--- a/server/models/claim.js
+++ b/server/models/claim.js
@@ -356,7 +356,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     }
   };
 
-  Claim.resolveClaim = function (name, claimId) {
+  Claim.fetchClaim = function (name, claimId) {
     logger.debug(`Claim.resolveClaim: ${name} ${claimId}`);
     return new Promise((resolve, reject) => {
       this
@@ -364,9 +364,6 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
           where: { name, claimId },
         })
         .then(claimArray => {
-          if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId }, approvedChannels)) {
-            reject('This content is unavailable');
-          }
           switch (claimArray.length) {
             case 0:
               return resolve(null);
@@ -383,6 +380,23 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
     });
   };
 
+  Claim.resolveClaim = function (name, claimId) {
+    return new Promise((resolve, reject) => {
+      this
+        .fetchClaim(name, claimId)
+        .then(claim => {
+          logger.info('resolveClaim claims:', claim);
+          if (serveOnlyApproved && !isApprovedChannel({ longId: claim.certificateId }, approvedChannels)) {
+            throw new Error('This content is unavailable');
+          }
+          return resolve(claim);
+        })
+        .catch(error => {
+          reject(error);
+        });
+    });
+  };
+
   Claim.getOutpoint = function (name, claimId) {
     logger.debug(`finding outpoint for ${name}#${claimId}`);
     return this

From 7fd0e66d9b223294be7a587f4b503f745e4e27b0 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 24 Sep 2018 09:25:32 -0400
Subject: [PATCH 13/26] refactor nav links display; move logic to index.js

---
 client/src/containers/NavigationLinks/index.jsx | 10 ++++++----
 client/src/containers/NavigationLinks/view.jsx  |  7 +++----
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/client/src/containers/NavigationLinks/index.jsx b/client/src/containers/NavigationLinks/index.jsx
index 7ef8ff85..d5a9c454 100644
--- a/client/src/containers/NavigationLinks/index.jsx
+++ b/client/src/containers/NavigationLinks/index.jsx
@@ -1,13 +1,15 @@
 import { connect } from 'react-redux';
 import { logOutChannel, checkForLoggedInChannel } from '../../actions/channel';
+import isApprovedChannel from '../../../../utils/isApprovedChannel';
 import View from './view';
 
 const mapStateToProps = ({ site, channel: { loggedInChannel: { name, shortId, longId } } }) => {
   return {
-    site,
-    channelName   : name,
-    channelShortId: shortId,
-    channelLongId : longId,
+    showPublish       : (!site.publishOnlyApproved || isApprovedChannel({ longId }, site.approvedChannels)),
+    closedRegistration: site.closedRegistration,
+    channelName       : name,
+    channelShortId    : shortId,
+    channelLongId     : longId,
   };
 };
 
diff --git a/client/src/containers/NavigationLinks/view.jsx b/client/src/containers/NavigationLinks/view.jsx
index c1a71335..01775688 100644
--- a/client/src/containers/NavigationLinks/view.jsx
+++ b/client/src/containers/NavigationLinks/view.jsx
@@ -1,7 +1,6 @@
 import React from 'react';
 import { NavLink, withRouter } from 'react-router-dom';
 import NavBarChannelOptionsDropdown from '@components/NavBarChannelOptionsDropdown';
-import isApprovedChannel from '../../../../utils/isApprovedChannel';
 
 const VIEW = 'VIEW';
 const LOGOUT = 'LOGOUT';
@@ -29,10 +28,10 @@ class NavigationLinks extends React.Component {
     }
   }
   render () {
-    const { site, channelLongId, channelName } = this.props;
+    const { channelName, showPublish, closedRegistration } = this.props;
     return (
       <div className='navigation-links'>
-        {(!site.publishOnlyApproved || isApprovedChannel({ longId: channelLongId }, site.approvedChannels)) && <NavLink
+        {showPublish && <NavLink
           className='nav-bar-link link--nav'
           activeClassName='link--nav-active'
           to='/'
@@ -55,7 +54,7 @@ class NavigationLinks extends React.Component {
             VIEW={VIEW}
             LOGOUT={LOGOUT}
           />
-        ) : !site.closedRegistration && (
+        ) : !closedRegistration && (
           <NavLink
             id='nav-bar-login-link'
             className='nav-bar-link link--nav'

From ee1e20bd149f6aec960624df49475e419ff8782e Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 24 Sep 2018 09:26:16 -0400
Subject: [PATCH 14/26] handle exceptions together

---
 server/controllers/api/claim/publish/index.js | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/server/controllers/api/claim/publish/index.js b/server/controllers/api/claim/publish/index.js
index 7fa525d0..f51d4055 100644
--- a/server/controllers/api/claim/publish/index.js
+++ b/server/controllers/api/claim/publish/index.js
@@ -102,13 +102,7 @@ const claimPublish = ({ body, files, headers, ip, originalUrl, user, tor }, res)
       sendGATimingEvent('end-to-end', 'publish', fileType, gaStartTime, Date.now());
     })
     .catch(error => {
-      if (error.name === CLAIM_TAKEN) {
-        res.status(400).json({
-          success: false,
-          message: error.message,
-        });
-      }
-      if (error.name === UNAPPROVED_CHANNEL) {
+      if ([CLAIM_TAKEN, UNAPPROVED_CHANNEL].includes(error.name)) {
         res.status(400).json({
           success: false,
           message: error.message,

From 50cbe126498bec850506e55be1db976e313b6cf9 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 24 Sep 2018 09:26:58 -0400
Subject: [PATCH 15/26] use constants to refer to claim length, longId, shortId

---
 server/controllers/api/channel/data/index.js | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/server/controllers/api/channel/data/index.js b/server/controllers/api/channel/data/index.js
index c0401e1f..612eb016 100644
--- a/server/controllers/api/channel/data/index.js
+++ b/server/controllers/api/channel/data/index.js
@@ -2,7 +2,11 @@ const { handleErrorResponse } = require('../../../utils/errorHandlers.js');
 const getChannelData = require('./getChannelData.js');
 const isApprovedChannel = require('../../../../../utils/isApprovedChannel');
 const { publishing: { serveOnlyApproved, approvedChannels } } = require('@config/siteConfig');
+
 const NO_CHANNEL = 'NO_CHANNEL';
+const LONG_ID = 'longId';
+const SHORT_ID = 'shortId';
+const LONG_CLAIM_LENGTH = 40;
 
 /*
 
@@ -14,10 +18,9 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
   const channelName = params.channelName;
   let channelClaimId = params.channelClaimId;
   if (channelClaimId === 'none') channelClaimId = null;
-
   const chanObj = {};
   if (channelName) chanObj.name = channelName;
-  if (channelClaimId) chanObj[(channelClaimId.length === 40 ? 'longId' : 'shortId')] = channelClaimId;
+  if (channelClaimId) chanObj[(channelClaimId.length === LONG_CLAIM_LENGTH ? LONG_ID : SHORT_ID)] = channelClaimId;
   if (serveOnlyApproved && !isApprovedChannel(chanObj, approvedChannels)) {
     return res.status(404).json({
       success: false,

From d6cc3a69b0869bbd2ffba99f5eea069c1462e691 Mon Sep 17 00:00:00 2001
From: Dhruvam <DhruvamSharma@users.noreply.github.com>
Date: Tue, 2 Oct 2018 15:57:35 +0530
Subject: [PATCH 16/26] Removed grammatical and technical errors from README.md

---
 README.md | 38 +++++++++++++++++++-------------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 13cd4d9c..b4648512 100644
--- a/README.md
+++ b/README.md
@@ -3,16 +3,16 @@ Spee.ch is a web app that reads and publishes images and videos to and from the
 
 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.)
 
-## Quick start
+## Quickstart
 
 _note: this is the quickstart guide, for an in-depth step-by-step overview visit the [fullstart guide](https://github.com/lbryio/spee.ch/blob/readme-update/fullstart.md)._
 
 #### Install System Dependencies:
   * [node](https://nodejs.org)
-  * [mysql](https://dev.mysql.com/doc/refman/8.0/en/installing.html)
+  * [MySQL](https://dev.mysql.com/doc/refman/8.0/en/installing.html)
   * [`lbry`](https://github.com/lbryio/lbry) daemon
     * note: retrieve an address from the daemon and send your wallet a couple credits (or join us in the [#speech discord channel](https://discord.gg/YjYbwhS) and we will send you a few)
-  * [ffmpeg](https://www.ffmpeg.org/download.html)
+  * [FFmpeg](https://www.ffmpeg.org/download.html)
   
 #### Clone this repo
 ```
@@ -29,7 +29,7 @@ $ cd spee.ch
 $ npm install
 ```
 
-#### Create the config files using the built in CLI
+#### Create the config files using the built-in CLI
 ```
 $ npm run configure
 ```
@@ -51,11 +51,11 @@ 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 `src/views/` (further instructions coming soon)
-  * update the css by changing the files in `public/assets/css/` (further instructions and refactor coming soon) 
+  * update the CSS by changing the files in `public/assets/css/` (further instructions and refactor coming soon) 
 
 #### (optional) Syncing the full blockchain
  * Start the `spee.ch-sync` tool available at [billbitt/spee.ch-sync](https://github.com/billbitt/spee.ch-sync)
- * This is not necessary, but highly reccomended.  It will decode the blocks of the `LBRY` blockchain and add the claims information to your database's tables
+ * This is not necessary, but highly recommended.  It will decode the blocks of the `LBRY` blockchain and add the claims information to your database's tables
 
 ## API
 #### /api/claim/publish
@@ -120,16 +120,16 @@ response:
 ## Contribute
 
 ### Stack
-The spee.ch stack is MySQL, Express.js, Node.js, and React.js.  Spee.ch also runs `lbrynet` on its server, and it uses the `lbrynet` api to make requests -- such as `publish`, `create_channel`, and `get` -- on the `LBRY` network.
+The spee.ch stack is MySQL, Express.js, Node.js, and React.js.  Spee.ch also runs `lbrynet` on its server, and it uses the `lbrynet` API to make requests -- such as `publish`, `create_channel`, and `get` -- on the `LBRY` network.
   
-Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain as they are mined, and stores the information in mysql.  It stores all claims in the `Claims` table, and all channel claims in the `Certificates` table.
+Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain as they are mined, and stores the information in MySQL.  It stores all claims in the `Claims` table, and all channel claims in the `Certificates` table.
 
 * server
-  * [mysql](https://www.mysql.com/)
+  * [MySQL](https://www.mysql.com/)
   * [express](https://www.npmjs.com/package/express) 
   * [node](https://nodejs.org/)
   * [lbry](https://github.com/lbryio/lbry)
-  * [ffmpeg](https://www.ffmpeg.org/)
+  * [FFmpeg](https://www.ffmpeg.org/)
 * client
   * [react](https://reactjs.org/)
   * redux
@@ -139,10 +139,10 @@ Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain a
  
  
 ### Architecture
-* `cli/` contains the code for the cli tool.  Running the tool will create `.json` config files and place them in the `config/` folder
-  * `configure.js` is the entry point for the cli tool
+* `cli/` contains the code for the CLI tool.  Running the tool will create `.json` config files and place them in the `config/` folder
+  * `configure.js` is the entry point for the CLI tool
   * `cli/defaults/` holds default config files 
-  * `cli/questions/` holds the questions that the cli tool asks to build the config files
+  * `cli/questions/` holds the questions that the CLI tool asks to build the config files
 
 * `client/` contains all of the client code
   * The client side of spee.ch uses `React` and `Redux`
@@ -152,12 +152,12 @@ Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain a
     * The Redux code is broken up into `actions/` `reducers/` and `selectors/`
     * The React components are broken up into `containers/` (components that pull props directly from the Redux store), `components/` ('dumb' components), and `pages/`
     * spee.ch also uses sagas which are in the `sagas/` folders and `channels/`
-  * `client/scss/` contains  the css for the project
+  * `client/scss/` contains  the CSS for the project
     * 
   
 * `client_custom` is a folder which can be used to override the default components in `client/`
   * The folder structure mimics that of the `client/` folder
-  * to customize spee.ch, place your own components ans scss in the `client_custom/src/` and `client_custom/scss` folders. 
+  * to customize spee.ch, place your own components and scss in the `client_custom/src/` and `client_custom/scss` folders. 
   
 * `server/`  contains all of the server code
   * `index.js` is the entry point for the server.  It creates the [express app](https://expressjs.com/), requires the routes, syncs the database, and starts the server listening on the `PORT` designated in the config files.
@@ -168,7 +168,7 @@ Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain a
    
 * `tests/` holds the end-to-end tests for this project
   * Spee.ch uses `mocha` with the `chai` assertion library
-  * unit tests are located inside the project in-line with the files being tested and are designtated with a `xxxx.test.js` file name
+  * unit tests are located inside the project in-line with the files being tested and are designated with a `xxxx.test.js` file name
  
 ### Tests
 * This package uses `mocha` with `chai` for testing.
@@ -178,7 +178,7 @@ 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
 * retrieve the controlling `LBRY` claim:
   * https://spee.ch/`claim`
   * https://spee.ch/`claim`.`ext` (serve)
@@ -197,7 +197,7 @@ Spee.ch has a few types of url formats that return different assets from the LBR
   * https://spee.ch/`@channel`:`channel_id`/`claim`.`ext` (serve)
   
 ### Bugs
-If you find a bug or experience a problem, please report your issue here on github and find us in the lbry discord!
+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
@@ -210,4 +210,4 @@ Familiarity with web apps is required, but little-to-no familiarity with the lbr
 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 of they are part of the spee.ch implementation
+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

From 698d7e542a519bd83b42dd21a2941dce07193015 Mon Sep 17 00:00:00 2001
From: Tiago Rodrigo Lampert <tiagorlampert@gmail.com>
Date: Tue, 2 Oct 2018 16:55:16 -0300
Subject: [PATCH 17/26] Fix typos

designtated -> designated
reccomended -> recommended
succesfully -> successfully
---
 README.md | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index 13cd4d9c..bb7400dc 100644
--- a/README.md
+++ b/README.md
@@ -55,7 +55,7 @@ check out the [customization guide](https://github.com/lbryio/spee.ch/blob/readm
 
 #### (optional) Syncing the full blockchain
  * Start the `spee.ch-sync` tool available at [billbitt/spee.ch-sync](https://github.com/billbitt/spee.ch-sync)
- * This is not necessary, but highly reccomended.  It will decode the blocks of the `LBRY` blockchain and add the claims information to your database's tables
+ * This is not necessary, but highly recommended.  It will decode the blocks of the `LBRY` blockchain and add the claims information to your database's tables
 
 ## API
 #### /api/claim/publish
@@ -111,7 +111,7 @@ curl https://spee.ch/api/claim/availability/doitlive
 response:
 ```
 {
-    "success": <bool>,  // `true` if spee.ch succesfully checked the claim availability
+    "success": <bool>,  // `true` if spee.ch successfully checked the claim availability
     "data": <bool>, // `true` if claim is available, false if it is not available
     "message": <string> // human readable message of whether claim was available or not
 }
@@ -168,7 +168,7 @@ Spee.ch also runs a sync tool, which decodes blocks from the `LBRY` blockchain a
    
 * `tests/` holds the end-to-end tests for this project
   * Spee.ch uses `mocha` with the `chai` assertion library
-  * unit tests are located inside the project in-line with the files being tested and are designtated with a `xxxx.test.js` file name
+  * unit tests are located inside the project in-line with the files being tested and are designated with a `xxxx.test.js` file name
  
 ### Tests
 * This package uses `mocha` with `chai` for testing.

From f2c59e7108fa3e491651bfb522cf8df1248126e7 Mon Sep 17 00:00:00 2001
From: Rizda Dwi Prasetya <rizdaprasetya@users.noreply.github.com>
Date: Wed, 3 Oct 2018 14:13:03 +0700
Subject: [PATCH 18/26] Add Share to Mastodon button

---
 client/src/components/AssetShareButtons/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/components/AssetShareButtons/index.js b/client/src/components/AssetShareButtons/index.js
index dfb0c0b9..13002ab6 100644
--- a/client/src/components/AssetShareButtons/index.js
+++ b/client/src/components/AssetShareButtons/index.js
@@ -32,6 +32,13 @@ const AssetShareButtons = ({ host, name, shortId }) => {
       >
         reddit
       </a>
+      <a
+        className='link--primary'
+        target='_blank'
+        href={`https://sharetomastodon.github.io/?title=${name}&url=${host}/${shortId}/${name}`}
+      >
+        mastodon
+      </a>
     </SpaceBetween>
   );
 };

From 2c82fb609a37b4e7de9b9014031164174c84a42d Mon Sep 17 00:00:00 2001
From: Rizda Dwi Prasetya <rizda.prasetya@midtrans.com>
Date: Thu, 4 Oct 2018 15:47:55 +0700
Subject: [PATCH 19/26] add new css class that auto wrap to allow more share
 links

---
 client/scss/all.scss                                |  1 +
 .../scss/social-share-link/_social-share-link.scss  | 10 ++++++++++
 client/src/components/AssetShareButtons/index.js    |  6 +++---
 client/src/components/SocialShareLink/index.jsx     | 13 +++++++++++++
 4 files changed, 27 insertions(+), 3 deletions(-)
 create mode 100644 client/scss/social-share-link/_social-share-link.scss
 create mode 100644 client/src/components/SocialShareLink/index.jsx

diff --git a/client/scss/all.scss b/client/scss/all.scss
index 716e893b..2f1447f5 100644
--- a/client/scss/all.scss
+++ b/client/scss/all.scss
@@ -35,6 +35,7 @@
 @import '~row/_row';
 @import '~vertical-split/_vertical-split';
 @import '~tooltip/_tooltip';
+@import '~social-share-link/_social-share-link';
 
 @import '~channel-claims-display/_channel-claims-display';
 @import '~dropzone/_dropzone';
diff --git a/client/scss/social-share-link/_social-share-link.scss b/client/scss/social-share-link/_social-share-link.scss
new file mode 100644
index 00000000..c1fa2946
--- /dev/null
+++ b/client/scss/social-share-link/_social-share-link.scss
@@ -0,0 +1,10 @@
+.social-share-link {
+  flex-wrap: wrap;
+  margin-right: -0.5em;
+  margin-left: -0.5em;
+}
+
+.social-share-link > a{
+  padding-right:0.5em;
+  padding-left:0.5em;
+}
\ No newline at end of file
diff --git a/client/src/components/AssetShareButtons/index.js b/client/src/components/AssetShareButtons/index.js
index 13002ab6..a445fe3a 100644
--- a/client/src/components/AssetShareButtons/index.js
+++ b/client/src/components/AssetShareButtons/index.js
@@ -1,9 +1,9 @@
 import React from 'react';
-import SpaceBetween from '@components/SpaceBetween';
+import SocialShareLink from '@components/SocialShareLink';
 
 const AssetShareButtons = ({ host, name, shortId }) => {
   return (
-    <SpaceBetween >
+    <SocialShareLink >
       <a
         className='link--primary'
         target='_blank'
@@ -39,7 +39,7 @@ const AssetShareButtons = ({ host, name, shortId }) => {
       >
         mastodon
       </a>
-    </SpaceBetween>
+    </SocialShareLink>
   );
 };
 
diff --git a/client/src/components/SocialShareLink/index.jsx b/client/src/components/SocialShareLink/index.jsx
new file mode 100644
index 00000000..5f382b2b
--- /dev/null
+++ b/client/src/components/SocialShareLink/index.jsx
@@ -0,0 +1,13 @@
+import React from 'react';
+
+class SocialShareLink extends React.Component {
+  render () {
+    return (
+      <div className={'space-between social-share-link'}>
+        {this.props.children}
+      </div>
+    );
+  }
+}
+
+export default SocialShareLink;

From 2a920cfa4fa504edb144b6f102c2415293a79a70 Mon Sep 17 00:00:00 2001
From: Rizda Dwi Prasetya <rizda.prasetya@midtrans.com>
Date: Thu, 4 Oct 2018 15:51:01 +0700
Subject: [PATCH 20/26] add diaspora share link

---
 client/src/components/AssetShareButtons/index.js | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/client/src/components/AssetShareButtons/index.js b/client/src/components/AssetShareButtons/index.js
index a445fe3a..a7d175e0 100644
--- a/client/src/components/AssetShareButtons/index.js
+++ b/client/src/components/AssetShareButtons/index.js
@@ -39,6 +39,13 @@ const AssetShareButtons = ({ host, name, shortId }) => {
       >
         mastodon
       </a>
+      <a
+        className='link--primary'
+        target='_blank'
+        href={`https://share.diasporafoundation.org/?title=${name}&url=${host}/${shortId}/${name}}
+      >
+        diaspora
+      </a>
     </SocialShareLink>
   );
 };

From 89cc458993734bfca6e4625a24d2856ecbe09e1f Mon Sep 17 00:00:00 2001
From: Rizda Dwi Prasetya <rizda.prasetya@midtrans.com>
Date: Thu, 4 Oct 2018 16:03:37 +0700
Subject: [PATCH 21/26] add bottom padding between share link

---
 client/scss/social-share-link/_social-share-link.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/client/scss/social-share-link/_social-share-link.scss b/client/scss/social-share-link/_social-share-link.scss
index c1fa2946..58973667 100644
--- a/client/scss/social-share-link/_social-share-link.scss
+++ b/client/scss/social-share-link/_social-share-link.scss
@@ -7,4 +7,5 @@
 .social-share-link > a{
   padding-right:0.5em;
   padding-left:0.5em;
+  padding-bottom:0.3em;
 }
\ No newline at end of file

From fda83dca5b8d03bd6b15a013e9669923b7317934 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Thu, 4 Oct 2018 15:25:53 -0400
Subject: [PATCH 22/26] force publishes to loggedInChannel when
 publishOnlyApproved

---
 client/src/containers/ChannelSelect/index.js |  9 +++++++--
 client/src/containers/ChannelSelect/view.jsx | 19 ++++++++++++++++---
 2 files changed, 23 insertions(+), 5 deletions(-)

diff --git a/client/src/containers/ChannelSelect/index.js b/client/src/containers/ChannelSelect/index.js
index 9efce26d..23d731ad 100644
--- a/client/src/containers/ChannelSelect/index.js
+++ b/client/src/containers/ChannelSelect/index.js
@@ -1,13 +1,18 @@
 import {connect} from 'react-redux';
 import {setPublishInChannel, updateSelectedChannel, updateError} from '../../actions/publish';
+// import isApprovedChannel from '../../../../utils/isApprovedChannel';
 import View from './view';
 
-const mapStateToProps = ({ channel, publish }) => {
+const mapStateToProps = ({ publish, site, channel: { loggedInChannel: { name, shortId, longId } } }) => {
   return {
-    loggedInChannelName: channel.loggedInChannel.name,
+    // isApprovedChannel  : isApprovedChannel({ longId }, site.approvedChannels),
+    publishOnlyApproved: site.publishOnlyApproved,
+    // closedRegistration : site.closedRegistration,
+    loggedInChannelName: name,
     publishInChannel   : publish.publishInChannel,
     selectedChannel    : publish.selectedChannel,
     channelError       : publish.error.channel,
+    longId,
   };
 };
 
diff --git a/client/src/containers/ChannelSelect/view.jsx b/client/src/containers/ChannelSelect/view.jsx
index 4a4dc5fe..d04007d5 100644
--- a/client/src/containers/ChannelSelect/view.jsx
+++ b/client/src/containers/ChannelSelect/view.jsx
@@ -16,9 +16,12 @@ class ChannelSelect extends React.Component {
     this.handleSelection = this.handleSelection.bind(this);
   }
   componentWillMount () {
-    const { loggedInChannelName } = this.props;
+    const { loggedInChannelName, onChannelSelect, publishOnlyApproved, onPublishInChannelChange } = this.props;
     if (loggedInChannelName) {
-      this.props.onChannelSelect(loggedInChannelName);
+      onChannelSelect(loggedInChannelName);
+    }
+    if (publishOnlyApproved) {
+      onPublishInChannelChange(true);
     }
   }
   toggleAnonymousPublish (event) {
@@ -34,7 +37,17 @@ class ChannelSelect extends React.Component {
     this.props.onChannelSelect(selectedOption);
   }
   render () {
-    const { publishInChannel, channelError, selectedChannel, loggedInChannelName } = this.props;
+    const { publishInChannel, channelError, selectedChannel, loggedInChannelName, publishOnlyApproved } = this.props;
+    if (publishOnlyApproved) {
+      return (
+        <div>
+          <RowLabeled
+            label={<Label value={'Channel:'} />}
+            content={<span>{loggedInChannelName}</span>}
+          />
+        </div>
+      );
+    }
     return (
       <div>
         <RowLabeled

From 90a5dcf54ddc560f5897fa6894c91e561c440466 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Thu, 4 Oct 2018 15:48:49 -0400
Subject: [PATCH 23/26] add quotes to bid amount

---
 cli/configure.js                                                | 2 +-
 server/controllers/api/claim/publish/createPublishParams.js     | 2 +-
 .../api/claim/publish/createThumbnailPublishParams.js           | 2 +-
 server/lbrynet/index.js                                         | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cli/configure.js b/cli/configure.js
index 0d59cbbd..c50b81fa 100644
--- a/cli/configure.js
+++ b/cli/configure.js
@@ -157,7 +157,7 @@ inquirer
         method: 'channel_new',
         params: {
           channel_name: thumbnailChannelDefault,
-          amount      : 0.1,
+          amount      : '0.1',
         },
       })
       .then(response => {
diff --git a/server/controllers/api/claim/publish/createPublishParams.js b/server/controllers/api/claim/publish/createPublishParams.js
index facdc32f..a278bbee 100644
--- a/server/controllers/api/claim/publish/createPublishParams.js
+++ b/server/controllers/api/claim/publish/createPublishParams.js
@@ -18,7 +18,7 @@ const createPublishParams = (filePath, name, title, description, license, nsfw,
   const publishParams = {
     name,
     file_path: filePath,
-    bid      : 0.01,
+    bid      : '0.01',
     metadata : {
       description,
       title,
diff --git a/server/controllers/api/claim/publish/createThumbnailPublishParams.js b/server/controllers/api/claim/publish/createThumbnailPublishParams.js
index 1032c9a3..668bd07c 100644
--- a/server/controllers/api/claim/publish/createThumbnailPublishParams.js
+++ b/server/controllers/api/claim/publish/createThumbnailPublishParams.js
@@ -10,7 +10,7 @@ const createThumbnailPublishParams = (thumbnailFilePath, claimName, license, nsf
   return {
     name     : `${claimName}-thumb`,
     file_path: thumbnailFilePath,
-    bid      : 0.01,
+    bid      : '0.01',
     metadata : {
       title      : `${claimName} thumbnail`,
       description: `a thumbnail for ${claimName}`,
diff --git a/server/lbrynet/index.js b/server/lbrynet/index.js
index 4ff64521..655909fa 100644
--- a/server/lbrynet/index.js
+++ b/server/lbrynet/index.js
@@ -116,7 +116,7 @@ module.exports = {
           method: 'channel_new',
           params: {
             channel_name: name,
-            amount      : 0.1,
+            amount      : '0.1',
           },
         })
         .then(response => {

From e5132f19c3bd85abcfd6770f6251b3bb023f45a4 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Thu, 27 Sep 2018 18:12:17 -0400
Subject: [PATCH 24/26] use proper error checks; return only error message

---
 client/src/containers/AssetDisplay/view.jsx   |  9 +++++++--
 server/lbrynet/utils/handleLbrynetResponse.js | 10 +++++-----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/client/src/containers/AssetDisplay/view.jsx b/client/src/containers/AssetDisplay/view.jsx
index e07bfa78..d5b37b82 100644
--- a/client/src/containers/AssetDisplay/view.jsx
+++ b/client/src/containers/AssetDisplay/view.jsx
@@ -1,4 +1,5 @@
 import React from 'react';
+import Row from '@components/Row';
 import ProgressBar from '@components/ProgressBar';
 import { LOCAL_CHECK, UNAVAILABLE, ERROR, AVAILABLE } from '../../constants/asset_display_states';
 
@@ -26,8 +27,12 @@ class AssetDisplay extends React.Component {
         }
         {(status === ERROR) &&
         <div>
-          <p>Unfortunately, we couldn't download your asset from LBRY.  You can help us out by sharing the below error message in the <a className='link--primary' href='https://chat.lbry.io' target='_blank'>LBRY discord</a>.</p>
-          <i><p id='error-message'>{error}</p></i>
+          <Row>
+            <p>Unfortunately, we couldn't download your asset from LBRY.  You can help us out by sharing the following error message in the <a className='link--primary' href='https://chat.lbry.io' target='_blank'>LBRY discord</a>.</p>
+          </Row>
+          <Row>
+            <p id='error-message'><i>{error}</i></p>
+          </Row>
         </div>
         }
         {(status === AVAILABLE) &&
diff --git a/server/lbrynet/utils/handleLbrynetResponse.js b/server/lbrynet/utils/handleLbrynetResponse.js
index 8c430047..a5cc72a4 100644
--- a/server/lbrynet/utils/handleLbrynetResponse.js
+++ b/server/lbrynet/utils/handleLbrynetResponse.js
@@ -2,13 +2,13 @@ const logger = require('winston');
 
 const handleLbrynetResponse = ({ data }, resolve, reject) => {
   logger.debug('lbry api data:', data);
-  if (data.result) {
+  if (data) {
     // check for an error
-    if (data.result.error) {
-      logger.debug('Lbrynet api error:', data.result.error);
-      reject(new Error(data.result.error));
+    if (data.error) {
+      logger.debug('Lbrynet api error:', data.error);
+      reject(new Error(data.error.message));
       return;
-    };
+    }
     resolve(data.result);
     return;
   }

From fa592d2aac67bbe8d67bd48666c7ac4c2f00af1f Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Wed, 26 Sep 2018 16:11:43 -0400
Subject: [PATCH 25/26] add terms of service

---
 client/src/app.js                             |  2 +
 .../components/AboutSpeechDetails/index.jsx   |  6 ++
 client/src/pages/TosPage/index.jsx            | 67 +++++++++++++++++++
 server/routes/pages/index.js                  |  1 +
 4 files changed, 76 insertions(+)
 create mode 100644 client/src/pages/TosPage/index.jsx

diff --git a/client/src/app.js b/client/src/app.js
index d8f998bd..6a267018 100644
--- a/client/src/app.js
+++ b/client/src/app.js
@@ -3,6 +3,7 @@ import { Route, Switch } from 'react-router-dom';
 
 import HomePage  from '@pages/HomePage';
 import AboutPage from '@pages/AboutPage';
+import TosPage from '@pages/TosPage';
 import LoginPage from '@pages/LoginPage';
 import ContentPageWrapper from '@pages/ContentPageWrapper';
 import FourOhFourPage from '@pages/FourOhFourPage';
@@ -13,6 +14,7 @@ const App = () => {
     <Switch>
       <Route exact path='/' component={HomePage} />
       <Route exact path='/about' component={AboutPage} />
+      <Route exact path='/tos' component={TosPage} />
       <Route exact path='/login' component={LoginPage} />
       <Route exact path='/multisite' component={MultisitePage} />
       <Route exact path='/:identifier/:claim' component={ContentPageWrapper} />
diff --git a/client/src/components/AboutSpeechDetails/index.jsx b/client/src/components/AboutSpeechDetails/index.jsx
index 8791e702..534e2da9 100644
--- a/client/src/components/AboutSpeechDetails/index.jsx
+++ b/client/src/components/AboutSpeechDetails/index.jsx
@@ -1,9 +1,15 @@
 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 to='/tos'>Terms of Service</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.io'>LBRY</a> blockchain.
diff --git a/client/src/pages/TosPage/index.jsx b/client/src/pages/TosPage/index.jsx
new file mode 100644
index 00000000..1ae7ad4a
--- /dev/null
+++ b/client/src/pages/TosPage/index.jsx
@@ -0,0 +1,67 @@
+import React from 'react';
+import PageLayout from '@components/PageLayout';
+import Row from '@components/Row';
+
+class TosPage extends React.Component {
+  render () {
+    return (
+      <PageLayout
+        pageTitle={'Terms of Service'}
+        pageUri={'tos'}
+      >
+        <Row>
+          <h1>Terms of Service</h1>
+          <p>Last updated: September 25, 2018</p>
+          <p>Please read these Terms of Service ("Terms", "Terms of Service") carefully before using the https://spee.ch website (the "Service") operated by LBRY INC ("us", "we", or "our").</p>
+          <p>Your access to and use of the Service is conditioned upon your acceptance of and compliance with these Terms. These Terms apply to all visitors, users and others who wish to access or use the Service.</p>
+          <p>By accessing or using the Service you agree to be bound by these Terms. If you disagree with any part of the terms then you do not have permission to access the Service.</p>
+        </Row>
+        <Row>
+          <h3>Links To Other Web Sites</h3>
+          <p>Our Service may contain links to third party web sites or services that are not owned or controlled by LBRY INC</p>
+          <p>LBRY INC has no control over, and assumes no responsibility for the content, privacy policies, or practices of any third party web sites or services. We do not warrant the offerings of any of these entities/individuals or their websites.</p>
+          <p>You acknowledge and agree that LBRY INC shall not be responsible or liable, directly or indirectly, for any damage or loss caused or alleged to be caused by or in connection with use of or reliance on any such content, goods or services available on or through any such third party web sites or services.</p>
+          <p>We strongly advise you to read the terms and conditions and privacy policies of any third party web sites or services that you visit.</p>
+        </Row>
+        <Row>
+          <h3>Termination</h3>
+          <p>We may terminate or suspend your access to the Service immediately, without prior notice or liability, under our sole discretion, for any reason whatsoever and without limitation, including but not limited to a breach of the Terms.</p>
+          <p>All provisions of the Terms which by their nature should survive termination shall survive termination, including, without limitation, ownership provisions, warranty disclaimers, indemnity and limitations of liability.</p>
+        </Row>
+        <Row>
+          <h3>Indemnification</h3>
+          <p>You agree to defend, indemnify and hold harmless LBRY INC and its licensee and licensors, and their employees, contractors, agents, officers and directors, from and against any and all claims, damages, obligations, losses, liabilities, costs or debt, and expenses (including but not limited to attorney's fees), resulting from or arising out of a) your use and access of the Service, or b) a breach of these Terms.</p>
+        </Row>
+        <Row>
+          <h3>Limitation Of Liability</h3>
+          <p>In no event shall LBRY INC, nor its directors, employees, partners, agents, suppliers, or affiliates, be liable for any indirect, incidental, special, consequential or punitive damages, including without limitation, loss of profits, data, use, goodwill, or other intangible losses, resulting from (i) your access to or use of or inability to access or use the Service; (ii) any conduct or content of any third party on the Service; (iii) any content obtained from the Service; and (iv) unauthorized access, use or alteration of your transmissions or content, whether based on warranty, contract, tort (including negligence) or any other legal theory, whether or not we have been informed of the possibility of such damage, and even if a remedy set forth herein is found to have failed of its essential purpose.</p>
+        </Row>
+        <Row>
+          <h3>Disclaimer</h3>
+          <p>Your use of the Service is at your sole risk. The Service is provided on an "AS IS" and "AS AVAILABLE" basis. The Service is provided without warranties of any kind, whether express or implied, including, but not limited to, implied warranties of merchantability, fitness for a particular purpose, non-infringement or course of performance.</p>
+          <p>LBRY INC its subsidiaries, affiliates, and its licensors do not warrant that a) the Service will function uninterrupted, secure or available at any particular time or location; b) any errors or defects will be corrected; c) the Service is free of viruses or other harmful components; or d) the results of using the Service will meet your requirements.</p>
+        </Row>
+        <Row>
+          <h3>Exclusions</h3>
+          <p>Some jurisdictions do not allow the exclusion of certain warranties or the exclusion or limitation of liability for consequential or incidental damages, so the limitations above may not apply to you.</p>
+        </Row>
+        <Row>
+          <h3>Governing Law</h3>
+          <p>These Terms shall be governed and construed in accordance with the laws of Delaware, United States, without regard to its conflict of law provisions.</p>
+          <p>Our failure to enforce any right or provision of these Terms will not be considered a waiver of those rights. If any provision of these Terms is held to be invalid or unenforceable by a court, the remaining provisions of these Terms will remain in effect. These Terms constitute the entire agreement between us regarding our Service, and supersede and replace any prior agreements we might have had between us regarding the Service.</p>
+        </Row>
+        <Row>
+          <h3>Changes</h3>
+          <p>We reserve the right, at our sole discretion, to modify or replace these Terms at any time. If a revision is material we will provide at least 30 days notice prior to any new terms taking effect. What constitutes a material change will be determined at our sole discretion.</p>
+          <p>By continuing to access or use our Service after any revisions become effective, you agree to be bound by the revised terms. If you do not agree to the new terms, you are no longer authorized to use the Service.</p>
+        </Row>
+        <Row>
+          <h3>Contact Us</h3>
+          <p>If you have any questions about these Terms, please <a className='link--primary' href='mailto:hello@lbry.io'>contact us</a>.</p>
+        </Row>
+      </PageLayout>
+    );
+  }
+}
+
+export default TosPage;
diff --git a/server/routes/pages/index.js b/server/routes/pages/index.js
index 2dff606b..f010ea56 100644
--- a/server/routes/pages/index.js
+++ b/server/routes/pages/index.js
@@ -6,6 +6,7 @@ module.exports = (app) => {
   app.get('/', handlePageRequest);
   app.get('/login', handlePageRequest);
   app.get('/about', handlePageRequest);
+  app.get('/tos', handlePageRequest);
   app.get('/trending', redirect('/popular'));
   app.get('/popular', handlePageRequest);
   app.get('/new', handlePageRequest);

From 877d0669153bad7bdd24ef62ed5842495e98e746 Mon Sep 17 00:00:00 2001
From: Travis Eden <daovist@gmail.com>
Date: Mon, 8 Oct 2018 10:54:38 -0400
Subject: [PATCH 26/26] add backtick to diaspora share link

---
 client/src/components/AssetShareButtons/index.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/client/src/components/AssetShareButtons/index.js b/client/src/components/AssetShareButtons/index.js
index a7d175e0..ebf113f0 100644
--- a/client/src/components/AssetShareButtons/index.js
+++ b/client/src/components/AssetShareButtons/index.js
@@ -42,7 +42,7 @@ const AssetShareButtons = ({ host, name, shortId }) => {
       <a
         className='link--primary'
         target='_blank'
-        href={`https://share.diasporafoundation.org/?title=${name}&url=${host}/${shortId}/${name}}
+        href={`https://share.diasporafoundation.org/?title=${name}&url=${host}/${shortId}/${name}`}
       >
         diaspora
       </a>