From 1f63130c6f675a6fc6f3321f3bf895adc6124964 Mon Sep 17 00:00:00 2001
From: j m <1406993111@qq.com>
Date: Sun, 31 Mar 2024 09:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=A4=BE=E4=BA=A4=E5=AA=92?=
 =?UTF-8?q?=E4=BD=93meta=E6=A0=87=E7=AD=BE=EF=BC=8C=E6=94=AF=E6=8C=81?=
 =?UTF-8?q?=E9=9A=90=E8=97=8F=E9=BB=98=E8=AE=A4=E6=A0=87=E7=AD=BE=E7=94=B1?=
 =?UTF-8?q?=E6=8F=92=E4=BB=B6=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 settings.yaml              | 10 ++++++++++
 templates/common/head.html | 27 +++++++++++++++------------
 theme.yaml                 |  2 +-
 3 files changed, 26 insertions(+), 13 deletions(-)

diff --git a/settings.yaml b/settings.yaml
index 01ead42..83037fe 100644
--- a/settings.yaml
+++ b/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:
diff --git a/templates/common/head.html b/templates/common/head.html
index 7499fd1..64d02f7 100644
--- a/templates/common/head.html
+++ b/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}">
-  <meta property="og:type" content="website">
-  <meta property="og:title" th:content="${site.title}">
-  <meta property="og:url" th:content="${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 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}"/>
+  <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="${#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="${#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="${#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}">-->
diff --git a/theme.yaml b/theme.yaml
index 1367421..5e0657f 100644
--- a/theme.yaml
+++ b/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"
\ No newline at end of file