From 478b8983fa2cfae4c786db67308a576623d708b0 Mon Sep 17 00:00:00 2001 From: bill bittner Date: Wed, 6 Dec 2017 14:47:50 -0800 Subject: [PATCH] added thumbnail content type to og metadata --- helpers/handlebarsHelpers.js | 4 ++-- models/claim.js | 25 +++++++++++++++++++++++++ 2 files changed, 27 insertions(+), 2 deletions(-) diff --git a/helpers/handlebarsHelpers.js b/helpers/handlebarsHelpers.js index df8f9732..0af35749 100644 --- a/helpers/handlebarsHelpers.js +++ b/helpers/handlebarsHelpers.js @@ -12,7 +12,7 @@ module.exports = { ga('send', 'pageview');`; return new Handlebars.SafeString(gaCode); }, - addOpenGraph ({ ogTitle, contentType, ogDescription, thumbnail, showUrl, source }) { + addOpenGraph ({ ogTitle, contentType, ogDescription, thumbnail, showUrl, source, ogThumbnailContentType }) { const ogTitleTag = ``; const ogUrlTag = ``; const ogSiteNameTag = ``; @@ -28,7 +28,7 @@ module.exports = { const ogVideoSecureUrlTag = ``; const ogVideoTypeTag = ``; ogImageTag = ``; - // ogImageTypeTag = ``; // note: might not be png. needs to check if gif or jpg etc depending on thubmnail + ogImageTypeTag = ``; ogTypeTag = ``; return new Handlebars.SafeString(`${basicTags} ${ogImageTag} ${ogImageTypeTag} ${ogTypeTag} ${ogVideoTag} ${ogVideoSecureUrlTag} ${ogVideoTypeTag}`); } else { diff --git a/models/claim.js b/models/claim.js index a8cce414..2c0269ae 100644 --- a/models/claim.js +++ b/models/claim.js @@ -21,6 +21,23 @@ function determineFileExtensionFromContentType (contentType) { } }; +function determineContentTypeFromFileExtension (fileExtension) { + switch (fileExtension) { + case 'jpeg': + case 'jpg': + return 'image/jpg'; + case 'png': + return 'image/png'; + case 'gif': + return 'image/gif'; + case 'mp4': + return 'video/mp4'; + default: + logger.info('setting unknown file type as type image/jpg'); + return 'image/jpg'; + } +}; + function ifEmptyReturnOther (value, replacement) { if (value === '') { return replacement; @@ -40,6 +57,13 @@ function determineOgDescription (storedDescription, defaultDescription) { return ifEmptyReturnOther(storedDescription, defaultDescription); }; +function determineOgThumbnailContentType (thumbnail) { + if (thumbnail.lastIndexOf('.') !== -1) { + return determineContentTypeFromFileExtension(thumbnail.substring(thumbnail.lastIndexOf('.'))); + } + return ''; +} + function addOpengraphDataToClaim (claim) { claim['embedUrl'] = `https://spee.ch/embed/${claim.claimId}/${claim.name}`; claim['showUrl'] = `https://spee.ch/${claim.claimId}/${claim.name}`; @@ -47,6 +71,7 @@ function addOpengraphDataToClaim (claim) { claim['directFileUrl'] = `https://spee.ch/${claim.claimId}/${claim.name}.${claim.fileExt}`; claim['ogTitle'] = determineOgTitle(claim.title, DEFAULT_TITLE); claim['ogDescription'] = determineOgDescription(claim.description, DEFAULT_DESCRIPTION); + claim['ogThumbnailContentType'] = determineOgThumbnailContentType(claim.thumbnail); }; function prepareClaimData (claimData) {