From 483c61a99a77f37b198fd2fba604e19509c8129a Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 8 Jul 2024 03:39:15 +0200
Subject: [PATCH 1/3] Upgrade to v2024.07.07

---
 manifest.toml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/manifest.toml b/manifest.toml
index e7963bf..cb1f1a0 100644
--- a/manifest.toml
+++ b/manifest.toml
@@ -7,7 +7,7 @@ name = "Glitch-Soc"
 description.en = "Libre and federated social network, fork of Mastodon"
 description.fr = "Réseau social libre et fédéré, scission de Mastodon"
 
-version = "2024.07.04~ynh1"
+version = "2024.07.07~ynh1"
 
 maintainers = ["Tagada"]
 
@@ -50,8 +50,8 @@ ram.runtime = "500M"
 [resources]
     [resources.sources]
         [resources.sources.main]
-        url = "https://github.com/glitch-soc/mastodon/archive/05cfe04415084995ccc01b6c737edb39c9dd8411.tar.gz"
-        sha256 = "a8947d8f1171c1099852f0d1501cecd0ca9ad95c77b69395c4d2e78feebc1142"
+        url = "https://github.com/glitch-soc/mastodon/archive/69766370fd65bb7a48dddfd247e0b22f72409f4f.tar.gz"
+        sha256 = "048722ffa7a00f125c7743fd53ceb0f70734750a114da09abd60a1effb9c5f09"
 
         autoupdate.strategy = "latest_github_commit"
 

From 6963e2faef8bf65042124e18988b67e49d943724 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Mon, 8 Jul 2024 01:39:17 +0000
Subject: [PATCH 2/3] Auto-update READMEs

---
 README.md         | 2 +-
 README_es.md      | 2 +-
 README_eu.md      | 2 +-
 README_fr.md      | 2 +-
 README_gl.md      | 2 +-
 README_zh_Hans.md | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index 6ed60c6..5216666 100644
--- a/README.md
+++ b/README.md
@@ -45,7 +45,7 @@ It shall NOT be edited by hand.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Shipped version:** 2024.07.04~ynh1
+**Shipped version:** 2024.07.07~ynh1
 ## Documentation and resources
 
 - Official app website: <https://glitch-soc.github.io/docs/>
diff --git a/README_es.md b/README_es.md
index 538030e..915d233 100644
--- a/README_es.md
+++ b/README_es.md
@@ -45,7 +45,7 @@ No se debe editar a mano.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Versión actual:** 2024.07.04~ynh1
+**Versión actual:** 2024.07.07~ynh1
 ## Documentaciones y recursos
 
 - Sitio web oficial: <https://glitch-soc.github.io/docs/>
diff --git a/README_eu.md b/README_eu.md
index f2d2f37..9e0e20d 100644
--- a/README_eu.md
+++ b/README_eu.md
@@ -45,7 +45,7 @@ EZ editatu eskuz.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Paketatutako bertsioa:** 2024.07.04~ynh1
+**Paketatutako bertsioa:** 2024.07.07~ynh1
 ## Dokumentazioa eta baliabideak
 
 - Aplikazioaren webgune ofiziala: <https://glitch-soc.github.io/docs/>
diff --git a/README_fr.md b/README_fr.md
index 925ebd7..dc010a5 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -45,7 +45,7 @@ Il NE doit PAS être modifié à la main.
 Voir plus [sur la documentation](https://glitch-soc.github.io/docs/) (en anglais).
 
 
-**Version incluse :** 2024.07.04~ynh1
+**Version incluse :** 2024.07.07~ynh1
 ## Documentations et ressources
 
 - Site officiel de l’app : <https://glitch-soc.github.io/docs/>
diff --git a/README_gl.md b/README_gl.md
index cf547fa..7e96773 100644
--- a/README_gl.md
+++ b/README_gl.md
@@ -45,7 +45,7 @@ NON debe editarse manualmente.
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**Versión proporcionada:** 2024.07.04~ynh1
+**Versión proporcionada:** 2024.07.07~ynh1
 ## Documentación e recursos
 
 - Web oficial da app: <https://glitch-soc.github.io/docs/>
diff --git a/README_zh_Hans.md b/README_zh_Hans.md
index 2707ac5..55fd970 100644
--- a/README_zh_Hans.md
+++ b/README_zh_Hans.md
@@ -45,7 +45,7 @@
 See more [on the documentation](https://glitch-soc.github.io/docs/).
 
 
-**分发版本：** 2024.07.04~ynh1
+**分发版本：** 2024.07.07~ynh1
 ## 文档与资源
 
 - 官方应用网站： <https://glitch-soc.github.io/docs/>

From 259c07b4258507e4d06bc5cb7e11f17761a2e7bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= <felix@piedallu.me>
Date: Sat, 13 Jul 2024 13:31:38 +0200
Subject: [PATCH 3/3] Full_replace=1 in upgrade

---
 scripts/upgrade | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 3b5ee1e..ae7edf0 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -82,7 +82,7 @@ ynh_exec_warn_less ynh_install_nodejs --nodejs_version=$nodejs_version
 ynh_script_progression --message="Upgrading source files..." --weight=1
 
 # Download Mastodon
-ynh_setup_source --dest_dir="$install_dir/live" --keep="public/system/"
+ynh_setup_source --dest_dir="$install_dir/live" --full_replace=1 --keep="public/system/"
 
 chmod -R o-rwx "$install_dir"
 chown -R "$app:www-data" "$install_dir"