diff --git a/blog.py b/blog.py index 0666e8677..d9cf7e704 100644 --- a/blog.py +++ b/blog.py @@ -431,12 +431,18 @@ def htmlBlogPost(session, authorized: bool, instanceTitle = \ getConfigParam(baseDir, 'instanceTitle') published = postJsonObject['object']['published'] + modified = published + if postJsonObject['object'].get('updated'): + modified = postJsonObject['object']['updated'] title = postJsonObject['object']['summary'] + url = '' + if postJsonObject['object'].get('url'): + url = postJsonObject['object']['url'] snippet = _getSnippetFromBlogContent(postJsonObject, systemLanguage) blogStr = htmlHeaderWithBlogMarkup(cssFilename, instanceTitle, httpPrefix, domainFull, nickname, - systemLanguage, published, - title, snippet) + systemLanguage, published, modified, + title, snippet, translate, url) _htmlBlogRemoveCwButton(blogStr, translate) blogStr += _htmlBlogPostContent(debug, session, authorized, baseDir, diff --git a/webapp_utils.py b/webapp_utils.py index 55a97c973..b03cb8a05 100644 --- a/webapp_utils.py +++ b/webapp_utils.py @@ -795,8 +795,10 @@ def htmlHeaderWithWebsiteMarkup(cssFilename: str, instanceTitle: str, def htmlHeaderWithBlogMarkup(cssFilename: str, instanceTitle: str, httpPrefix: str, domain: str, nickname: str, - systemLanguage: str, published: str, - title: str, snippet: str) -> str: + systemLanguage: str, + published: str, modified: str, + title: str, snippet: str, + translate: {}, url: str) -> str: """html header which includes blog post markup https://schema.org/BlogPosting """ @@ -814,7 +816,7 @@ def htmlHeaderWithBlogMarkup(cssFilename: str, instanceTitle: str, ' "@type" : "BlogPosting",\n' + \ ' "headline": "' + title + '",\n' + \ ' "datePublished": "' + published + '",\n' + \ - ' "dateModified": "' + published + '",\n' + \ + ' "dateModified": "' + modified + '",\n' + \ ' "author": {\n' + \ ' "@type": "Person",\n' + \ ' "name": "' + nickname + '",\n' + \ @@ -829,9 +831,23 @@ def htmlHeaderWithBlogMarkup(cssFilename: str, instanceTitle: str, ' "description": "' + snippet + '"\n' + \ ' }\n' + \ ' \n' + + ogMetadata = \ + ' \n' + \ + ' \n' + \ + ' \n' + \ + ' \n' + \ + ' \n' + \ + ' \n' + \ + ' ' + htmlStr = \ - htmlHeaderWithExternalStyle(cssFilename, instanceTitle, blogMarkup, - systemLanguage) + htmlHeaderWithExternalStyle(cssFilename, instanceTitle, + ogMetadata + blogMarkup, systemLanguage) return htmlStr