LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues 95 Pull requests 2 Packages Projects Releases 4 Wiki Activity

Merge pull request #1064 from lbryio/updateMessaging #1065

Merged
jessopb merged 1 commit from master into staging 2020-05-15 20:11:36 +02:00
Conversation 0 Commits 1 Files changed - +47 -63
6 changed files with 47 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7940c61b17 - Show all commits

2
client/src/app.js
View file

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

23
client/src/components/AboutSpeechDetails/index.jsx
View file

@ -1,32 +1,13 @@
import React from 'react'; import React from 'react';
import Row from '@components/Row'; import Row from '@components/Row';
import {Link} from 'react-router-dom';
const AboutSpeechDetails = () => { const AboutSpeechDetails = () => {
return ( return (
<div> <div>
<Row> <Row>
<p className={'text--large'}> <p className={'text--large'}>
<Link className={'link--primary'} to='/tos'>Terms of Service</Link> 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.
<br /> 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.
<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>.
</p> </p>
</Row> </Row>
</div> </div>

7
client/src/components/AboutSpeechOverview/index.jsx
View file

@ -5,14 +5,13 @@ const AboutSpeechOverview = () => {
return ( return (
<div> <div>
<Row> <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>
<Row> <Row>
<div className={'text--large'}> <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://twitter.com/lbry'>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://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://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> </div>
</Row> </Row>
</div> </div>

52
client/src/containers/NavigationLinks/view.jsx
View file

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

3
client/src/containers/PublishDisabledMessage/view.jsx
View file

@ -7,6 +7,9 @@ class PublishDisabledMessage extends React.Component {
<div className={'publish-disabled-message'}> <div className={'publish-disabled-message'}>
<div className={'message'}> <div className={'message'}>
<p className={'text--secondary'}>Publishing is currently disabled.</p> <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> <p className={'text--secondary'}>{message}</p>
</div> </div>
</div> </div>

23
server/controllers/assets/utils/getClaimIdAndServeAsset.js
View file

@ -64,18 +64,19 @@ const getClaimIdAndServeAsset = (
claimDataValues.outpoint || claimDataValues.outpoint ||
`${claimDataValues.transaction_hash_id}:${claimDataValues.vout}`; `${claimDataValues.transaction_hash_id}:${claimDataValues.vout}`;
logger.debug('Outpoint:', outpoint); 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 content was found, is approved, and not blocked - log a view.
if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) { // if (headers && headers['user-agent'] && /LBRY/.test(headers['user-agent']) === false) {
db.Views.create({ // db.Views.create({
time: Date.now(), // time: Date.now(),
isChannel: false, // isChannel: false,
claimId: claimDataValues.claim_id || claimDataValues.claimId, // claimId: claimDataValues.claim_id || claimDataValues.claimId,
publisherId: claimDataValues.publisher_id || claimDataValues.certificateId, // publisherId: claimDataValues.publisher_id || claimDataValues.certificateId,
ip, // ip,
}); // });
} // }
}); // });
}) })
.then(() => { .then(() => {
return db.File.findOne({ return db.File.findOne({