调整社交媒体meta标签，支持隐藏默认标签由插件添加

settings.yaml

@@ -78,6 +78,16 @@ spec:
               value: false
             - label: 隐藏
               value: true
+        - $formkit: radio
+          name: social_media
+          label: 社交媒体
+          value: true
+          help: 是否在HTML下添加社交媒体的META参数，隐藏时可由相关插件添加。
+          options:
+            - label: 显示
+              value: true
+            - label: 隐藏
+              value: false
     - group: basic_style
       label: '基础样式'
       formSchema:

templates/common/head.html

@@ -9,18 +9,21 @@ th:with="description=${isPost ? post != null ? post.status.excerpt : singlePage
   <meta name="description" th:content="${description}">
   <meta name="author" th:content="${site.title}">
   <meta name="site" th:content="${site.url}">
+  <th:block th:if="${theme.config.basic_info.social_media}">
     <meta property="og:type" content="website">
     <meta property="og:title" th:content="${site.title}">
-  <meta property="og:url" th:content="${canonical}">
+    <meta property="og:url" th:content="${#strings.startsWith(canonical,'http') ? canonical : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + canonical)}">
     <meta property="og:site_name" th:content="${title}">
     <meta property="og:description" th:content="${description}">
     <meta property="og:locale" content="zh">
-  <meta property="og:image" th:content="${site.logo}">
+    <meta property="og:image" th:content="${#strings.startsWith(site.favicon,'http') ? site.favicon : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + site.favicon)}">
     <meta name="twitter:card" content="summary">
     <meta name="twitter:title" th:content="${title}">
     <meta name="twitter:description" th:content="${description}">
-  <meta name="twitter:image" th:content="${site.logo}">
-  <link rel="canonical" th:href="${canonical}"/>
+    <meta name="twitter:image" th:content="${#strings.startsWith(site.favicon,'http') ? site.favicon : (#strings.endsWith(site.url,'/') ? #strings.substringBefore(site.url, '/') : site.url + site.favicon)}">
+  </th:block>
+
+  <link rel="canonical" th:href="${#strings.startsWith(canonical,'http') ? canonical : (#strings.endsWith(canonical,'/') ? #strings.substringBefore(site.url, '/') : site.url + canonical)}"/>
 
   <link rel="preload stylesheet" as="style" th:href="@{/assets/css/theme.min.css(mew=${theme.spec.version})}">
 <!--  <link rel="preload stylesheet" as="style" th:href="@{/assets/lib/remixicon@3.5.0/remixicon.min.css}">-->

theme.yaml

@@ -22,6 +22,6 @@ spec:
   settingName: theme-dream-setting
   configMapName: theme-dream-configMap
   # 版本号
-  version: 1.0.3
+  version: 1.0.3.11
   # 最低支持的 Halo 版本
   require: ">=2.6.0"