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

renamed functions appropriately

Browse source
This commit is contained in:
bill bittner 2018-03-05 15:38:26 -08:00
parent 7b7c435571
commit cc3fa3d067
3 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
controllers/publishController.js
View file

@ -86,7 +86,7 @@ module.exports = {
}); });
}); });
}, },
validateClaimName (name) { claimNameIsAvailable (name) {
// find any records where the name is used // find any records where the name is used
return db.File.findAll({ where: { name } }) return db.File.findAll({ where: { name } })
.then(result => { .then(result => {

2
helpers/publishHelpers.js
View file

@ -86,7 +86,7 @@ module.exports = {
} }
return file; return file;
}, },
createPublishParams (filePath, name, title, description, license, nsfw, thumbnail) { createBasicPublishParams (filePath, name, title, description, license, nsfw, thumbnail) {
logger.debug(`Creating Publish Parameters`); logger.debug(`Creating Publish Parameters`);
// provide defaults for title // provide defaults for title
if (title === null || title.trim() === '') { if (title === null || title.trim() === '') {

12
routes/api-routes.js
View file

@ -3,9 +3,9 @@ const multipart = require('connect-multiparty');
const { files, site } = require('../config/speechConfig.js'); const { files, site } = require('../config/speechConfig.js');
const multipartMiddleware = multipart({uploadDir: files.uploadDirectory}); const multipartMiddleware = multipart({uploadDir: files.uploadDirectory});
const db = require('../models'); const db = require('../models');
const { validateClaimName, checkChannelAvailability, publish } = require('../controllers/publishController.js'); const { claimNameIsAvailable, checkChannelAvailability, publish } = require('../controllers/publishController.js');
const { getClaimList, resolveUri, getClaim } = require('../helpers/lbryApi.js'); const { getClaimList, resolveUri, getClaim } = require('../helpers/lbryApi.js');
const { createPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles, addGetResultsToFileData, createFileData } = require('../helpers/publishHelpers.js'); const { createBasicPublishParams, parsePublishApiRequestBody, parsePublishApiRequestFiles, addGetResultsToFileData, createFileData } = require('../helpers/publishHelpers.js');
const errorHandlers = require('../helpers/errorHandlers.js'); const errorHandlers = require('../helpers/errorHandlers.js');
const { sendGAAnonymousPublishTiming, sendGAChannelPublishTiming } = require('../helpers/googleAnalytics.js'); const { sendGAAnonymousPublishTiming, sendGAChannelPublishTiming } = require('../helpers/googleAnalytics.js');
const { authenticateUser } = require('../auth/authentication.js'); const { authenticateUser } = require('../auth/authentication.js');
@ -108,7 +108,7 @@ module.exports = (app) => {
}); });
// route to check whether this site published to a claim // route to check whether this site published to a claim
app.get('/api/claim/availability/:name', ({ ip, originalUrl, params }, res) => { app.get('/api/claim/availability/:name', ({ ip, originalUrl, params }, res) => {
validateClaimName(params.name) claimNameIsAvailable(params.name)
.then(result => { .then(result => {
res.status(200).json(result); res.status(200).json(result);
}) })
@ -146,8 +146,8 @@ module.exports = (app) => {
// check channel authorization // check channel authorization
Promise.all([ Promise.all([
authenticateUser(channelName, channelId, channelPassword, user), authenticateUser(channelName, channelId, channelPassword, user),
validateClaimName(name), claimNameIsAvailable(name),
createPublishParams(filePath, name, title, description, license, nsfw, thumbnail), createBasicPublishParams(filePath, name, title, description, license, nsfw, thumbnail),
]) ])
.then(([{channelName, channelClaimId}, validatedClaimName, publishParams]) => { .then(([{channelName, channelClaimId}, validatedClaimName, publishParams]) => {
// add channel details to the publish params // add channel details to the publish params
@ -155,8 +155,6 @@ module.exports = (app) => {
publishParams['channel_name'] = channelName; publishParams['channel_name'] = channelName;
publishParams['channel_id'] = channelClaimId; publishParams['channel_id'] = channelClaimId;
} }
logger.debug('validated claim name:', validatedClaimName);
logger.debug('publish params:', publishParams);
// publish the asset // publish the asset
return publish(publishParams, fileName, fileType); return publish(publishParams, fileName, fileType);
}) })