From 7bafbe020356a2e9bd2956a31f978355376ebf4f Mon Sep 17 00:00:00 2001
From: Guilherme Silva <626206+guihkx@users.noreply.github.com>
Date: Wed, 21 Feb 2024 09:47:28 -0300
Subject: [PATCH 1/4] Update first-party GitHub actions (#1301)

---
 .github/workflows/rssguard.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/rssguard.yml b/.github/workflows/rssguard.yml
index c828c331f..dfe5756ee 100755
--- a/.github/workflows/rssguard.yml
+++ b/.github/workflows/rssguard.yml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Check script syntax
         run: bash -n ./resources/scripts/github-actions/build-linux-mac.sh
@@ -46,7 +46,7 @@ jobs:
             use_qt5: "ON"
     steps:         
       - name: Checkout source code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
           submodules: true
@@ -60,7 +60,7 @@ jobs:
           FEEDLY_CLIENT_SECRET: ${{ secrets.FEEDLY_CLIENT_SECRET }}
 
       - name: Upload binaries
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           if-no-files-found: error
           name: RSS_Guard-${{ runner.os }}${{ matrix.no_lite == 'ON' && '-' || '-nowebengine-' }}Qt${{ matrix.use_qt5 == 'ON' && '5' || '6' }}
@@ -80,7 +80,7 @@ jobs:
 
     steps:
       - name: Download binaries from previous jobs
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           path: artifacts
 

From a0d6fc2d63220b2a941b55c37ac0cf6af324b368 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <626206+guihkx@users.noreply.github.com>
Date: Wed, 21 Feb 2024 15:19:37 -0300
Subject: [PATCH 2/4] Linux: Fixes for AppStream metadata validation using
 `appstreamcli` (#1302)

* Linux: Remove redundant 'content_rating' tag in AppData file

This fixes a validation error given by appstreamcli:

$ appstreamcli validate io.github.martinrotter.rssguardlite.appdata.xml
E: io.github.martinrotter.rssguardlite:69: tag-duplicated content_rating

https://www.freedesktop.org/software/appstream/docs/chap-Validation.html#asv-tag-duplicated

* Linux: Replace deprecated 'developer_name' tag in AppData file

This is not strictly necessary, but it does fix a deprecation message
shown when validating with appstreamcli, a tool that replaced
appstream-util:

$ appstreamcli validate io.github.martinrotter.rssguardlite.appdata.xml
I: io.github.martinrotter.rssguardlite:8: developer-name-tag-deprecated

https://www.freedesktop.org/software/appstream/docs/chap-Validation.html#asv-developer-name-tag-deprecated

* Linux: Replace appstream-util by appstreamcli to validate AppData file

The appstream-util tool (from appstream-glib) is essentially deprecated
in favor of appstreamcli (from appstream):

https://github.com/hughsie/appstream-glib
---
 resources/desktop/rssguard.metainfo.xml.in          | 5 +++--
 resources/scripts/github-actions/build-linux-mac.sh | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/resources/desktop/rssguard.metainfo.xml.in b/resources/desktop/rssguard.metainfo.xml.in
index cfc23d281..72b5549dd 100644
--- a/resources/desktop/rssguard.metainfo.xml.in
+++ b/resources/desktop/rssguard.metainfo.xml.in
@@ -5,7 +5,9 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <name>@APPDATA_NAME@</name>
-  <developer_name>Martin Rotter</developer_name>
+  <developer id="martinrotter.github.io">
+    <name>Martin Rotter</name>
+  </developer>
   <update_contact>rotter.martinos_AT_gmail.com</update_contact>
   <summary>@APPDATA_SUMMARY@</summary>
   <description>
@@ -65,7 +67,6 @@
     <keyword translate="no">The Old Reader</keyword>
     <keyword translate="no">Tiny Tiny RSS</keyword>
   </keywords>
-  <content_rating type="oars-1.0" />
   <content_rating type="oars-1.1" />
   <releases>
     <release version="@APP_VERSION@" date="@DATE@">
diff --git a/resources/scripts/github-actions/build-linux-mac.sh b/resources/scripts/github-actions/build-linux-mac.sh
index f790ba98f..081e4e57d 100755
--- a/resources/scripts/github-actions/build-linux-mac.sh
+++ b/resources/scripts/github-actions/build-linux-mac.sh
@@ -42,7 +42,7 @@ if [ $is_linux = true ]; then
   sudo add-apt-repository ppa:beineri/opt-qt-5.15.4-focal -y
   sudo apt-get update
 
-  sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream-util
+  sudo apt-get -qy install qt515tools qt515base qt515webengine qt515svg qt515multimedia qt515imageformats appstream
   sudo apt-get -qy install cmake ninja-build openssl libssl-dev libgl1-mesa-dev gstreamer1.0-alsa gstreamer1.0-nice gstreamer1.0-plugins-good gstreamer1.0-plugins-base gstreamer1.0-plugins-bad gstreamer1.0-plugins-ugly gstreamer1.0-qt5 gstreamer1.0-pulseaudio libmpv-dev
 
   # The script below performs some broken testing, which ends up tripping 'set -e'.
@@ -93,7 +93,7 @@ cmake --install . --prefix "$prefix"
 if [ $is_linux = true ]; then
   # Validate AppStream metadata.
   echo 'Validating AppStream metadata...'
-  appstream-util validate-relax "$prefix/share/metainfo/$app_id.metainfo.xml"
+  appstreamcli validate "$prefix/share/metainfo/$app_id.metainfo.xml"
   # Obtain linuxdeployqt.
   wget -qc https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage
   chmod a+x linuxdeployqt-continuous-x86_64.AppImage 

From a51eb709e4bfec726d474c7dcdb8648da81053b0 Mon Sep 17 00:00:00 2001
From: Guilherme Silva <626206+guihkx@users.noreply.github.com>
Date: Sun, 25 Feb 2024 04:51:45 -0300
Subject: [PATCH 3/4] Linux: Update developer ID in AppStream metadata (#1305)

From the documentation:

"It is recommended to use a reverse-DNS name, like org.gnome or
io.github.ximion, or a Fediverse handle (like @user@example.org) as ID
to achieve a higher chance of uniqueness."

https://www.freedesktop.org/software/appstream/docs/chap-Metadata.html#tag-developer
---
 resources/desktop/rssguard.metainfo.xml.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/desktop/rssguard.metainfo.xml.in b/resources/desktop/rssguard.metainfo.xml.in
index 72b5549dd..60e44cf05 100644
--- a/resources/desktop/rssguard.metainfo.xml.in
+++ b/resources/desktop/rssguard.metainfo.xml.in
@@ -5,7 +5,7 @@
   <metadata_license>CC0-1.0</metadata_license>
   <project_license>GPL-3.0</project_license>
   <name>@APPDATA_NAME@</name>
-  <developer id="martinrotter.github.io">
+  <developer id="io.github.martinrotter">
     <name>Martin Rotter</name>
   </developer>
   <update_contact>rotter.martinos_AT_gmail.com</update_contact>

From 661e0a7c8af8b49da6125f4b618ddb9b58795e62 Mon Sep 17 00:00:00 2001
From: martinrotter <martinrotter@users.noreply.github.com>
Date: Mon, 26 Feb 2024 08:10:40 +0100
Subject: [PATCH 4/4] Update filters.md

---
 docs/source/features/filters.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/source/features/filters.md b/docs/source/features/filters.md
index 7cc0a04db..e150afa06 100644
--- a/docs/source/features/filters.md
+++ b/docs/source/features/filters.md
@@ -5,7 +5,7 @@ Sometimes you need to automatically tweak the incoming article - mark it starred
 ## `Article filters` dialog
 The dialog seen below offers you a way of managing your article filters. You can assign single filter to multiple feeds.
 
-`Test` button tests selected filter against existing messages. `Process checked feeds` runs the filter against messages from checked feeds.
+`Test` button tests selected filter against existing messages. `Process checked feeds` runs the filter against existing messages from checked feeds - in this mode all modifications made by the filter are saved to existing messages.
 
 <img alt="alt-img" src="images/filters-dialog.png" width="600px">
 
@@ -296,4 +296,4 @@ function filterMessage() {
 
   return MessageObject.Accept;
 }
-```
\ No newline at end of file
+```