From d0de387829254da0ac8421ada3d0346640fe3b20 Mon Sep 17 00:00:00 2001
From: MDLeom <2809763-curben@users.noreply.gitlab.com>
Date: Wed, 1 Jul 2020 07:52:00 +0100
Subject: [PATCH] refactor(sitemap): object shorthand

---
 themes/chameleon/scripts/sitemap/generator.js | 31 ++++++++-----------
 themes/chameleon/scripts/sitemap/index.js     |  3 +-
 2 files changed, 14 insertions(+), 20 deletions(-)

diff --git a/themes/chameleon/scripts/sitemap/generator.js b/themes/chameleon/scripts/sitemap/generator.js
index 12bf0ce..bb23f5d 100644
--- a/themes/chameleon/scripts/sitemap/generator.js
+++ b/themes/chameleon/scripts/sitemap/generator.js
@@ -13,13 +13,15 @@ const isMatch = (path, patterns) => {
 }
 
 module.exports = function (locals) {
-  const config = this.config
+  const { config } = this
+  const { sitemap, skip_render } = config
+  const { path } = sitemap
   const skipRenderList = ['*.js', '*.css']
 
-  if (Array.isArray(config.skip_render)) {
-    skipRenderList.push(...config.skip_render)
-  } else if (config.skip_render != null) {
-    skipRenderList.push(config.skip_render)
+  if (Array.isArray(skip_render)) {
+    skipRenderList.push(...skip_render)
+  } else if (skip_render != null) {
+    skipRenderList.push(skip_render)
   }
 
   const posts = [].concat(locals.posts.toArray(), locals.pages.toArray())
@@ -38,22 +40,15 @@ module.exports = function (locals) {
 
   // configuration dictionary
   const xmlConfig = {
-    config: config,
-    posts: posts
+    config,
+    posts,
+    tags: locals.tags.toArray()
   }
 
-  if (config.sitemap.tags !== false) {
-    xmlConfig.tags = locals.tags.toArray()
-  }
-
-  if (config.sitemap.categories !== false) {
-    xmlConfig.categories = locals.categories.toArray()
-  }
-
-  const xml = template(config).render(xmlConfig)
+  const data = template(config).render(xmlConfig)
 
   return {
-    path: config.sitemap.path,
-    data: xml
+    path,
+    data
   }
 }
diff --git a/themes/chameleon/scripts/sitemap/index.js b/themes/chameleon/scripts/sitemap/index.js
index 0da1d40..ea4d954 100644
--- a/themes/chameleon/scripts/sitemap/index.js
+++ b/themes/chameleon/scripts/sitemap/index.js
@@ -9,8 +9,7 @@
 const pathFn = require('path')
 
 const config = hexo.config.sitemap = Object.assign({
-  path: 'sitemap.xml',
-  tags: true
+  path: 'sitemap.xml'
 }, hexo.config.sitemap)
 
 if (!pathFn.extname(config.path)) {