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

merged master spee.ch branch

Browse source
This commit is contained in:
bill bittner 2018-03-13 09:07:25 -07:00
commit bf836c83df
11 changed files with 80 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

56
controllers/publishController.js
View file

@ -2,7 +2,9 @@ const logger = require('winston');
const db = require('../models');
const lbryApi = require('../helpers/lbryApi.js');
const publishHelpers = require('../helpers/publishHelpers.js');
const { publishing: { primaryClaimAddress } } = require('../config/siteConfig.js');
const { publishing: { primaryClaimAddress, additionalClaimAddresses } } = require('../config/siteConfig.js');
const Sequelize = require('sequelize');
const Op = Sequelize.Op;
module.exports = {
publish (publishParams, fileName, fileType) {
@ -87,36 +89,42 @@ module.exports = {
});
},
claimNameIsAvailable (name) {
const claimAddresses = additionalClaimAddresses || [];
claimAddresses.push(primaryClaimAddress);
// find any records where the name is used
return db.File.findAll({ where: { name } })
return db.Claim
.findAll({
attributes: ['address'],
where : {
name,
address: {
[Op.or]: claimAddresses,
},
},
})
.then(result => {
if (result.length >= 1) {
// filter out any results that were not published from spee.ch's wallet address
const filteredResult = result.filter((claim) => {
return (claim.address === primaryClaimAddress);
});
// return based on whether any non-spee.ch claims were left
if (filteredResult.length >= 1) {
throw new Error('That claim is already in use');
};
return name;
throw new Error('That claim is already in use');
};
return name;
})
.catch(error => {
throw error;
});
},
checkChannelAvailability (name) {
return new Promise((resolve, reject) => {
// find any records where the name is used
db.Channel.findAll({ where: { channelName: name } })
.then(result => {
if (result.length >= 1) {
return resolve(false);
}
resolve(true);
})
.catch(error => {
reject(error);
});
});
return db.Channel
.findAll({
where: { channelName: name },
})
.then(result => {
if (result.length >= 1) {
throw new Error('That channel has already been claimed');
}
return name;
})
.catch(error => {
throw error;
});
},
};

1
helpers/publishHelpers.js
View file

@ -1,5 +1,6 @@
const logger = require('winston');
const fs = require('fs');
const { details, publishing } = require('../config/siteConfig.js');
module.exports = {

3
models/claim.js
View file

@ -348,14 +348,13 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
where: { name, claimId },
})
.then(claimArray => {
logger.debug('claims found on resolve:', claimArray.length);
switch (claimArray.length) {
case 0:
return resolve(null);
case 1:
return resolve(prepareClaimData(claimArray[0].dataValues));
default:
logger.error(`more than one entry matches that name (${name}) and claimID (${claimId})`);
logger.error(`more than one record matches ${name}#${claimId} in db.Claim`);
return resolve(prepareClaimData(claimArray[0].dataValues));
}
})

12
public/assets/css/general.css
View file

@ -85,11 +85,14 @@ h3, p {
font-size: x-large;
}
.text--large {
font-size: 2rem;
}
.text--disabled {
color: #9b9b9b;
}
.pull-quote {
font-size: 3rem;
margin-top: 1rem;
@ -165,6 +168,11 @@ a, a:visited {
color: #9b9b9b;
}
.link--disabled-text {
color: #9b9b9b;
text-decoration: underline;
}
.link--nav {
color: black;
border-bottom: 2px solid white;
@ -504,7 +512,7 @@ table {
/* PUBLISH FORM */
.dropzone {
.dropzone, .dropzone--disabled {
border: 2px dashed #9b9b9b;
text-align: center;
position: relative;

2
react/components/AboutPage/index.jsx
View file

@ -20,7 +20,7 @@ class AboutPage extends React.Component {
</div><div className='column column--5 column--med-10 align-content-top'>
<div className='column column--8 column--med-10'>
<p>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.</p>
<p>Spee.ch is a hosting service, but with the added benefit that it stores your content on a decentralized network of computers -- the LBRY network. This means that your images are stored in multiple locations without a single point of failure.</p>
<p>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.io/get'>LBRY</a> network. This means that your images are stored in multiple locations without a single point of failure.</p>
<h3>Contribute</h3>
<p>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>If you want to improve spee.ch, join our <a className='link--primary' href='https://discord.gg/YjYbwhS'>discord channel</a> or solve one of our <a className='link--primary' href='https://github.com/lbryio/spee.ch/issues'>github issues</a>.</p>

34
react/containers/ChannelCreateForm/view.jsx
View file

@ -38,12 +38,8 @@ class ChannelCreateForm extends React.Component {
updateIsChannelAvailable (channel) {
const channelWithAtSymbol = `@${channel}`;
request(`/api/channel/availability/${channelWithAtSymbol}`)
.then(isAvailable => {
if (isAvailable) {
this.setState({'error': null});
} else {
this.setState({'error': 'That channel has already been claimed'});
}
.then(() => {
this.setState({'error': null});
})
.catch((error) => {
this.setState({'error': error.message});
@ -51,21 +47,9 @@ class ChannelCreateForm extends React.Component {
}
checkIsChannelAvailable (channel) {
const channelWithAtSymbol = `@${channel}`;
return new Promise((resolve, reject) => {
request(`/api/channel/availability/${channelWithAtSymbol}`)
.then(isAvailable => {
if (!isAvailable) {
return reject(new Error('That channel has already been claimed'));
}
resolve();
})
.catch((error) => {
reject(error);
});
});
return request(`/api/channel/availability/${channelWithAtSymbol}`);
}
checkIsPasswordProvided () {
const password = this.state.password;
checkIsPasswordProvided (password) {
return new Promise((resolve, reject) => {
if (!password || password.length < 1) {
return reject(new Error('Please provide a password'));
@ -94,9 +78,9 @@ class ChannelCreateForm extends React.Component {
}
createChannel (event) {
event.preventDefault();
this.checkIsPasswordProvided()
this.checkIsPasswordProvided(this.state.password)
.then(() => {
return this.checkIsChannelAvailable(this.state.channel, this.state.password);
return this.checkIsChannelAvailable(this.state.channel);
})
.then(() => {
this.setState({status: 'We are publishing your new channel. Sit tight...'});
@ -107,7 +91,11 @@ class ChannelCreateForm extends React.Component {
this.props.onChannelLogin(result.channelName, result.shortChannelId, result.channelClaimId);
})
.catch((error) => {
this.setState({'error': error.message, status: null});
if (error.message) {
this.setState({'error': error.message, status: null});
} else {
this.setState({'error': error, status: null});
};
});
}
render () {

5
react/containers/PublishTool/index.js
View file

@ -3,8 +3,9 @@ import View from './view';
const mapStateToProps = ({ publish }) => {
return {
file : publish.file,
status: publish.status.status,
disabled: publish.disabled,
file : publish.file,
status : publish.status.status,
};
};

11
react/containers/PublishTool/view.jsx
View file

@ -5,6 +5,14 @@ import PublishStatus from 'containers/PublishStatus';
class PublishTool extends React.Component {
render () {
if (this.props.disabled) {
return (
<div className='row dropzone--disabled row--tall flex-container--column flex-container--center-center'>
<p className='text--disabled'>Publishing is temporarily disabled.</p>
<p className='text--disabled'>Please check back soon or join our <a className='link--disabled-text' href='https://discord.gg/YjYbwhS'>discord channel</a> for updates.</p>
</div>
);
}
if (this.props.file) {
if (this.props.status) {
return (
@ -13,9 +21,8 @@ class PublishTool extends React.Component {
} else {
return <PublishDetails />;
}
} else {
return <Dropzone />;
}
return <Dropzone />;
}
};

1
react/containers/ShowAssetDetails/view.jsx
View file

@ -29,7 +29,6 @@ class ShowAssetDetails extends React.Component {
</div>
</div>
</div>
}
</div>
);
};

2
react/reducers/publish.js
View file

@ -1,7 +1,9 @@
import * as actions from 'constants/publish_action_types';
import { LOGIN } from 'constants/publish_channel_select_states';
const { publishing } = require('../../config/siteConfig.js');
const initialState = {
disabled : publishing.disabled,
publishInChannel : false,
selectedChannel : LOGIN,
showMetadataInputs: false,

22
routes/api-routes.js
View file

@ -16,14 +16,12 @@ const NO_CLAIM = 'NO_CLAIM';
module.exports = (app) => {
// route to check whether site has published to a channel
app.get('/api/channel/availability/:name', ({ ip, originalUrl, params }, res) => {
checkChannelAvailability(params.name)
.then(result => {
if (result === true) {
res.status(200).json(true);
} else {
res.status(200).json(false);
}
app.get('/api/channel/availability/:name', ({ ip, originalUrl, params: { name } }, res) => {
const gaStartTime = Date.now();
checkChannelAvailability(name)
.then(availableName => {
res.status(200).json(availableName);
sendGATimingEvent('end-to-end', 'claim name availability', name, gaStartTime, Date.now());
})
.catch(error => {
errorHandlers.handleErrorResponse(originalUrl, ip, error, res);
@ -107,10 +105,12 @@ module.exports = (app) => {
});
});
// route to check whether this site published to a claim
app.get('/api/claim/availability/:name', ({ ip, originalUrl, params }, res) => {
claimNameIsAvailable(params.name)
app.get('/api/claim/availability/:name', ({ ip, originalUrl, params: { name } }, res) => {
const gaStartTime = Date.now();
claimNameIsAvailable(name)
.then(result => {
res.status(200).json(result);
sendGATimingEvent('end-to-end', 'claim name availability', name, gaStartTime, Date.now());
})
.catch(error => {
errorHandlers.handleErrorResponse(originalUrl, ip, error, res);
@ -128,8 +128,6 @@ module.exports = (app) => {
});
// route to run a publish request on the daemon
app.post('/api/claim/publish', multipartMiddleware, ({ body, files, headers, ip, originalUrl, user }, res) => {
logger.debug('api/claim/publish req.body:', body);
logger.debug('api/claim/publish req.files:', files);
// define variables
let channelName, channelId, channelPassword, description, fileName, filePath, fileType, gaStartTime, license, name, nsfw, thumbnail, thumbnailFileName, thumbnailFilePath, thumbnailFileType, title;
// record the start time of the request