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

added narrow image check for show to serve flip

Browse source
This commit is contained in:
bill bittner 2017-12-13 14:55:26 -08:00
parent 703c075de3
commit ac14231f66
1 changed files with 15 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
routes/serve-routes.js
View file

@ -44,8 +44,14 @@ function showChannelPageToClient (channelName, channelClaimId, originalUrl, ip,
});
}
function clientAcceptsHtml (headers) {
return headers['accept'] && headers['accept'].split(',').includes('text/html');
function clientAcceptsHtml ({accept}) {
return accept && accept.match(/text\/html/);
}
function clientWantsAsset ({accept}) {
const imageIsWanted = accept && accept.match(/image\/.*/) && !accept.match(/text\/html/) && !accept.match(/text\/\*/); // checks if an image is accepted, but not a video
const videoIsWanted = false;
return imageIsWanted || videoIsWanted;
}
function determineResponseType (isServeRequest, headers) {
@ -57,7 +63,8 @@ function determineResponseType (isServeRequest, headers) {
}
} else {
responseType = SHOW;
if (!clientAcceptsHtml(headers)) { // this is in case someone embeds a show url
if (clientWantsAsset(headers)) { // this is in case someone embeds a show url
logger.debug('Show request actually want\'s an asset!');
responseType = SERVE;
}
}
@ -68,8 +75,8 @@ function showAssetToClient (claimId, name, res) {
return Promise
.all([db.Claim.resolveClaim(name, claimId), db.Claim.getShortClaimIdFromLongClaimId(claimId, name)])
.then(([claimInfo, shortClaimId]) => {
logger.debug('claimInfo:', claimInfo);
logger.debug('shortClaimId:', shortClaimId);
// logger.debug('claimInfo:', claimInfo);
// logger.debug('shortClaimId:', shortClaimId);
return serveHelpers.showFile(claimInfo, shortClaimId, res);
})
.catch(error => {
@ -81,8 +88,8 @@ function showLiteAssetToClient (claimId, name, res) {
return Promise
.all([db.Claim.resolveClaim(name, claimId), db.Claim.getShortClaimIdFromLongClaimId(claimId, name)])
.then(([claimInfo, shortClaimId]) => {
logger.debug('claimInfo:', claimInfo);
logger.debug('shortClaimId:', shortClaimId);
// logger.debug('claimInfo:', claimInfo);
// logger.debug('shortClaimId:', shortClaimId);
return serveHelpers.showFileLite(claimInfo, shortClaimId, res);
})
.catch(error => {
@ -93,7 +100,7 @@ function showLiteAssetToClient (claimId, name, res) {
function serveAssetToClient (claimId, name, res) {
return getLocalFileRecord(claimId, name)
.then(fileInfo => {
logger.debug('fileInfo:', fileInfo);
// logger.debug('fileInfo:', fileInfo);
if (fileInfo === NO_FILE) {
return res.status(307).redirect(`/api/claim-get/${name}/${claimId}`);
}