fix(open_graph): incorrect usage of config.url

Author: curbengh

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;

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()}),