From 678d7c808b1af4e611d9463bd6baaf840d8a7d78 Mon Sep 17 00:00:00 2001 From: curbengh <43627182+curbengh@users.noreply.github.com> Date: Wed, 18 Dec 2019 04:41:19 +0000 Subject: [PATCH] fix(open_graph): incorrect usage of config.url --- lib/plugins/helper/open_graph.js | 11 +++-------- test/scripts/helpers/open_graph.js | 2 +- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/lib/plugins/helper/open_graph.js b/lib/plugins/helper/open_graph.js index 1efd62bd5f..bb228e90f9 100644 --- a/lib/plugins/helper/open_graph.js +++ b/lib/plugins/helper/open_graph.js @@ -1,14 +1,9 @@ 'use strict'; -<<<<<<< HEAD const { parse, resolve } = require('url'); const { isMoment, isDate } = require('moment'); -const { encodeURL, htmlTag, stripHTML, escapeHTML } = require('hexo-util'); -======= -const urlFn = require('url'); -const moment = require('moment'); -const { htmlTag, prettyUrls, stripHTML, escapeHTML } = require('hexo-util'); ->>>>>>> fix(open_graph-helper): pass all pretty_urls options +const { prettyUrls, htmlTag, stripHTML, escapeHTML } = require('hexo-util'); + const localeMap = { 'en': 'en_US', 'de': 'de_DE', @@ -50,7 +45,7 @@ function openGraphHelper(options = {}) { let keywords = page.keywords || (page.tags && page.tags.length ? page.tags : undefined) || config.keywords; const title = options.title || page.title || config.title; const type = options.type || (this.is_post() ? 'article' : 'website'); - const url = prettyUrls(options.url || this.url || config.url, config.pretty_urls); + const url = prettyUrls(options.url || this.url, config.pretty_urls); const siteName = options.site_name || config.title; const twitterCard = options.twitter_card || 'summary'; const date = options.date !== false ? options.date || page.date : false; diff --git a/test/scripts/helpers/open_graph.js b/test/scripts/helpers/open_graph.js index c384c1453c..b6f88cba3e 100644 --- a/test/scripts/helpers/open_graph.js +++ b/test/scripts/helpers/open_graph.js @@ -34,7 +34,7 @@ describe('open_graph', () => { }).should.eql([ meta({property: 'og:type', content: 'website'}), meta({property: 'og:title', content: hexo.config.title}), - meta({property: 'og:url', content: escapeHTML(hexo.config.url)}), + meta({property: 'og:url'}), meta({property: 'og:site_name', content: hexo.config.title}), meta({property: 'og:locale', content: 'en_US'}), meta({property: 'article:published_time', content: post.date.toISOString()}),