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

refactor error messages for unavailable content

Browse source
This commit is contained in:
Travis Eden 2018-09-20 14:09:01 -04:00
parent 0a74e50167
commit 208c56366f
3 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
server/controllers/api/channel/data/index.js
View file

@ -21,7 +21,7 @@ const channelData = ({ ip, originalUrl, body, params }, res) => {
if (serveOnlyApproved && !isApprovedChannel(chanObj)) { if (serveOnlyApproved && !isApprovedChannel(chanObj)) {
return res.status(404).json({ return res.status(404).json({
success: false, success: false,
message: 'This spee.ch instance serves limited content which does not include this asset', message: 'This content is unavailable',
}); });
} }

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

@ -12,7 +12,7 @@ const NO_CHANNEL = 'NO_CHANNEL';
const NO_CLAIM = 'NO_CLAIM'; const NO_CLAIM = 'NO_CLAIM';
const BLOCKED_CLAIM = 'BLOCKED_CLAIM'; const BLOCKED_CLAIM = 'BLOCKED_CLAIM';
const NO_FILE = 'NO_FILE'; const NO_FILE = 'NO_FILE';
const UNAPPROVED_CHANNEL = 'UNAPPROVED_CHANNEL'; const CONTENT_UNAVAILABLE = 'CONTENT_UNAVAILABLE';
const { publishing: { serveOnlyApproved } } = require('@config/siteConfig'); const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
@ -30,7 +30,7 @@ const getClaimIdAndServeAsset = (channelName, channelClaimId, claimName, claimId
}) })
.then(claim => { .then(claim => {
if (serveOnlyApproved && !isApprovedChannel({ longId: claim.dataValues.certificateId })) { if (serveOnlyApproved && !isApprovedChannel({ longId: claim.dataValues.certificateId })) {
throw new Error(UNAPPROVED_CHANNEL); throw new Error(CONTENT_UNAVAILABLE);
} }
logger.debug('Outpoint:', claim.dataValues.outpoint); logger.debug('Outpoint:', claim.dataValues.outpoint);
return db.Blocked.isNotBlocked(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', message: 'No matching channel id could be found for that url',
}); });
} }
if (error === UNAPPROVED_CHANNEL) { if (error === CONTENT_UNAVAILABLE) {
logger.debug('unapproved channel'); logger.debug('unapproved channel');
return res.status(400).json({ return res.status(400).json({
success: false, 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) { if (error === BLOCKED_CLAIM) {

5
server/models/claim.js
View file

@ -1,11 +1,10 @@
const logger = require('winston'); const logger = require('winston');
const returnShortId = require('./utils/returnShortId.js'); const returnShortId = require('./utils/returnShortId.js');
const isApprovedChannel = require('../utils/isApprovedChannel');
const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('@config/siteConfig'); const { assetDefaults: { thumbnail: defaultThumbnail }, details: { host } } = require('@config/siteConfig');
const { publishing: { serveOnlyApproved } } = require('@config/siteConfig'); const { publishing: { serveOnlyApproved } } = require('@config/siteConfig');
const isApprovedChannel = require('../utils/isApprovedChannel');
const NO_CLAIM = 'NO_CLAIM'; const NO_CLAIM = 'NO_CLAIM';
const NOT_ALLOWED = 'NOT_ALLOWED';
function determineFileExtensionFromContentType (contentType) { function determineFileExtensionFromContentType (contentType) {
switch (contentType) { switch (contentType) {
@ -366,7 +365,7 @@ module.exports = (sequelize, { STRING, BOOLEAN, INTEGER, TEXT, DECIMAL }) => {
}) })
.then(claimArray => { .then(claimArray => {
if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId })) { if (serveOnlyApproved && !isApprovedChannel({ longId: claimArray[0].dataValues.certificateId })) {
reject(NOT_ALLOWED); reject('This content is unavailable');
} }
switch (claimArray.length) { switch (claimArray.length) {
case 0: case 0: