diff --git a/Gemfile b/Gemfile
index ebde149f0..1adf85231 100755
--- a/Gemfile
+++ b/Gemfile
@@ -15,7 +15,8 @@ group :jekyll_plugins do
# Master Plugins
gem "jekyll-paginate-v2", "= 3.0.0"
gem "jekyll-liquify", "= 0.0.2" # ❌ Version 0.0.3 breaks the site
- gem "jekyll-truthyfalsy", "= 1.0.2"
+ gem "jekyll-truthyfalsy", "~> 1.0"
+ gem "jekyll-uj-powertools", "~> 1.0"
# Project Plugins
end
diff --git a/_includes/master/modules/adunits/adsense-display.html b/_includes/master/modules/adunits/adsense-display.html
index bcdca1d7d..656bb0a98 100644
--- a/_includes/master/modules/adunits/adsense-display.html
+++ b/_includes/master/modules/adunits/adsense-display.html
@@ -1,7 +1,8 @@
{%- if page.advertising.google-adsense == false -%}
{%- elsif layout.advertising.google-adsense == false -%}
{%- elsif site.advertising.google-adsense != false -%}
-
+
+
{%- if include.include-adsense-script == true -%}
{%- endif -%}
@@ -19,4 +20,5 @@
{% include /master/modules/adunits/fallback/insert.html %}
+
{%- endif -%}
diff --git a/_includes/master/modules/adunits/adsense-in-article.html b/_includes/master/modules/adunits/adsense-in-article.html
index 46baf7eba..c4f5b930c 100644
--- a/_includes/master/modules/adunits/adsense-in-article.html
+++ b/_includes/master/modules/adunits/adsense-in-article.html
@@ -1,7 +1,8 @@
{%- if page.advertising.google-adsense == false -%}
{%- elsif layout.advertising.google-adsense == false -%}
{%- elsif site.advertising.google-adsense != false -%}
-
+
+
{%- if include.include-adsense-script == true -%}
{%- endif -%}
@@ -19,4 +20,5 @@
{% include /master/modules/adunits/fallback/insert.html %}
+
{%- endif -%}
diff --git a/_includes/master/modules/adunits/adsense-in-feed.html b/_includes/master/modules/adunits/adsense-in-feed.html
index b1caca4ae..3b7401a64 100644
--- a/_includes/master/modules/adunits/adsense-in-feed.html
+++ b/_includes/master/modules/adunits/adsense-in-feed.html
@@ -1,7 +1,8 @@
{%- if page.advertising.google-adsense == false -%}
{%- elsif layout.advertising.google-adsense == false -%}
{%- elsif site.advertising.google-adsense != false -%}
-
+
+
{%- if include.include-adsense-script == true -%}
{%- endif -%}
@@ -27,4 +28,5 @@
{% include /master/modules/adunits/fallback/insert.html %}
+
{%- endif -%}
diff --git a/_includes/master/modules/adunits/adsense-multiplex.html b/_includes/master/modules/adunits/adsense-multiplex.html
index 7e3038a8f..39f2d24fa 100644
--- a/_includes/master/modules/adunits/adsense-multiplex.html
+++ b/_includes/master/modules/adunits/adsense-multiplex.html
@@ -1,7 +1,8 @@
{%- if page.advertising.google-adsense == false -%}
{%- elsif layout.advertising.google-adsense == false -%}
{%- elsif site.advertising.google-adsense != false -%}
-
+
+
{%- if include.include-adsense-script == true -%}
{%- endif -%}
@@ -18,4 +19,5 @@
{% include /master/modules/adunits/fallback/insert.html %}
+
{%- endif -%}
diff --git a/special/master/feeds/posts-copy.xml b/special/master/feeds/posts-copy.xml
deleted file mode 100644
index 7c345fd6d..000000000
--- a/special/master/feeds/posts-copy.xml
+++ /dev/null
@@ -1,56 +0,0 @@
----
-layout: null
-permalink: /feeds/posts-old.xml
----
-
-
- Jekyll
-
-
- {{ site.time | date_to_xmlschema }}
- {{ site.url }}{{ post.url }}
- {{ site.brand.name }}
-
- {{ site.brand.description }}
-
-
- {% assign sortedFeed = site.posts | limit:10 | sort: 'date' | reverse %}
-
- {% for post in sortedFeed %}
- {%- capture post-title -%}
- {%- if post.meta.title -%}
- {{ post.meta.title }}
- {%- else -%}
- {{ post.post.title }}
- {%- endif -%}
- {%- endcapture -%}
-
-
- {{ post-title }}
-
- {{ post.date | date_to_xmlschema }}
- {{ post.date | date_to_xmlschema }}
-
- {{ site.url }}{{ post.url }}
-
- {{ site.url }}/assets/images/blog/posts/post-{{ post.post.id }}/{{ post.url | split: "/" | last }}.jpg
- {{ site.url }}/assets/images/blog/posts/post-{{ post.post.id }}/{{ post.url | split: "/" | last }}.jpg
-
- {{ post.content | liquify | markdownify }}
-
-
- {{ site.brand.name }}
-
-
-
- {% if post.meta.description %}
- {{ post.meta.description }}
- {% else %}
- {{ post.post.excerpt }}
- {% endif %}
-
-
-
- {% endfor %}
-
-
diff --git a/special/master/feeds/posts.json b/special/master/feeds/posts.json
new file mode 100644
index 000000000..59dd241d3
--- /dev/null
+++ b/special/master/feeds/posts.json
@@ -0,0 +1,41 @@
+---
+layout: null
+permalink: /feeds/posts.json
+---
+
+{
+ "version": "https://jsonfeed.org/version/1",
+ "title": "{{ site.brand.name }} Blog",
+ "home_page_url": "{{ site.url }}/blog",
+ "feed_url": "{{ site.url }}{{ page.url }}",
+ "description": "{{ site.brand.description }}",
+ "generator": "Jekyll {{ jekyll.version }}",
+ "language": "en",
+ "favicon": "{{ site.favicon.path }}",
+ "items": [
+ {%- assign sortedFeed = site.posts | limit:25 | sort: 'date' | reverse -%}
+ {% for post in sortedFeed %}
+ {
+ "id": "{{ site.url }}{{ post.url }}",
+ "url": "{{ site.url }}{{ post.url }}",
+ "title": "{{ post.title | strip_html | strip_newlines | json_escape }}",
+ "date_published": "{{ post.date | date: "%Y-%m-%dT%H:%M:%S" }}.000Z",
+ "image": "{{ post.image }}",
+ "content_text": "{{ post.content | liquify | markdownify | strip_html | json_escape | replace: '\n', ' ' | replace: '\r', ' ' | strip_newlines }}",
+ "content_html": "{{ post.content | liquify | markdownify | strip_ads | json_escape | replace: '\n', ' ' | replace: '\r', ' ' | strip_newlines }}",
+ "authors": [
+ {
+ "name": "{{ site.brand.name }}"
+ }
+ ],
+ "attachments": [
+ {
+ "url": "{{ post.image }}"
+ }
+ ],
+ "summary": "{{ post.post.excerpt | strip_html | strip_newlines | json_escape }}",
+ "tags": ["{{ post.post.category }}"]
+ }{% if forloop.last == false %},{% endif %}
+ {% endfor %}
+ ]
+}
diff --git a/special/master/feeds/posts.xml b/special/master/feeds/posts.xml
index e230c6e05..a4e333676 100644
--- a/special/master/feeds/posts.xml
+++ b/special/master/feeds/posts.xml
@@ -25,8 +25,11 @@ permalink: /feeds/posts.xml
{{ site.time | date: "%a, %d %b %Y %H:%M:%S" }} GMT
+
+
+
- {% assign sortedFeed = site.posts | limit:10 | sort: 'date' | reverse %}
+ {% assign sortedFeed = site.posts | limit:25 | sort: 'date' | reverse %}
{% for post in sortedFeed %}
{%- capture post-title -%}
@@ -62,7 +65,7 @@ permalink: /feeds/posts.xml