breaking changes: Open_Graph_meta 設置更改，可配置其它參數

feature: 更新 Facebook sdk 到 v15
improvement: 更新 plugins.yml
Remove: 移除 meta keywords

_config.yml

@@ -857,7 +857,16 @@ lazyload:
 
 # Open graph meta tags
 # https://developers.facebook.com/docs/sharing/webmasters/
-Open_Graph_meta: true
+Open_Graph_meta:
+  enable: true
+  option:
+    # twitter_card:
+    # twitter_image:
+    # twitter_id:
+    # twitter_site:
+    # google_plus:
+    # fb_admins:
+    # fb_app_id:
 
 # Add the vendor prefixes to ensure compatibility
 css_prefix: true

layout/includes/head.pug

@@ -7,11 +7,6 @@
 
 - var isSubtitle = config.subtitle ? ' - ' + config.subtitle : ''
 - var tabTitle = is_home() || !pageTitle ? config.title + isSubtitle : pageTitle + ' | ' + config.title
-
-- var pageKeywords
-- if (page.keywords) pageKeywords = Array.isArray(page.keywords) ? (page.keywords).join(',') :  ([]).join(',') || page.keywords
-- else if (page.tags && page.tags.length) pageKeywords = page.tags.data.map(function(tag) {return tag.name;}).join(',')
-- else pageKeywords = Array.isArray(config.keywords) ? (config.keywords).join(','):  ([]).join(',') || config.keywords
 - var pageAuthor = config.email ? config.author + ',' + config.email : config.author
 - var pageCopyright = config.copyright || config.author
 - var themeColorLight = theme.theme_color && theme.theme_color.enable && theme.theme_color.meta_theme_color_light || '#ffffff'
@@ -22,8 +17,6 @@ meta(charset='UTF-8')
 meta(http-equiv="X-UA-Compatible" content="IE=edge")
 meta(name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=no")
 title= tabTitle
-if pageKeywords
-  meta(name="keywords" content=pageKeywords)
 meta(name="author" content=pageAuthor)
 meta(name="copyright" content=pageCopyright)
 meta(name ="format-detection" content="telephone=no")

layout/includes/head/Open_Graph.pug

@@ -1,11 +1,13 @@
-if theme.Open_Graph_meta
+if theme.Open_Graph_meta.enable
-  - let contentType = is_post() ? 'article' : 'website'
+  -
-  - let metaImage = (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : ''
+    let ogOption = Object.assign({
-  - let fb_appId = theme.facebook_comments.app_id || ''
+      type: is_post() ? 'article' : 'website',
-  - let fb_admins = theme.facebook_comments.user_id || ''
+      image: (page.cover || theme.avatar.img) ? full_url_for(page.cover || theme.avatar.img) : '',
-
+      fb_admins: theme.facebook_comments.user_id || '',
-  != open_graph({type: contentType, image: metaImage, fb_admins: fb_admins, fb_app_id: fb_appId})
+      fb_app_id: theme.facebook_comments.app_id || '',
-
+    }, theme.Open_Graph_meta.option)
+  -
+  != open_graph(ogOption)
 else
   meta(name="description" content=page_description())
 

layout/includes/third-party/card-post-count/fb.pug

@@ -1,4 +1,4 @@
-- const fbSDKVer = 'v14.0'
+- const fbSDKVer = 'v15.0'
 - const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.

layout/includes/third-party/chat/messenger.pug

@@ -9,7 +9,7 @@ script.
   window.fbAsyncInit = function() {
     FB.init({
       xfbml: true,
-      version: 'v14.0'
+      version: 'v15.0'
     });
   };
 

layout/includes/third-party/comments/facebook_comments.pug

@@ -1,4 +1,4 @@
-- const fbSDKVer = 'v14.0'
+- const fbSDKVer = 'v15.0'
 - const fbSDK = theme.messenger.enable ? `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk/xfbml.customerchat.js#xfbml=1&version=${fbSDKVer}` : `https://connect.facebook.net/${theme.facebook_comments.lang}/sdk.js#xfbml=1&version=${fbSDKVer}`
 
 script.

layout/includes/third-party/pjax.pug

@@ -7,7 +7,7 @@ if theme.pjax.exclude
 
 - let choose = theme.comments.use
 if choose
-  if theme.Open_Graph_meta && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
+  if theme.Open_Graph_meta.enable && (choose.includes('Livere') || choose.includes('Utterances') || choose.includes('Giscus'))
     - pjaxSelectors.unshift('meta[property="og:image"]', 'meta[property="og:title"]', 'meta[property="og:url"]')
   if choose.includes('Utterances') || choose.includes('Giscus')
     - pjaxSelectors.unshift('link[rel="canonical"]')

package.json

@@ -1,6 +1,6 @@
 {
   "name": "hexo-theme-butterfly",
-  "version": "4.5.0-b3",
+  "version": "4.5.0",
   "description": "A Simple and Card UI Design theme for Hexo",
   "main": "package.json",
   "scripts": {

plugins.yml

@@ -5,7 +5,7 @@ algolia_search_v4:
 instantsearch_v4:
   name: instantsearch.js
   file: dist/instantsearch.production.min.js
-  version: 4.46.3
+  version: 4.48.1
 pjax:
   name: pjax
   file: pjax.min.js
@@ -42,12 +42,12 @@ waline_js:
   name: '@waline/client'
   file: dist/waline.js
   other_name: waline
-  version: 2.11.3
+  version: 2.13.0
 waline_css:
   name: '@waline/client'
   file: dist/waline.css
   other_name: waline
-  version: 2.11.3
+  version: 2.13.0
 sharejs:
   name: butterfly-extsrc
   file: sharejs/dist/js/social-share.min.js

source/css/_layout/third-party.styl

@@ -25,11 +25,8 @@
   --waline-theme-color: $button-bg
   --waline-active-color: $button-hover-color
 
-  .vuser
+  .wl-comment-actions > button:not(last-child)
-    transition: all .5s
+    padding-right: 4px
-
-    &:hover
-      transform: rotate(360deg)
 
 if hexo-config('valine.bg')
   #vcomment

source/js/main.js

@@ -477,7 +477,7 @@ document.addEventListener('DOMContentLoaded', function () {
       // handle some cases
       typeof utterancesTheme === 'function' && utterancesTheme()
       typeof changeGiscusTheme === 'function' && changeGiscusTheme()
-      typeof FB === 'object' && window.loadFBComment()
+      typeof FB === 'object' && window.loadFBComment && window.loadFBComment()
       typeof runMermaid === 'function' && window.runMermaid()
     },
     showOrHideBtn: (e) => { // rightside 點擊設置 按鈕 展開