From c3292275b6d164919f9cf3d43e7202508d3a0e64 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?E=CC=81ric=20Gaspar?=
 <46165813+ericgaspar@users.noreply.github.com>
Date: Fri, 30 Jun 2023 13:49:50 +0200
Subject: [PATCH] update to upstream

---
 manifest.toml   | 14 ++++----------
 scripts/install |  7 +++++++
 scripts/upgrade |  7 +++++++
 3 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index c4408c5..43daa77 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -5,7 +5,7 @@ name = "Tiny Tiny RSS"
 description.en = "News feed (RSS/Atom) reader and aggregator"
 description.fr = "Lecteur de flux d’actualité utilisant les protocoles RSS et Atom"
 
-version = "20230603~ynh1"
+version = "20230630~ynh1"
 
 maintainers = []
 
@@ -17,7 +17,7 @@ admindoc = "https://tt-rss.org/wiki.php"
 code = "https://git-gitea.tt-rss.org/fox/tt-rss"
 
 [integration]
-yunohost = ">= 11.1.19"
+yunohost = ">= 11.1.21"
 architectures = "all"
 multi_instance = true
 ldap = false
@@ -40,14 +40,8 @@ ram.runtime = "50M"
 
 [resources]
         [resources.sources.main]
-        url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/d43d6f7dffef14eb026799e1ccb805b758628a80.tar.gz"
-        sha256 = "9a40cd82e8de3d6bdf55316e2cf9a8b300928f5c5ef2d6082898155982929baf"
-
-        #[resources.sources.data_migration]
-        #url = "https://dev.tt-rss.org/tt-rss/ttrss-data-migration/archive/6dac32af20dc303ea2e6e03f3a9492ee3ace6a8a.tar.gz"
-        #sha256 = "dba5638f44820393e795e8dbf5ffdafeb061913aef245ce630ddddfbc26c32c4"
-        #autoupdate.upstream = "https://dev.tt-rss.org/tt-rss/ttrss-data-migration"
-        #autoupdate.strategy = "latest_github_commit"
+        url = "https://gitlab.tt-rss.org/tt-rss/tt-rss/-/archive/dc25a9cf6816b756cb38490eab93f02589c44a10.tar.gz"
+        sha256 = "e67cc86a5c0f6de72a7aa88ad4e52b1cdf2145244aa2f351b618c340f795ee75"
 
     [resources.system_user]
 
diff --git a/scripts/install b/scripts/install
index e0b7e2c..de14f56 100644
--- a/scripts/install
+++ b/scripts/install
@@ -38,6 +38,13 @@ echo "$(ynh_app_upstream_version)" > "$install_dir/version_static.txt"
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
+#=================================================
+# ALTER DATABASE
+#=================================================
+
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
+    <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
+
 #=================================================
 # SYSTEM CONFIGURATION
 #=================================================
diff --git a/scripts/upgrade b/scripts/upgrade
index 2db9b12..356f564 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -68,6 +68,13 @@ fi
 chmod -R o-rwx "$install_dir"
 chown -R $app:www-data "$install_dir"
 
+#=================================================
+# ALTER DATABASE
+#=================================================
+
+ynh_mysql_connect_as --user=$db_user --password="$db_pwd" --database=$db_name \
+    <<< "ALTER DATABASE $db_name CHARACTER SET utf8mb4 COLLATE utf8mb4_general_ci;"
+
 #=================================================
 # REAPPLY SYSTEM CONFIGURATIONS
 #=================================================