From 3e38daa82d6c99cd759333cb22dec97d71ac4e8b Mon Sep 17 00:00:00 2001
From: Robin Krom <robin.krom@gmail.com>
Date: Mon, 2 Mar 2020 15:07:28 +0100
Subject: [PATCH] Fixing the project-feed.xml and update-feed.json to contain
 minimal values.

---
 Gemfile          |  4 ++--
 _config.yml      |  7 ++++---
 project-feed.xml | 22 ++++++++++++----------
 update-feed.json |  4 ++--
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/Gemfile b/Gemfile
index 4710da00a..91ceacd3c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -1,2 +1,2 @@
-source 'http://rubygems.org'
-gem 'github-pages'
\ No newline at end of file
+source 'https://rubygems.org'
+gem 'github-pages', group: :jekyll_plugins
\ No newline at end of file
diff --git a/_config.yml b/_config.yml
index dcf68675b..18b44edaf 100644
--- a/_config.yml
+++ b/_config.yml
@@ -4,12 +4,12 @@ title: Greenshot
 description: Greenshot - a free screenshot tool optimized for productivity
 baseurl: ""
 # TODO change URL to getgreenshot.org
-url: http://getgreenshot.org
+url: https://getgreenshot.org
 twitter_username: greenshot_tool
 github_username: greenshot
 #facebook: Greenshot.Tool
-googleplus: 108405649004966849465
 openhub_project: greenshot
+repository: "greenshot/greenshot"
 
 metarobots: index,follow
 
@@ -36,8 +36,9 @@ markdown: kramdown
 permalink: pretty
 exclude: ['README.md', 'Gemfile.lock', 'Gemfile', 'CNAME', 'LICENSE', '*.sh', '.git']
 
-gems:
+plugins:
   - jemoji
+  - github-pages
   - jekyll-feed
   - jekyll-sitemap
   - jekyll-redirect-from
diff --git a/project-feed.xml b/project-feed.xml
index 1bd994fd1..e4a578d04 100644
--- a/project-feed.xml
+++ b/project-feed.xml
@@ -3,21 +3,23 @@ permalink: project-feed/
 ---
 <?xml version="1.0" encoding="utf-8"?>
 <rss version="2.0">
-	<channel>{% assign sorted-releases = site.github.releases | where: "release.draft", "false" | where: "release.prerelease", "false" %}
+	<channel>
 		<title>Greenshot</title>
 		<link>https://getgreenshot.org</link>
-		<description>Greenshot update feed</description>{% for release in sorted-releases limit:1 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}
-		<item>
-			<title>{{asset.name}}</title>
-			<link>http://sourceforge/projects/greenshot/files/release/Greenshot/{{asset.name}}/download</link>
-			<pubDate>{{asset.created_at | date_to_rfc822}}</pubDate>
-			<description>{{asset.label}}</description>
-		</item>{% break %}{% endif %}{% endfor %}{% endfor %}
-		{% for release in sorted-releases %}{% for asset in release.assets limit:1 %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}<item>
+		<description>Greenshot update feed</description>
+		{% assign sorted-releases2 = site.github.releases | where: "draft", "false" | where: "prerelease", "false" %}
+		{% for release in sorted-releases2 limit:1 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}<item>
 			<title>{{asset.name}}</title>
 			<link>{{asset.browser_download_url}}</link>
 			<pubDate>{{asset.created_at | date_to_rfc822}}</pubDate>
 			<description>{{asset.label}}</description>
-		</item>{% break %}{% endif %}{% endfor %}{% endfor %}
+		</item>{% endif %}{% endfor %}{% endfor %}
+		{% assign sorted-releases = site.github.releases | where: "draft", "false" | where: "prerelease", "false" %}
+		{% for release in sorted-releases limit:1 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' and asset.name contains 'RELEASE'%}<item>
+			<title>{{asset.name}}</title>
+			<link>http://sourceforge/projects/greenshot/files/release/Greenshot/{{asset.name}}/download</link>
+			<pubDate>{{asset.created_at | date_to_rfc822}}</pubDate>
+			<description>{{asset.label}}</description>
+		</item>{% endif %}{% endfor %}{% endfor %}
 	</channel>
 </rss>
\ No newline at end of file
diff --git a/update-feed.json b/update-feed.json
index cd57c014d..6f79bfa4f 100644
--- a/update-feed.json
+++ b/update-feed.json
@@ -1,13 +1,13 @@
 ---
 permalink: update-feed.json
 ---
-{% assign sorted-releases = site.github.releases | where: "release.draft", "false" | where: "release.prerelease", "false" %}{
+{% assign sorted-releases = site.github.releases | where: "draft", "false" | where: "prerelease", "false" %}{
 	"releases": [{% for release in sorted-releases limit:2 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' %}{
 			"link": "{{asset.browser_download_url}}",
 			"version": "{{release.tag_name}}",
 			"publishDate": "{{asset.created_at}}"
 		}{% if forloop.last == false%},{% endif %}{% endif %}{% endfor %}{% endfor %}
-	],{% assign sorted-unstables = site.github.releases | where: "release.draft", "false" | where: "release.prerelease", "true" %}
+	],{% assign sorted-unstables = site.github.releases | where: "draft", "false" | where: "prerelease", "true" %}
 	"betas": [{% for release in sorted-unstables limit:2 %}{% for asset in release.assets %}{% if asset.name contains 'Greenshot-INSTALLER' %}{
 			"link": "{{asset.browser_download_url}}",
 			"version": "{{release.tag_name}}",