diff --git a/core/frontend/meta/author_url.js b/core/frontend/meta/author_url.js index 6e1cb11501..0b368e04b4 100644 --- a/core/frontend/meta/author_url.js +++ b/core/frontend/meta/author_url.js @@ -1,16 +1,17 @@ const urlService = require('../services/url'); +const getContextObject = require('./context_object.js'); function getAuthorUrl(data, absolute) { let context = data.context ? data.context[0] : null; - context = context === 'amp' ? 'post' : context; + const contextObject = getContextObject(data, context); if (data.author) { return urlService.getUrlByResourceId(data.author.id, {absolute: absolute, secure: data.author.secure, withSubdirectory: true}); } - if (data[context] && data[context].primary_author) { - return urlService.getUrlByResourceId(data[context].primary_author.id, {absolute: absolute, secure: data[context].secure, withSubdirectory: true}); + if (contextObject && contextObject.primary_author) { + return urlService.getUrlByResourceId(contextObject.primary_author.id, {absolute: absolute, secure: contextObject.secure, withSubdirectory: true}); } return null; diff --git a/core/frontend/meta/modified_date.js b/core/frontend/meta/modified_date.js index 93432b1b4b..f6fe15e84d 100644 --- a/core/frontend/meta/modified_date.js +++ b/core/frontend/meta/modified_date.js @@ -1,13 +1,13 @@ -const _ = require('lodash'); +const getContextObject = require('./context_object.js'); function getModifiedDate(data) { let context = data.context ? data.context : null; let modDate; - context = _.includes(context, 'amp') ? 'post' : context; + const contextObject = getContextObject(data, context); - if (data[context]) { - modDate = data[context].updated_at || null; + if (contextObject) { + modDate = contextObject.updated_at || null; if (modDate) { return new Date(modDate).toISOString(); } diff --git a/core/frontend/meta/published_date.js b/core/frontend/meta/published_date.js index 044e2ef418..63a5ad02d1 100644 --- a/core/frontend/meta/published_date.js +++ b/core/frontend/meta/published_date.js @@ -1,10 +1,12 @@ +const getContextObject = require('./context_object.js'); + function getPublishedDate(data) { let context = data.context ? data.context[0] : null; - context = context === 'amp' ? 'post' : context; + const contextObject = getContextObject(data, context); - if (data[context] && data[context].published_at) { - return new Date(data[context].published_at).toISOString(); + if (contextObject && contextObject.published_at) { + return new Date(contextObject.published_at).toISOString(); } return null; }