Fix merge conflicts

_config.yml

@@ -1033,7 +1033,11 @@ Open_Graph_meta:
 
 # Structured Data
 # https://developers.google.com/search/docs/guides/intro-structured-data
-structured_data: false
+structured_data:
+  enable: false
+  # Alternate name for the site, used in structured data
+  # Format: ['name1', 'name2']
+  alternate_name:
 
 # Add the vendor prefixes to ensure compatibility
 css_prefix: true

layout/includes/head/structured_data.pug

@@ -40,10 +40,22 @@ if theme.structured_data
       const isRootOrSubdomain = currentPath.split('/').filter(Boolean).length === 0;
 
       if (isRootOrSubdomain) {
+        const domain = new URL(config.url).hostname;
+        const alternateNames = theme.structured_data.alternate_name || [];
+
+        if (config.subtitle) {
+          alternateNames.push(config.subtitle);
+        }
+
+        if (domain) {
+          alternateNames.push(domain);
+        }
+
         const jsonLd = {
           "@context": "https://schema.org",
           "@type": "WebSite",
           "name": config.title,
+          "alternateName": alternateNames,
           "url": full_url_for('/'),
         }
 

scripts/common/default_config.js

@@ -574,7 +574,10 @@ module.exports = {
     enable: true,
     option: null
   },
-  structured_data: false,
+  structured_data: {
+    enable: false,
+    alternate_name: null
+  },
   css_prefix: true,
   inject: {
     head: null,

scripts/helpers/page.js

@@ -53,7 +53,7 @@ hexo.extend.helper.register('urlNoIndex', function (url = null, trailingIndex =
 })
 
 hexo.extend.helper.register('md5', function (path) {
-  return crypto.createHash('md5').update(decodeURI(this.url_for(path))).digest('hex')
+  return crypto.createHash('md5').update(decodeURI(this.url_for(path, {relative: false}))).digest('hex')
 })
 
 hexo.extend.helper.register('injectHtml', data => {