From abd45df7137525b3c0e6ba348ff83006d294905b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E1=B4=8D=C9=AA=E1=B4=8D=C9=AA?= <1119186082@qq.com>
Date: Sun, 1 Sep 2019 10:22:18 +0800
Subject: [PATCH] Use nunjucks-compatible syntax & operator (#1068)

* Replace && with and

* Replace || with or

* Replace ! with not

* Use ES6 includes method
---
 layout/_layout.swig                            | 11 +++++------
 layout/_macro/post-collapse.swig               | 10 +++++-----
 layout/_macro/post.swig                        | 12 ++++++------
 layout/_partials/analytics/lean-analytics.swig |  2 +-
 layout/_partials/footer.swig                   |  2 +-
 layout/_partials/head/head-unique.swig         | 11 ++---------
 layout/_partials/head/head.swig                |  9 ++++++++-
 layout/_partials/header/index.swig             |  4 ++--
 layout/_partials/header/sub-menu.swig          |  2 +-
 layout/_partials/page/breadcrumb.swig          | 10 +++++-----
 layout/_partials/post/post-copyright.swig      |  4 ++--
 layout/_partials/post/post-related.swig        |  4 ++--
 layout/_partials/post/post-reward.swig         |  2 +-
 layout/_third-party/comments/valine.swig       |  2 +-
 layout/_third-party/facebook-sdk.swig          |  2 +-
 layout/_third-party/quicklink.swig             |  2 +-
 layout/page.swig                               |  2 +-
 17 files changed, 45 insertions(+), 46 deletions(-)

diff --git a/layout/_layout.swig b/layout/_layout.swig
index 5e148adcf6..10ed81f2cb 100644
--- a/layout/_layout.swig
+++ b/layout/_layout.swig
@@ -4,10 +4,10 @@
 {%- set version = next_env('version') %}
 
 {# Language & Config #}
-{%- set title = __('title') !== 'title' && __('title') || config.title %}
-{%- set subtitle = __('subtitle') !== 'subtitle' && __('subtitle') || config.subtitle %}
-{%- set author = __('author') !== 'author' && __('author') || config.author %}
-{%- set description = __('description') !== 'description' && __('description') || config.description %}
+{%- set title = __('title') !== 'title' and __('title') or config.title %}
+{%- set subtitle = __('subtitle') !== 'subtitle' and __('subtitle') or config.subtitle %}
+{%- set author = __('author') !== 'author' and __('author') or config.author %}
+{%- set description = __('description') !== 'description' and __('description') or config.description %}
 
 {%- if theme.pjax %}
   {%- set pjax = ' pjax' %}
@@ -19,7 +19,6 @@
   {% include '_partials/head/head-unique.swig' %}
   {{- next_inject('head') }}
   <title>{% block title %}{% endblock %}</title>
-  <meta name="generator" content="Hexo {{ hexo_env('version') }}">
   {{ partial('_third-party/analytics/index.swig', {}, {cache: theme.cache.enable}) }}
   {{ partial('_scripts/noscript.swig', {}, {cache: theme.cache.enable}) }}
 </head>
@@ -37,7 +36,7 @@
     <main id="main" class="main">
       <div class="main-inner">
         <div class="content-wrap">
-          {%- if theme.scheme === 'Pisces' || theme.scheme === 'Gemini' %}
+          {%- if theme.scheme === 'Pisces' or theme.scheme === 'Gemini' %}
             {% include '_partials/header/sub-menu.swig' %}
           {%- endif %}
           <div id="content" class="content">
diff --git a/layout/_macro/post-collapse.swig b/layout/_macro/post-collapse.swig
index 7a028cce67..4b57a9dcae 100644
--- a/layout/_macro/post-collapse.swig
+++ b/layout/_macro/post-collapse.swig
@@ -1,13 +1,13 @@
 {% macro render(posts) %}
 {%- for post in posts %}
 
-  {%- set year %}
-  {%- set post.year = date(post.date, 'YYYY') %}
+  {%- set current_year %}
+  {%- set year = date(post.date, 'YYYY') %}
 
-  {%- if post.year !== year %}
-    {%- set year = post.year %}
+  {%- if year !== current_year %}
+    {%- set current_year = year %}
     <div class="collection-year">
-      <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="collection-header">{{ year }}</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
+      <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="collection-header">{{ current_year }}</{%- if theme.seo %}h2{% else %}h1{%- endif %}>
     </div>
   {%- endif %}
 
diff --git a/layout/_macro/post.swig b/layout/_macro/post.swig
index 651ac0b0d5..e777151812 100644
--- a/layout/_macro/post.swig
+++ b/layout/_macro/post.swig
@@ -17,7 +17,7 @@
 
     {%- if post.header !== false %}
       <header class="post-header">
-        <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction &&post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">{#
+        <{%- if theme.seo %}h2{% else %}h1{%- endif %} class="post-title{%- if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="name headline">{#
         #}{# Link posts #}{#
         #}{%- if post.link %}
             {%- if post.sticky > 0 %}
@@ -54,7 +54,7 @@
               </span>
               <span class="post-meta-item-text">{{ __('post.posted') }}</span>
 
-              {%- if !date_diff && time_diff && theme.post_meta.updated_at.enable && theme.post_meta.updated_at.another_day %}
+              {%- if not date_diff and time_diff and theme.post_meta.updated_at.enable and theme.post_meta.updated_at.another_day %}
                 {%- set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) + ' / ' + __('post.modified') + __('symbol.colon') + time(post.updated) %}
               {% else %}
                 {%- set create_title = __('post.created') + __('symbol.colon') + full_date(post.date) %}
@@ -66,10 +66,10 @@
             </span>
           {%- endif %}
 
-          {%- if theme.post_meta.updated_at.enable && datetime_diff %}
-            {%- set display_updated = !theme.post_meta.updated_at.another_day || theme.post_meta.updated_at.another_day && date_diff %}
+          {%- if theme.post_meta.updated_at.enable and datetime_diff %}
+            {%- set display_updated = not theme.post_meta.updated_at.another_day or theme.post_meta.updated_at.another_day and date_diff %}
 
-            {%- if display_updated or !theme.post_meta.created_at %}
+            {%- if display_updated or not theme.post_meta.created_at %}
               <span class="post-meta-item">
                 <span class="post-meta-item-icon">
                   <i class="fa fa-calendar-check-o"></i>
@@ -174,7 +174,7 @@
     {#################}
     {### POST BODY ###}
     {#################}
-    <div class="post-body{%- if post.direction && post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="articleBody">
+    <div class="post-body{%- if post.direction and post.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}" itemprop="articleBody">
 
       {# Gallery support #}
       {%- if post.photos and post.photos.length %}
diff --git a/layout/_partials/analytics/lean-analytics.swig b/layout/_partials/analytics/lean-analytics.swig
index 0c46f7819d..c9a223cab0 100644
--- a/layout/_partials/analytics/lean-analytics.swig
+++ b/layout/_partials/analytics/lean-analytics.swig
@@ -1,4 +1,4 @@
-{%- if theme.leancloud_visitors.enable and !theme.valine.visitor %}
+{%- if theme.leancloud_visitors.enable and not theme.valine.visitor %}
   {# custom analytics part create by xiamo; edited by LEAFERx #}
   <script{{ pjax }}>
   function leancloudSelector(url) {
diff --git a/layout/_partials/footer.swig b/layout/_partials/footer.swig
index 6865f9f8a3..82720ae390 100644
--- a/layout/_partials/footer.swig
+++ b/layout/_partials/footer.swig
@@ -12,7 +12,7 @@
   <span class="with-love" id="animate">
     <i class="fa fa-{{ theme.footer.icon.name }}"></i>
   </span>
-  <span class="author" itemprop="copyrightHolder">{{ theme.footer.copyright || author }}</span>
+  <span class="author" itemprop="copyrightHolder">{{ theme.footer.copyright or author }}</span>
 
   {%- if config.symbols_count_time.total_symbols %}
     <span class="post-meta-divider">|</span>
diff --git a/layout/_partials/head/head-unique.swig b/layout/_partials/head/head-unique.swig
index 4ee4ae3393..2d831655d0 100644
--- a/layout/_partials/head/head-unique.swig
+++ b/layout/_partials/head/head-unique.swig
@@ -1,15 +1,8 @@
 {{ open_graph() }}
 
-{%- if theme.rss === '' and config.feed and config.feed.path %}
-  {%- set theme.rss = config.feed.path %}
-{%- endif %}
-{%- if theme.rss %}
-  <link rel="alternate" href="{{ url_for(theme.rss) }}" title="{{ title }}" type="application/atom+xml">
-{%- endif %}
-
 {%- if theme.canonical %}
-  {%- set without_index = url.replace('index.html', '') %}
-  {%- set without_html = without_index.replace('.html', '') %}
+  {%- set without_index = url | replace('index.html', '') %}
+  {%- set without_html = without_index | replace('.html', '') %}
   <link rel="canonical" href="{{ without_html }}">
 {%- endif %}
 
diff --git a/layout/_partials/head/head.swig b/layout/_partials/head/head.swig
index cb7f724ed1..2e27de8493 100644
--- a/layout/_partials/head/head.swig
+++ b/layout/_partials/head/head.swig
@@ -1,7 +1,7 @@
 <meta charset="UTF-8">
 <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=2">
 <meta name="theme-color" content="{{ theme.android_chrome_color }}">
-<meta http-equiv="X-UA-Compatible" content="IE=edge">
+<meta name="generator" content="Hexo {{ hexo_env('version') }}">
 
 {%- if theme.favicon.apple_touch_icon %}
   <link rel="apple-touch-icon" sizes="180x180" href="{{ url_for(theme.favicon.apple_touch_icon) }}?v={{ version }}">
@@ -22,6 +22,13 @@
   <meta name="msapplication-config" content="{{ url_for(theme.favicon.ms_browserconfig) }}">
 {%- endif %}
 
+{%- if theme.rss === '' and config.feed.path %}
+  {%- set theme.rss = config.feed.path %}
+{%- endif %}
+{%- if theme.rss %}
+  <link rel="alternate" href="{{ url_for(theme.rss) }}" title="{{ title }}" type="application/atom+xml">
+{%- endif %}
+
 {%- if theme.disable_baidu_transformation %}
   <meta http-equiv="Cache-Control" content="no-transform">
   <meta http-equiv="Cache-Control" content="no-siteapp">
diff --git a/layout/_partials/header/index.swig b/layout/_partials/header/index.swig
index 2ff942a464..9d656905c7 100644
--- a/layout/_partials/header/index.swig
+++ b/layout/_partials/header/index.swig
@@ -1,11 +1,11 @@
 {{ partial('_partials/header/brand.swig', {}, {cache: theme.cache.enable}) }}
 
-{%- set hasSearch = theme.algolia_search.enable || theme.local_search.enable %}
+{%- set hasSearch = theme.algolia_search.enable or theme.local_search.enable %}
 
 <nav class="site-nav">
   {{ partial('_partials/header/menu.swig', {}, {cache: theme.cache.enable}) }}
 
-  {%- if theme.scheme === 'Muse' || theme.scheme === 'Mist' %}
+  {%- if theme.scheme === 'Muse' or theme.scheme === 'Mist' %}
     {% include 'sub-menu.swig' %}
   {%- endif %}
 </nav>
diff --git a/layout/_partials/header/sub-menu.swig b/layout/_partials/header/sub-menu.swig
index efba694ead..01a0c5a02f 100644
--- a/layout/_partials/header/sub-menu.swig
+++ b/layout/_partials/header/sub-menu.swig
@@ -1,4 +1,4 @@
-{%- if not is_home() && not is_post() %}
+{%- if not is_home() and not is_post() %}
   {%- if theme.menu %}
 
     {% import '../../_macro/menu/menu-item.swig' as menu_item %}
diff --git a/layout/_partials/page/breadcrumb.swig b/layout/_partials/page/breadcrumb.swig
index bf3ddc3e2b..267617f0aa 100644
--- a/layout/_partials/page/breadcrumb.swig
+++ b/layout/_partials/page/breadcrumb.swig
@@ -5,7 +5,7 @@
   {%- set link = '' %}
   <ul class="breadcrumb">
     {%- for path in paths %}
-      {%- set current += 1 %}
+      {%- set current = current + 1 %}
       {%- if path != 'index.html' %}
         {%- if current == count - 1 and paths[count - 1] == 'index.html' %}
           <li>{{ path | upper }}</li>
@@ -13,12 +13,12 @@
           {%- if link == '' %}
             {%- set link = '/' + path %}
           {% else %}
-            {%- set link += '/' + path %}
+            {%- set link = link + '/' + path %}
           {%- endif %}
-          {%- if path.indexOf('.html') == -1 %}
-            <li><a href="{{ url_for(link) }}/">{{ path | upper }}</a></li>
+          {%- if path.includes('.html') %}
+            <li>{{ path | replace('.html', '') | upper }}</li>
           {% else %}
-            <li>{{ path.replace('.html', '') | upper }}</li>
+            <li><a href="{{ url_for(link) }}/">{{ path | upper }}</a></li>
           {%- endif %}
         {%- endif %}
       {%- endif %}
diff --git a/layout/_partials/post/post-copyright.swig b/layout/_partials/post/post-copyright.swig
index 17c0503c8d..56c4b136f7 100644
--- a/layout/_partials/post/post-copyright.swig
+++ b/layout/_partials/post/post-copyright.swig
@@ -13,11 +13,11 @@
 <ul class="post-copyright">
   <li class="post-copyright-author">
     <strong>{{ __('post.copyright.author') + __('symbol.colon') }} </strong>{#
-  #}{{ post.author || author }}{#
+  #}{{ post.author or author }}{#
 #}</li>
   <li class="post-copyright-link">
     <strong>{{ __('post.copyright.link') + __('symbol.colon') }}</strong>
-    {%- set postURL = post.url || post.permalink %}
+    {%- set postURL = post.url or post.permalink %}
     {{ next_url(postURL, postURL, {title: post.title}) }}
   </li>
   <li class="post-copyright-license">
diff --git a/layout/_partials/post/post-related.swig b/layout/_partials/post/post-related.swig
index 3a055411f0..7f8cb57d7b 100644
--- a/layout/_partials/post/post-related.swig
+++ b/layout/_partials/post/post-related.swig
@@ -7,11 +7,11 @@
       {%- if popular_post.date and popular_post.date != '' %}
         <div class="popular-posts-date">{{ popular_post.date }}</div>
       {%- endif %}
-      {%- if popular_post.img && popular_post.img != '' %}
+      {%- if popular_post.img and popular_post.img != '' %}
         <div class="popular-posts-img"><img src="{{ popular_post.img }}"></div>
       {%- endif %}
       <div class="popular-posts-title"><a href="{{ popular_post.path }}" rel="bookmark">{{ popular_post.title }}</a></div>
-      {%- if popular_post.excerpt && popular_post.excerpt != '' %}
+      {%- if popular_post.excerpt and popular_post.excerpt != '' %}
         <div class="popular-posts-excerpt"><p>{{ popular_post.excerpt }}</p></div>
       {%- endif %}
     </li>
diff --git a/layout/_partials/post/post-reward.swig b/layout/_partials/post/post-reward.swig
index 7f9ca7e236..99ad60accd 100644
--- a/layout/_partials/post/post-reward.swig
+++ b/layout/_partials/post/post-reward.swig
@@ -7,7 +7,7 @@
 
     {%- for name, image in theme.reward %}
       {%- set builtin = ['wechatpay', 'alipay', 'bitcoin'] %}
-      {%- if builtin.indexOf(name) !== -1 %}
+      {%- if builtin.includes(name) %}
         {%- set translation = __('reward.' + name) %}
       {% else %}
         {%- set translation = name %}
diff --git a/layout/_third-party/comments/valine.swig b/layout/_third-party/comments/valine.swig
index 297c624476..7f643cdf04 100644
--- a/layout/_third-party/comments/valine.swig
+++ b/layout/_third-party/comments/valine.swig
@@ -5,7 +5,7 @@ NexT.utils.getScript('{{ valine_uri }}', () => {
   var GUEST = ['nick', 'mail', 'link'];
   var guest = '{{ theme.valine.guest_info }}';
   guest = guest.split(',').filter(item => {
-    return GUEST.indexOf(item) > -1;
+    return GUEST.includes(item);
   });
   new Valine({
     el: '#comments',
diff --git a/layout/_third-party/facebook-sdk.swig b/layout/_third-party/facebook-sdk.swig
index 019cbc4a0e..0c8ce5f193 100644
--- a/layout/_third-party/facebook-sdk.swig
+++ b/layout/_third-party/facebook-sdk.swig
@@ -11,7 +11,7 @@
       var js, fjs = d.getElementsByTagName(s)[0];
       if (d.getElementById(id)) {return;}
       js = d.createElement(s); js.id = id;
-      js.src = "//connect.facebook.net/{{ config.language|replace('-', '_') }}/sdk.js";
+      js.src = "//connect.facebook.net/{{ config.language | replace('-', '_') }}/sdk.js";
       fjs.parentNode.insertBefore(js, fjs);
     }(document, 'script', 'facebook-jssdk'));
   </script>
diff --git a/layout/_third-party/quicklink.swig b/layout/_third-party/quicklink.swig
index 755f0d3600..25c428170d 100644
--- a/layout/_third-party/quicklink.swig
+++ b/layout/_third-party/quicklink.swig
@@ -22,7 +22,7 @@
         quicklink({
           timeout: {{ theme.quicklink.timeout }},
           priority: {{ theme.quicklink.priority }},
-          ignores: [uri => uri.includes('#'),uri => uri == '{{ url.replace('index.html', '') }}',{{ theme.quicklink.ignores }}]
+          ignores: [uri => uri.includes('#'),uri => uri == '{{ url | replace('index.html', '') }}',{{ theme.quicklink.ignores }}]
         });
       {%- if theme.quicklink.delay %}
         });
diff --git a/layout/page.swig b/layout/page.swig
index 6fdbbf20da..1e903b6125 100644
--- a/layout/page.swig
+++ b/layout/page.swig
@@ -26,7 +26,7 @@
       {#################}
       {### PAGE BODY ###}
       {#################}
-      <div class="post-body{%- if page.direction && page.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}">
+      <div class="post-body{%- if page.direction and page.direction.toLowerCase() === 'rtl' %} rtl{%- endif %}">
         {# tagcloud page support #}
         {%- if page.type === 'tags' %}
           <div class="tag-cloud">