From 71e5b7ca7a254395362f9a367b65933c1f7737dc Mon Sep 17 00:00:00 2001 From: bill bittner Date: Thu, 9 Nov 2017 14:20:25 -0800 Subject: [PATCH 1/3] added needed information to SHOWlITE route --- controllers/publishController.js | 2 +- controllers/serveController.js | 17 +++++++--- helpers/handlebarsHelpers.js | 55 +++++++++++++++----------------- 3 files changed, 39 insertions(+), 35 deletions(-) diff --git a/controllers/publishController.js b/controllers/publishController.js index 84c68750..cdad1998 100644 --- a/controllers/publishController.js +++ b/controllers/publishController.js @@ -67,7 +67,7 @@ module.exports = { resolve(publishResults); // resolve the promise with the result from lbryApi.publishClaim; }) .catch(error => { - logger.error('publishController.publish, error', error); + logger.error('caught a publishController.publish error'); publishHelpers.deleteTemporaryFile(publishParams.file_path); // delete the local file reject(error); }); diff --git a/controllers/serveController.js b/controllers/serveController.js index fb52a8f2..9f36cd62 100644 --- a/controllers/serveController.js +++ b/controllers/serveController.js @@ -204,7 +204,7 @@ module.exports = { } else { fileInfo['fileExt'] = fileInfo.fileName.substring(fileInfo.fileName.lastIndexOf('.') + 1); } - // add stats table + // add a record to the stats table postToStats(method, originalUrl, ip, fileInfo.name, fileInfo.claimId, 'success'); // serve or show switch (method) { @@ -213,8 +213,17 @@ module.exports = { sendGoogleAnalytics(method, headers, ip, originalUrl); return fileInfo; case SHOWLITE: - showFileLite(fileInfo, res); - return fileInfo; + return db.Claim.resolveClaim(fileInfo.name, fileInfo.claimId) + .then(claimRecord => { + fileInfo['title'] = claimRecord.title; + fileInfo['description'] = claimRecord.description; + showFileLite(fileInfo, res); + return fileInfo; + }) + .catch(error => { + logger.error('throwing serverOrShowAsset SHOWLITE error...'); + throw error; + }); case SHOW: return db.Claim .getShortClaimIdFromLongClaimId(fileInfo.claimId, fileInfo.name) @@ -233,7 +242,7 @@ module.exports = { return fileInfo; }) .catch(error => { - logger.error('throwing serve/show error...'); + logger.error('throwing serverOrShowAsset SHOW error...'); throw error; }); default: diff --git a/helpers/handlebarsHelpers.js b/helpers/handlebarsHelpers.js index b4fb3c42..57f501d5 100644 --- a/helpers/handlebarsHelpers.js +++ b/helpers/handlebarsHelpers.js @@ -17,37 +17,32 @@ module.exports = { ); }, addOpenGraph (title, mimeType, showUrl, source, description, thumbnail) { - let basicTags = ` - - - `; + console.log('title', title); + console.log('description', description); + let ogTitle = ``; + let ogUrl = ``; + let ogSiteName = ``; + let ogDescription = ``; + let ogImageWidth = ''; + let ogImageHeight = ''; + let basicTags = `${ogTitle} ${ogUrl} ${ogSiteName} ${ogDescription} ${ogImageWidth} ${ogImageHeight}`; + let ogImage = ``; + let ogImageType = ``; + let ogType = ``; if (mimeType === 'video/mp4') { - return new Handlebars.SafeString( - `${basicTags} - - - - - - - ` - ); - } else if (mimeType === 'image/gif') { - return new Handlebars.SafeString( - `${basicTags} - - - - ` - ); + let ogVideo, ogVideoSecureUrl, ogVideoType; + ogImage = ``; + ogImageType = ``; + ogType = ``; + ogVideo = ``; + ogVideoSecureUrl = ``; + ogVideoType = ``; + return new Handlebars.SafeString(`${basicTags} ${ogImage} ${ogImageType} ${ogType} ${ogVideo} ${ogVideoSecureUrl} ${ogVideoType}`); } else { - return new Handlebars.SafeString( - `${basicTags} - - - - ` - ); + if (mimeType === 'image/gif') { + ogType = ``; + }; + return new Handlebars.SafeString(`${basicTags} ${ogImage} ${ogImageType} ${ogType}`); } }, addTwitterCard (mimeType, source, embedUrl, directFileUrl) { @@ -55,7 +50,7 @@ module.exports = { if (mimeType === 'video/mp4') { return new Handlebars.SafeString( `${basicTwitterTags} - -- 2.45.3 From c1b3a291cb1139088438c57171d0ce79a7b1e031 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Thu, 9 Nov 2017 14:30:13 -0800 Subject: [PATCH 2/3] updated handlebar twitter meta helper --- helpers/handlebarsHelpers.js | 23 ++++++++++------------- 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/helpers/handlebarsHelpers.js b/helpers/handlebarsHelpers.js index 57f501d5..2a75e385 100644 --- a/helpers/handlebarsHelpers.js +++ b/helpers/handlebarsHelpers.js @@ -48,20 +48,17 @@ module.exports = { addTwitterCard (mimeType, source, embedUrl, directFileUrl) { let basicTwitterTags = ``; if (mimeType === 'video/mp4') { - return new Handlebars.SafeString( - `${basicTwitterTags} - - - - - - - ` - ); + let twitterName = ''; + let twitterPlayer = ``; + let twitterPlayerWidth = ''; + let twitterTextPlayerWidth = ''; + let twitterPlayerHeight = ''; + let twitterPlayerStream = ``; + let twitterPlayerStreamContentType = ''; + return new Handlebars.SafeString(`${basicTwitterTags} ${twitterName} ${twitterPlayer} ${twitterPlayerWidth} ${twitterTextPlayerWidth} ${twitterPlayerHeight} ${twitterPlayerStream} ${twitterPlayerStreamContentType}`); } else { - return new Handlebars.SafeString( - `${basicTwitterTags} ` - ); + let twitterCard = ''; + return new Handlebars.SafeString(`${basicTwitterTags} ${twitterCard}`); } }, ifConditional (varOne, operator, varTwo, options) { -- 2.45.3 From 1598ef853a12f936f6e43918c310ea642454345b Mon Sep 17 00:00:00 2001 From: bill bittner Date: Tue, 14 Nov 2017 15:32:14 -0500 Subject: [PATCH 3/3] added fallback description and title for open graph --- helpers/handlebarsHelpers.js | 57 ++++++++++++++++++------------------ 1 file changed, 28 insertions(+), 29 deletions(-) diff --git a/helpers/handlebarsHelpers.js b/helpers/handlebarsHelpers.js index fec9ace6..59275e0c 100644 --- a/helpers/handlebarsHelpers.js +++ b/helpers/handlebarsHelpers.js @@ -2,41 +2,40 @@ const Handlebars = require('handlebars'); const config = require('../config/speechConfig.js'); module.exports = { - // define any extra helpers you may need googleAnalytics () { const googleApiKey = config.analytics.googleId; - return new Handlebars.SafeString( - `` - ); + ga('send', 'pageview');`; + return new Handlebars.SafeString(gaCode); }, addOpenGraph (title, mimeType, showUrl, source, description, thumbnail) { - console.log('title', title); - console.log('description', description); - let ogTitle = ``; - let ogUrl = ``; - let ogSiteName = ``; - let ogDescription = ``; - let ogImageWidth = ''; - let ogImageHeight = ''; - let basicTags = `${ogTitle} ${ogUrl} ${ogSiteName} ${ogDescription} ${ogImageWidth} ${ogImageHeight}`; + if (title === null || title.trim() === '') { + title = 'Spee.ch'; + } + if (description === null || description.trim() === '') { + description = 'Open-source, decentralized image and video sharing.'; + } + const ogTitle = ``; + const ogUrl = ``; + const ogSiteName = ``; + const ogDescription = ``; + const ogImageWidth = ''; + const ogImageHeight = ''; + const basicTags = `${ogTitle} ${ogUrl} ${ogSiteName} ${ogDescription} ${ogImageWidth} ${ogImageHeight}`; let ogImage = ``; let ogImageType = ``; let ogType = ``; if (mimeType === 'video/mp4') { - let ogVideo, ogVideoSecureUrl, ogVideoType; + const ogVideo = ``; + const ogVideoSecureUrl = ``; + const ogVideoType = ``; ogImage = ``; ogImageType = ``; ogType = ``; - ogVideo = ``; - ogVideoSecureUrl = ``; - ogVideoType = ``; return new Handlebars.SafeString(`${basicTags} ${ogImage} ${ogImageType} ${ogType} ${ogVideo} ${ogVideoSecureUrl} ${ogVideoType}`); } else { if (mimeType === 'image/gif') { @@ -46,18 +45,18 @@ module.exports = { } }, addTwitterCard (mimeType, source, embedUrl, directFileUrl) { - let basicTwitterTags = ``; + const basicTwitterTags = ``; if (mimeType === 'video/mp4') { - let twitterName = ''; - let twitterPlayer = ``; - let twitterPlayerWidth = ''; - let twitterTextPlayerWidth = ''; - let twitterPlayerHeight = ''; - let twitterPlayerStream = ``; - let twitterPlayerStreamContentType = ''; + const twitterName = ''; + const twitterPlayer = ``; + const twitterPlayerWidth = ''; + const twitterTextPlayerWidth = ''; + const twitterPlayerHeight = ''; + const twitterPlayerStream = ``; + const twitterPlayerStreamContentType = ''; return new Handlebars.SafeString(`${basicTwitterTags} ${twitterName} ${twitterPlayer} ${twitterPlayerWidth} ${twitterTextPlayerWidth} ${twitterPlayerHeight} ${twitterPlayerStream} ${twitterPlayerStreamContentType}`); } else { - let twitterCard = ''; + const twitterCard = ''; return new Handlebars.SafeString(`${basicTwitterTags} ${twitterCard}`); } }, -- 2.45.3