From e49b2613cb7ce8df832d6b28e00deae663633adf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 01:36:47 +0200
Subject: [PATCH 01/21] Upgrade to version 0.3.6 (#31)

* Upgrade to v0.3.6

* Auto-update README

* fix checksums

Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: OniriCorpe <oniricorpe@disroot.org>
---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/arm64.src  | 6 +++---
 conf/armv6.src  | 6 +++---
 conf/armv7.src  | 6 +++---
 conf/i386.src   | 6 +++---
 conf/x86-64.src | 6 +++---
 manifest.json   | 2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index a2688b7..13bca86 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Shipped version:** 0.3.5~ynh1
+**Shipped version:** 0.3.6~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 3e4a525..3aec6b1 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Version incluse :** 0.3.5~ynh1
+**Version incluse :** 0.3.6~ynh1
 
 ## Captures d'écran
 
diff --git a/conf/arm64.src b/conf/arm64.src
index ec0a0ce..1ddc695 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.5/gotosocial_0.3.5_linux_arm64.tar.gz
-SOURCE_SUM=44ec2783502a5c84c2c56492881fb964b97d6fead81742db65184e87c8776025
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_arm64.tar.gz
+SOURCE_SUM=4d582c01a7507ceca0302ddc6e4e15388797d89b0c1265609843a11349bf0990
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.5_linux_arm64.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.6_linux_arm64.tar.gz
diff --git a/conf/armv6.src b/conf/armv6.src
index a37850e..f249dfe 100644
--- a/conf/armv6.src
+++ b/conf/armv6.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.5/gotosocial_0.3.5_linux_armv6.tar.gz
-SOURCE_SUM=4b3e5f3892bbf89238837a9ec696b92653adb5141298161b74b90e6e5d0003a7
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_armv6.tar.gz
+SOURCE_SUM=f2eb9547e6f9ab97b860874266584333126af06756a875bfd6a291133358edb1
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.5_linux_armv6.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.6_linux_armv6.tar.gz
diff --git a/conf/armv7.src b/conf/armv7.src
index 49cdf6f..3b7a1d4 100644
--- a/conf/armv7.src
+++ b/conf/armv7.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.5/gotosocial_0.3.5_linux_armv7.tar.gz
-SOURCE_SUM=c800edefd4d71f8e51d0d2781e44cf0505e138ca2e405d2a715e3a207f206213
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_armv7.tar.gz
+SOURCE_SUM=96f10febc9d76a83d974f498eb1fb5e8117191dfeebd2797db8e46260c400c97
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.5_linux_armv7.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.6_linux_armv7.tar.gz
diff --git a/conf/i386.src b/conf/i386.src
index bda384a..a37f4e7 100644
--- a/conf/i386.src
+++ b/conf/i386.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.5/gotosocial_0.3.5_linux_386.tar.gz
-SOURCE_SUM=509b8f84020348fac0f45c8c4c5031c77ca3cbd7cbbd5cda229dd318d10f93d1
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_386.tar.gz
+SOURCE_SUM=c8b285a62ff7e762b6ccb86f86d7a8ebc31d7c7e40f4988995fa533d595027d8
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.5_linux_386.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.6_linux_386.tar.gz
diff --git a/conf/x86-64.src b/conf/x86-64.src
index 34d960d..efc344a 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.5/gotosocial_0.3.5_linux_amd64.tar.gz
-SOURCE_SUM=337f43402bbee781cf17a042745eba7464fd37da7df1888f9e1d5c7564c510aa
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_amd64.tar.gz
+SOURCE_SUM=eb0a75eea24d8f953296398eb652ec9888de354b349519f74dac7f02a73ed762
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.5_linux_amd64.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.6_linux_amd64.tar.gz
diff --git a/manifest.json b/manifest.json
index 93b0fba..a38128d 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An ActivityPub social network server, written in Golang.",
         "fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
     },
-    "version": "0.3.5~ynh1",
+    "version": "0.3.6~ynh1",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": "AGPL-3.0-only",

From ac7987cee25c7f19749310b1fb401e7de447e325 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 4 Jul 2022 17:43:03 +0200
Subject: [PATCH 02/21] Upgrade to version 0.3.7 (#34)

* Upgrade to v0.3.7

* Auto-update README

Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/arm64.src  | 6 +++---
 conf/armv6.src  | 6 +++---
 conf/armv7.src  | 6 +++---
 conf/i386.src   | 6 +++---
 conf/x86-64.src | 6 +++---
 manifest.json   | 2 +-
 8 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 13bca86..6d39ee8 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Shipped version:** 0.3.6~ynh1
+**Shipped version:** 0.3.7~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 3aec6b1..947300b 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Version incluse :** 0.3.6~ynh1
+**Version incluse :** 0.3.7~ynh1
 
 ## Captures d'écran
 
diff --git a/conf/arm64.src b/conf/arm64.src
index 1ddc695..58266ca 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_arm64.tar.gz
-SOURCE_SUM=4d582c01a7507ceca0302ddc6e4e15388797d89b0c1265609843a11349bf0990
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_arm64.tar.gz
+SOURCE_SUM=cb82b4f9f0ce92b66e4fa1e4ed079640f37450888c949e02afea9e3d67141aeb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.6_linux_arm64.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.7_linux_arm64.tar.gz
diff --git a/conf/armv6.src b/conf/armv6.src
index f249dfe..234b3e5 100644
--- a/conf/armv6.src
+++ b/conf/armv6.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_armv6.tar.gz
-SOURCE_SUM=f2eb9547e6f9ab97b860874266584333126af06756a875bfd6a291133358edb1
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_armv6.tar.gz
+SOURCE_SUM=52a29505265841a96e39a9f48ec3db6afe8182065900ecc2084127184248c1fd
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.6_linux_armv6.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.7_linux_armv6.tar.gz
diff --git a/conf/armv7.src b/conf/armv7.src
index 3b7a1d4..0094d63 100644
--- a/conf/armv7.src
+++ b/conf/armv7.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_armv7.tar.gz
-SOURCE_SUM=96f10febc9d76a83d974f498eb1fb5e8117191dfeebd2797db8e46260c400c97
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_armv7.tar.gz
+SOURCE_SUM=10e08e0a35a46acfe3ae547d24d089494d06508a4383d9b00f6f6d52d9b8d525
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.6_linux_armv7.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.7_linux_armv7.tar.gz
diff --git a/conf/i386.src b/conf/i386.src
index a37f4e7..5a1c434 100644
--- a/conf/i386.src
+++ b/conf/i386.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_386.tar.gz
-SOURCE_SUM=c8b285a62ff7e762b6ccb86f86d7a8ebc31d7c7e40f4988995fa533d595027d8
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_386.tar.gz
+SOURCE_SUM=f584c2a28c96fc5c1eef035652a202b43f966eb2d2ef4e4407b7c975395e22ea
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.6_linux_386.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.7_linux_386.tar.gz
diff --git a/conf/x86-64.src b/conf/x86-64.src
index efc344a..c7cd2c2 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.6/gotosocial_0.3.6_linux_amd64.tar.gz
-SOURCE_SUM=eb0a75eea24d8f953296398eb652ec9888de354b349519f74dac7f02a73ed762
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_amd64.tar.gz
+SOURCE_SUM=9257f5516548fef3de47799312829066d56c0819c3b2b6654d24d48604505c53
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.6_linux_amd64.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.7_linux_amd64.tar.gz
diff --git a/manifest.json b/manifest.json
index a38128d..9d2a1e8 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An ActivityPub social network server, written in Golang.",
         "fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
     },
-    "version": "0.3.6~ynh1",
+    "version": "0.3.7~ynh1",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": "AGPL-3.0-only",

From b54a7046eb1dfe5851cb3c31aeedd062527cd877 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:12:11 +0200
Subject: [PATCH 03/21] chores v0.3.7

---
 check_process     |  3 +++
 conf/config.yaml  | 57 ++++++++++++++++++++++++++++++++++++++++++++---
 config_panel.toml | 30 +++++++++++++++++++++++++
 manifest.json     |  8 +++----
 scripts/install   | 18 ++++++++++-----
 scripts/upgrade   | 35 ++++++++++++++++++++++++++---
 6 files changed, 135 insertions(+), 16 deletions(-)

diff --git a/check_process b/check_process
index 7755f17..c63c3c0 100644
--- a/check_process
+++ b/check_process
@@ -19,6 +19,7 @@
 		setup_public=1
 		upgrade=1
 		upgrade=1	from_commit=460048e78df8a195b1eca5994a4699079954b312
+		upgrade=1	from_commit=29c7d0df5dd6e3d90070f242b74cce980676cd72
 		backup_restore=1
 		multi_instance=1
 		port_already_use=1
@@ -29,3 +30,5 @@ Notification=none
 ;;; Upgrade options
 	; commit=460048e78df8a195b1eca5994a4699079954b312
 		name=0.2.1~ynh3
+	; commit=29c7d0df5dd6e3d90070f242b74cce980676cd72
+		name=0.3.6~ynh1
diff --git a/conf/config.yaml b/conf/config.yaml
index e188be9..8bdbc8c 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -165,6 +165,27 @@ web-template-base-dir: "./web/template/"
 # Default: "./web/assets/"
 web-asset-base-dir: "./web/assets/"
 
+###########################
+##### INSTANCE CONFIG #####
+###########################
+
+# Config pertaining to instance federation settings, pages to hide/expose, etc.
+
+# Bool. Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=open in order
+# to see a list of instances that this instance 'peers' with. Even if set to 'false', then authenticated
+# users (members of the instance) will still be able to query the endpoint.
+# Options: [true, false]
+# Default: false
+instance-expose-peers: __INSTANCE_EXPOSE_PEERS__
+
+# Bool. Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=suspended in order
+# to see a list of instances that this instance blocks/suspends. This will also allow unauthenticated
+# users to see the list through the web UI. Even if set to 'false', then authenticated users (members
+# of the instance) will still be able to query the endpoint.
+# Options: [true, false]
+# Default: false
+instance-expose-suspended: __INSTANCE_EXPOSE_SUSPENDED__
+
 ###########################
 ##### ACCOUNTS CONFIG #####
 ###########################
@@ -174,17 +195,17 @@ web-asset-base-dir: "./web/assets/"
 # Bool. Do we want people to be able to just submit sign up requests, or do we want invite only?
 # Options: [true, false]
 # Default: true
-accounts-registration-open: __REGISTRATION_OPEN__
+accounts-registration-open: __ACCOUNTS_REGISTRATION_OPEN__
 
 # Bool. Do sign up requests require approval from an admin/moderator before an account can sign in/use the server?
 # Options: [true, false]
 # Default: true
-accounts-approval-required: __REGISTRATION_APPROVAL__
+accounts-approval-required: __ACCOUNTS_APPROVAL_REQUIRED__
 
 # Bool. Are sign up requests required to submit a reason for the request (eg., an explanation of why they want to join the instance)?
 # Options: [true, false]
 # Default: true
-accounts-reason-required: __REGISTRATION_REASON__
+accounts-reason-required: __ACCOUNTS_REASON_REQUIRED__
 
 ########################
 ##### MEDIA CONFIG #####
@@ -242,6 +263,36 @@ storage-backend: "local"
 # Default: "/gotosocial/storage"
 storage-local-base-path: "__DATADIR__"
 
+# String. API endpoint of the S3 compatible service.
+# Only required when running with the s3 storage backend.
+# Examples: ["minio:9000", "s3.nl-ams.scw.cloud", "s3.us-west-002.backblazeb2.com"]
+# Default: ""
+storage-s3-endpoint: ""
+
+# String. Access key part of the S3 credentials.
+# Consider setting this value using environment variables to avoid leaking it via the config file
+# Only required when running with the s3 storage backend.
+# Examples: ["AKIAJSIE27KKMHXI3BJQ","miniouser"]
+# Default: ""
+storage-s3-access-key: ""
+# String. Secret key part of the S3 credentials.
+# Consider setting this value using environment variables to avoid leaking it via the config file
+# Only required when running with the s3 storage backend.
+# Examples: ["5bEYu26084qjSFyclM/f2pz4gviSfoOg+mFwBH39","miniopassword"]
+# Default: ""
+storage-s3-secret-key: ""
+# String. Name of the storage bucket.
+#
+# If you have already encoded your bucket name in the storage-s3-endpoint, this
+# value will be used as a directory containing your data.
+#
+# The bucket must exist prior to starting GoToSocial
+#
+# Only required when running with the s3 storage backend.
+# Examples: ["gts","cool-instance"]
+# Default: ""
+storage-s3-bucket: ""
+
 ###########################
 ##### STATUSES CONFIG #####
 ###########################
diff --git a/config_panel.toml b/config_panel.toml
index e871ef4..ce36cb2 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -165,3 +165,33 @@ default = "6"
 help.en = "Default: 6. Note that going way higher than the default might break federation."
 help.fr = "Valeur par défaut : 6. Notez que si vous dépassez la valeur par défaut, vous risquez de compromettre la fédération."
 type = "number"
+
+####################
+#### INSTANCE CONFIG
+####################
+
+[gotosocial.instance]
+
+name = "Instance config"
+
+help = "Config pertaining to instance federation settings, pages to hide/expose, etc."
+
+[gotosocial.instance.expose-peers]
+ask.en = "API: Expose peers?"
+ask.fr = "API : Exposer les pairs ?"
+bind = "instance-expose-peers:__FINALPATH__/config.yaml"
+choices = ["true", "false"]
+default = "false"
+help.en = "Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=open in order to see a list of instances that this instance 'peers' with. Even if set to 'false', then authenticated users (members of the instance) will still be able to query the endpoint."
+help.fr = "Voulez-vous que les gens puissent simplement envoyer des demandes d'inscription, ou voulez-vous qu'iels doivent être invité-e-s ?"
+type = "select"
+
+[gotosocial.instance.expose-suspended]
+ask.en = "API: Expose suspended?"
+ask.fr = "API : Exposer les instances bloquées ?"
+bind = "instance-expose-suspended:__FINALPATH__/config.yaml"
+choices = ["true", "false"]
+default = "false"
+help.en = "Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=suspended in order to see a list of instances that this instance blocks/suspends. This will also allow unauthenticated users to see the list through the web UI. Even if set to 'false', then authenticated users (members of the instance) will still be able to query the endpoint."
+help.fr = "Les demandes d'inscription doivent-elles être approuvées par un-e administrateur-ice/modérateur-ice avant qu'un compte puisse se connecter/utiliser le serveur ?"
+type = "select"
diff --git a/manifest.json b/manifest.json
index 9d2a1e8..b99978b 100644
--- a/manifest.json
+++ b/manifest.json
@@ -74,7 +74,7 @@
                 }
             },
             {
-                "name": "registration_open",
+                "name": "accounts_registration_open",
                 "type": "boolean",
                 "ask": {
                     "en": "Open registration?",
@@ -87,7 +87,7 @@
                 "default": false
             },
             {
-                "name": "registration_approval",
+                "name": "accounts_approval_required",
                 "type": "boolean",
                 "ask": {
                     "en": "Registration approval?",
@@ -100,7 +100,7 @@
                 "default": true
             },
             {
-                "name": "registration_reason",
+                "name": "accounts_reason_required",
                 "type": "boolean",
                 "ask": {
                     "en": "Request registration reason?",
@@ -114,4 +114,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file
diff --git a/scripts/install b/scripts/install
index 22bdc33..9eaa7ce 100755
--- a/scripts/install
+++ b/scripts/install
@@ -37,9 +37,12 @@ password="$YNH_APP_ARG_PASSWORD"
 
 # Config stuff:
 
-registration_open=$(convert_bool "$YNH_APP_ARG_REGISTRATION_OPEN")
-registration_approval=$(convert_bool "$YNH_APP_ARG_REGISTRATION_APPROVAL")
-registration_reason=$(convert_bool "$YNH_APP_ARG_REGISTRATION_REASON")
+accounts_registration_open=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_REGISTRATION_OPEN")
+accounts_approval_required=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_APPROVAL_REQUIRED")
+accounts_reason_required=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_REASON_REQUIRED")
+
+instance_expose_peers="false"
+instance_expose_suspended="false"
 
 media_image_max_size="2097152"
 media_video_max_size="10485760"
@@ -80,9 +83,12 @@ ynh_app_setting_set --app="$app" --key=admin --value="$admin"
 ynh_app_setting_set --app="$app" --key=email --value="$email"
 ynh_app_setting_set --app="$app" --key=password --value="$password"
 
-ynh_app_setting_set --app="$app" --key=registration_open --value="$registration_open"
-ynh_app_setting_set --app="$app" --key=registration_approval --value="$registration_approval"
-ynh_app_setting_set --app="$app" --key=registration_reason --value="$registration_reason"
+ynh_app_setting_set --app="$app" --key=accounts_registration_open --value="$accounts_registration_open"
+ynh_app_setting_set --app="$app" --key=accounts_approval_required --value="$accounts_approval_required"
+ynh_app_setting_set --app="$app" --key=accounts_reason_required --value="$accounts_reason_required"
+
+ynh_app_setting_set --app="$app" --key=instance_expose_peers --value="$instance_expose_peers"
+ynh_app_setting_set --app="$app" --key=instance_expose_suspended --value="$instance_expose_suspended"
 
 ynh_app_setting_set --app="$app" --key=media_image_max_size --value="$media_image_max_size"
 ynh_app_setting_set --app="$app" --key=media_video_max_size --value="$media_video_max_size"
diff --git a/scripts/upgrade b/scripts/upgrade
index ece767f..51395bd 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -121,9 +121,38 @@ then
 	ynh_app_setting_set --app="$app" --key=statuses_poll_option_max_chars --value="$statuses_poll_option_max_chars"
 	ynh_app_setting_set --app="$app" --key=statuses_media_max_files --value="$statuses_media_max_files"
 	# registration of converted parameters
-	ynh_app_setting_set --app="$app" --key=statuses_media_max_files --value="$registration_open"
-	ynh_app_setting_set --app="$app" --key=statuses_media_max_files --value="$registration_approval"
-	ynh_app_setting_set --app="$app" --key=statuses_media_max_files --value="$registration_reason"
+	ynh_app_setting_set --app="$app" --key=registration_open --value="$registration_open"
+	ynh_app_setting_set --app="$app" --key=registration_approval --value="$registration_approval"
+	ynh_app_setting_set --app="$app" --key=registration_reason --value="$registration_reason"
+fi
+
+# Upgrade from <0.3.7~ynh1:
+if ynh_compare_current_package_version --comparison lt --version 0.3.7~ynh1 || [ -z "$instance_expose_peers" ]
+then
+	# declaration of new parameters
+	instance_expose_peers="false"
+	instance_expose_suspended="false"
+	# conversion of old parameters
+	if [ "$accounts_registration_open" = "true" ] || [ "$accounts_registration_open" = "false" ]; then
+		accounts_registration_open=$registration_open
+		accounts_approval_required=$registration_approval
+		accounts_reason_required=$registration_reason
+	else
+		accounts_registration_open="false"
+		accounts_approval_required="true"
+		accounts_reason_required="false"
+	fi
+	# registration of new parameters
+	ynh_app_setting_set --app="$app" --key=instance_expose_peers --value="$instance_expose_peers"
+	ynh_app_setting_set --app="$app" --key=instance_expose_suspended --value="$instance_expose_suspended"
+	# registration of converted parameters
+	ynh_app_setting_set --app="$app" --key=accounts_registration_open --value="$accounts_registration_open"
+	ynh_app_setting_set --app="$app" --key=accounts_approval_required --value="$accounts_approval_required"
+	ynh_app_setting_set --app="$app" --key=accounts_reason_required --value="$accounts_reason_required"
+	# deletion of old parameters
+	ynh_app_setting_delete  --app="$app" --key=registration_open
+	ynh_app_setting_delete  --app="$app" --key=registration_approval
+	ynh_app_setting_delete  --app="$app" --key=registration_reason
 fi
 
 #=================================================

From 3437b00fabaa28e1db411bb2a0e46cc1571f3dfd Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:17:07 +0200
Subject: [PATCH 04/21] trad

---
 config_panel.toml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index ce36cb2..4f68eb0 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -183,7 +183,7 @@ bind = "instance-expose-peers:__FINALPATH__/config.yaml"
 choices = ["true", "false"]
 default = "false"
 help.en = "Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=open in order to see a list of instances that this instance 'peers' with. Even if set to 'false', then authenticated users (members of the instance) will still be able to query the endpoint."
-help.fr = "Voulez-vous que les gens puissent simplement envoyer des demandes d'inscription, ou voulez-vous qu'iels doivent être invité-e-s ?"
+help.fr = "Permet aux utilisateurs non authentifiés d'effectuer des requêtes API sur /api/v1/instance/peers?filter=open afin d'afficher la liste des instances avec lesquelles votre instance est en relation. Même s'il est défini à 'false', les utilisateurs authentifiés (membres de l'instance) seront toujours en mesure d'interroger l'API."
 type = "select"
 
 [gotosocial.instance.expose-suspended]
@@ -193,5 +193,5 @@ bind = "instance-expose-suspended:__FINALPATH__/config.yaml"
 choices = ["true", "false"]
 default = "false"
 help.en = "Allow unauthenticated users to make queries to /api/v1/instance/peers?filter=suspended in order to see a list of instances that this instance blocks/suspends. This will also allow unauthenticated users to see the list through the web UI. Even if set to 'false', then authenticated users (members of the instance) will still be able to query the endpoint."
-help.fr = "Les demandes d'inscription doivent-elles être approuvées par un-e administrateur-ice/modérateur-ice avant qu'un compte puisse se connecter/utiliser le serveur ?"
+help.fr = "Permet aux utilisateurs non authentifiés d'effectuer des requêtes API sur /api/v1/instance/peers?filter=suspended afin de voir la liste des instances bloquées ou suspendues par votre instance. Cela permettra également aux utilisateurs non authentifiés de consulter la liste via l'interface Web. Même s'il est défini à 'false', les utilisateurs authentifiés (membres de l'instance) seront toujours en mesure d'interroger l'API."
 type = "select"

From eceb3455e7d8f1617fccb44fb8a56e0794372bac Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:21:40 +0200
Subject: [PATCH 05/21] fix var name

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

diff --git a/scripts/upgrade b/scripts/upgrade
index 51395bd..5ca4350 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -133,7 +133,7 @@ then
 	instance_expose_peers="false"
 	instance_expose_suspended="false"
 	# conversion of old parameters
-	if [ "$accounts_registration_open" = "true" ] || [ "$accounts_registration_open" = "false" ]; then
+	if [ "$registration_open" = "true" ] || [ "$registration_open" = "false" ]; then
 		accounts_registration_open=$registration_open
 		accounts_approval_required=$registration_approval
 		accounts_reason_required=$registration_reason

From f6dad8292adbd5bdcb3024e2641964a07ac804d1 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:27:30 +0200
Subject: [PATCH 06/21] fix ynh_app_setting_get for accounts settings

---
 scripts/upgrade | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5ca4350..61b15c2 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,10 +30,15 @@ db_pwd=$(ynh_app_setting_get --app="$app" --key=db_pwd)
 
 datadir=$(ynh_app_setting_get --app="$app" --key=datadir)
 
+# reliquat <0.3.7~ynh1
 registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
 registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
 registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
 
+accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
+accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
+accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)
+
 media_image_max_size=$(ynh_app_setting_get --app="$app" --key=media_image_max_size)
 media_video_max_size=$(ynh_app_setting_get --app="$app" --key=media_video_max_size)
 media_description_min_chars=$(ynh_app_setting_get --app="$app" --key=media_description_min_chars)

From f66ed501420b3df6f63d30cd4c9fff8e20a86611 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:45:07 +0200
Subject: [PATCH 07/21] correction of an omission and moving parametters

---
 scripts/upgrade | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 61b15c2..0e7dfeb 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,10 +30,8 @@ db_pwd=$(ynh_app_setting_get --app="$app" --key=db_pwd)
 
 datadir=$(ynh_app_setting_get --app="$app" --key=datadir)
 
-# reliquat <0.3.7~ynh1
-registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
-registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
-registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
+instance_expose_peers=$(ynh_app_setting_get --app="$app" --key=instance_expose_peers)
+instance_expose_suspended=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended)
 
 accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
 accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
@@ -134,6 +132,10 @@ fi
 # Upgrade from <0.3.7~ynh1:
 if ynh_compare_current_package_version --comparison lt --version 0.3.7~ynh1 || [ -z "$instance_expose_peers" ]
 then
+	# import old parameters
+	registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
+	registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
+	registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
 	# declaration of new parameters
 	instance_expose_peers="false"
 	instance_expose_suspended="false"

From 9a17d1b46c9134e88d93f9011deed9072920ee60 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 20:09:18 +0200
Subject: [PATCH 08/21] fix missing parametters import

---
 scripts/upgrade | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 0e7dfeb..67edb38 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -92,6 +92,10 @@ ynh_script_progression --message="Ensuring downward compatibility..."
 # Upgrade from <0.2.1~ynh4:
 if ynh_compare_current_package_version --comparison lt --version 0.2.1~ynh4 || [ -z "$db_user" ]
 then
+	# import old parameters
+	registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
+	registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
+	registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
 	# declaration of new parameters
 	client_max_body_size="100M"
 	media_image_max_size="2097152"

From 0742fa2caf09c79387ccf4b2cd4526d5124ee3d3 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Thu, 28 Jul 2022 20:00:14 +0200
Subject: [PATCH 09/21] updating default config according to the latest
 upstream

---
 conf/config.yaml | 4 ++--
 scripts/install  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/conf/config.yaml b/conf/config.yaml
index 8bdbc8c..c490860 100644
--- a/conf/config.yaml
+++ b/conf/config.yaml
@@ -215,12 +215,12 @@ accounts-reason-required: __ACCOUNTS_REASON_REQUIRED__
 
 # Int. Maximum allowed image upload size in bytes.
 # Examples: [2097152, 10485760]
-# Default: 2097152 -- aka 2MB
+# Default: 10485760 -- aka 10MB
 media-image-max-size: __MEDIA_IMAGE_MAX_SIZE__
 
 # Int. Maximum allowed video upload size in bytes.
 # Examples: [2097152, 10485760]
-# Default: 10485760 -- aka 10MB
+# Default: 41943040 -- aka 40MB
 media-video-max-size: __MEDIA_VIDEO_MAX_SIZE__
 
 # Int. Minimum amount of characters required as an image or video description.
diff --git a/scripts/install b/scripts/install
index 9eaa7ce..f8bf56a 100755
--- a/scripts/install
+++ b/scripts/install
@@ -44,8 +44,8 @@ accounts_reason_required=$(convert_bool "$YNH_APP_ARG_ACCOUNTS_REASON_REQUIRED")
 instance_expose_peers="false"
 instance_expose_suspended="false"
 
-media_image_max_size="2097152"
-media_video_max_size="10485760"
+media_image_max_size="10485760"
+media_video_max_size="41943040"
 media_description_min_chars="0"
 media_description_max_chars="500"
 media_remote_cache_days="30"

From 669cb622dd9dd08abaa85716262d61011eb79033 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Jul 2022 20:33:53 +0200
Subject: [PATCH 10/21] Upgrade to version 0.3.8 (#37)

* Upgrade to v0.3.8

* Auto-update README

Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
---
 README.md       | 2 +-
 README_fr.md    | 2 +-
 conf/arm64.src  | 6 +++---
 conf/armv6.src  | 6 +++---
 conf/armv7.src  | 6 +++---
 conf/i386.src   | 6 +++---
 conf/x86-64.src | 6 +++---
 manifest.json   | 4 ++--
 8 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/README.md b/README.md
index 6d39ee8..e271e5d 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Shipped version:** 0.3.7~ynh1
+**Shipped version:** 0.3.8~ynh1
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 947300b..3be8f91 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Version incluse :** 0.3.7~ynh1
+**Version incluse :** 0.3.8~ynh1
 
 ## Captures d'écran
 
diff --git a/conf/arm64.src b/conf/arm64.src
index 58266ca..7c2bd39 100644
--- a/conf/arm64.src
+++ b/conf/arm64.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_arm64.tar.gz
-SOURCE_SUM=cb82b4f9f0ce92b66e4fa1e4ed079640f37450888c949e02afea9e3d67141aeb
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.8/gotosocial_0.3.8_linux_arm64.tar.gz
+SOURCE_SUM=660ef6926da1ad6a6099516db1b7943c63f10037f2070d25f47391991c0bab41
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.7_linux_arm64.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.8_linux_arm64.tar.gz
diff --git a/conf/armv6.src b/conf/armv6.src
index 234b3e5..5b0f233 100644
--- a/conf/armv6.src
+++ b/conf/armv6.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_armv6.tar.gz
-SOURCE_SUM=52a29505265841a96e39a9f48ec3db6afe8182065900ecc2084127184248c1fd
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.8/gotosocial_0.3.8_linux_armv6.tar.gz
+SOURCE_SUM=3d25391543c342dded812a34b809035a2c405841854b6a277a84c6c5283fbc07
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.7_linux_armv6.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.8_linux_armv6.tar.gz
diff --git a/conf/armv7.src b/conf/armv7.src
index 0094d63..b83c80d 100644
--- a/conf/armv7.src
+++ b/conf/armv7.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_armv7.tar.gz
-SOURCE_SUM=10e08e0a35a46acfe3ae547d24d089494d06508a4383d9b00f6f6d52d9b8d525
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.8/gotosocial_0.3.8_linux_armv7.tar.gz
+SOURCE_SUM=680183ea24ab122cfb10cf2308591e3e35ebc8b435b5d28e2139e0439de3e359
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.7_linux_armv7.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.8_linux_armv7.tar.gz
diff --git a/conf/i386.src b/conf/i386.src
index 5a1c434..d4c890e 100644
--- a/conf/i386.src
+++ b/conf/i386.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_386.tar.gz
-SOURCE_SUM=f584c2a28c96fc5c1eef035652a202b43f966eb2d2ef4e4407b7c975395e22ea
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.8/gotosocial_0.3.8_linux_386.tar.gz
+SOURCE_SUM=6166961895d009b6e494d1a8fc816db9393a5e715436cc5ffd81a48be85bb9c0
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.7_linux_386.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.8_linux_386.tar.gz
diff --git a/conf/x86-64.src b/conf/x86-64.src
index c7cd2c2..e927cc7 100644
--- a/conf/x86-64.src
+++ b/conf/x86-64.src
@@ -1,7 +1,7 @@
-SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.7/gotosocial_0.3.7_linux_amd64.tar.gz
-SOURCE_SUM=9257f5516548fef3de47799312829066d56c0819c3b2b6654d24d48604505c53
+SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.3.8/gotosocial_0.3.8_linux_amd64.tar.gz
+SOURCE_SUM=22f555450a17e999fc52198ce8460065a5a53dd05a49dc61c15c3d1fa06f0efb
 SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz
 SOURCE_EXTRACT=true
 SOURCE_IN_SUBDIR=false
-SOURCE_FILENAME=gotosocial_0.3.7_linux_amd64.tar.gz
+SOURCE_FILENAME=gotosocial_0.3.8_linux_amd64.tar.gz
diff --git a/manifest.json b/manifest.json
index b99978b..1ff01ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An ActivityPub social network server, written in Golang.",
         "fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
     },
-    "version": "0.3.7~ynh1",
+    "version": "0.3.8~ynh1",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -114,4 +114,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}

From 0246a6d6fdfba2498599ade71d17dfded2b52169 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 12 Aug 2022 00:59:00 +0200
Subject: [PATCH 11/21] Fix config panel (invalid variable name)

---
 config_panel.toml | 4 ++--
 manifest.json     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index 4f68eb0..1494197 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -176,7 +176,7 @@ name = "Instance config"
 
 help = "Config pertaining to instance federation settings, pages to hide/expose, etc."
 
-[gotosocial.instance.expose-peers]
+[gotosocial.instance.instance_expose_peers]
 ask.en = "API: Expose peers?"
 ask.fr = "API : Exposer les pairs ?"
 bind = "instance-expose-peers:__FINALPATH__/config.yaml"
@@ -186,7 +186,7 @@ help.en = "Allow unauthenticated users to make queries to /api/v1/instance/peers
 help.fr = "Permet aux utilisateurs non authentifiés d'effectuer des requêtes API sur /api/v1/instance/peers?filter=open afin d'afficher la liste des instances avec lesquelles votre instance est en relation. Même s'il est défini à 'false', les utilisateurs authentifiés (membres de l'instance) seront toujours en mesure d'interroger l'API."
 type = "select"
 
-[gotosocial.instance.expose-suspended]
+[gotosocial.instance.instance_expose_suspended]
 ask.en = "API: Expose suspended?"
 ask.fr = "API : Exposer les instances bloquées ?"
 bind = "instance-expose-suspended:__FINALPATH__/config.yaml"
diff --git a/manifest.json b/manifest.json
index 1ff01ef..f30de81 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An ActivityPub social network server, written in Golang.",
         "fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
     },
-    "version": "0.3.8~ynh1",
+    "version": "0.3.8~ynh2",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -114,4 +114,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file

From 61f83c126972a398cc0a56052bb8fdb7571b7950 Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 11 Aug 2022 22:59:08 +0000
Subject: [PATCH 12/21] Auto-update README

---
 README.md    | 3 ++-
 README_fr.md | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e271e5d..e9e0b9b 100644
--- a/README.md
+++ b/README.md
@@ -24,7 +24,8 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Shipped version:** 0.3.8~ynh1
+**Shipped version:** 0.3.8~ynh2
+
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index 3be8f91..8715564 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -24,7 +24,8 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
 
-**Version incluse :** 0.3.8~ynh1
+**Version incluse :** 0.3.8~ynh2
+
 
 ## Captures d'écran
 

From dd4e9a93d11ececac4860a3f823ee251f7ccfb8d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 23 Jun 2022 01:36:47 +0200
Subject: [PATCH 13/21] Upgrade to version 0.3.6 (#31)

* Upgrade to v0.3.6

* Auto-update README

* fix checksums

Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
Co-authored-by: OniriCorpe <oniricorpe@disroot.org>
---
 README.md     | 1 -
 README_fr.md  | 1 -
 manifest.json | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.md b/README.md
index e271e5d..26a1ff4 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,6 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
-
 **Shipped version:** 0.3.8~ynh1
 
 ## Screenshots
diff --git a/README_fr.md b/README_fr.md
index 3be8f91..cbcfb1a 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,7 +23,6 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
-
 **Version incluse :** 0.3.8~ynh1
 
 ## Captures d'écran
diff --git a/manifest.json b/manifest.json
index 1ff01ef..37c4376 100644
--- a/manifest.json
+++ b/manifest.json
@@ -114,4 +114,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file

From f2cbc76e4b5c278e7906146b7b29389ca34db272 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:27:30 +0200
Subject: [PATCH 14/21] fix ynh_app_setting_get for accounts settings

---
 scripts/upgrade | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 67edb38..43b4ac7 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,9 +30,20 @@ db_pwd=$(ynh_app_setting_get --app="$app" --key=db_pwd)
 
 datadir=$(ynh_app_setting_get --app="$app" --key=datadir)
 
+<<<<<<< HEAD
 instance_expose_peers=$(ynh_app_setting_get --app="$app" --key=instance_expose_peers)
 instance_expose_suspended=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended)
 
+accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
+accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
+accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)
+=======
+# reliquat <0.3.7~ynh1
+registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
+registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
+registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
+>>>>>>> f6dad82 (fix ynh_app_setting_get for accounts settings)
+
 accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
 accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
 accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)

From 5fe3495fe5fa90226b87218077e82a8c105eec0a Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Mon, 4 Jul 2022 18:45:07 +0200
Subject: [PATCH 15/21] correction of an omission and moving parametters

---
 scripts/upgrade | 15 ++++-----------
 1 file changed, 4 insertions(+), 11 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 43b4ac7..4398740 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -30,20 +30,9 @@ db_pwd=$(ynh_app_setting_get --app="$app" --key=db_pwd)
 
 datadir=$(ynh_app_setting_get --app="$app" --key=datadir)
 
-<<<<<<< HEAD
 instance_expose_peers=$(ynh_app_setting_get --app="$app" --key=instance_expose_peers)
 instance_expose_suspended=$(ynh_app_setting_get --app="$app" --key=instance_expose_suspended)
 
-accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
-accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
-accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)
-=======
-# reliquat <0.3.7~ynh1
-registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
-registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
-registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
->>>>>>> f6dad82 (fix ynh_app_setting_get for accounts settings)
-
 accounts_registration_open=$(ynh_app_setting_get --app="$app" --key=accounts_registration_open)
 accounts_approval_required=$(ynh_app_setting_get --app="$app" --key=accounts_approval_required)
 accounts_reason_required=$(ynh_app_setting_get --app="$app" --key=accounts_reason_required)
@@ -147,6 +136,10 @@ fi
 # Upgrade from <0.3.7~ynh1:
 if ynh_compare_current_package_version --comparison lt --version 0.3.7~ynh1 || [ -z "$instance_expose_peers" ]
 then
+	# import old parameters
+	registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
+	registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
+	registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
 	# import old parameters
 	registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
 	registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)

From cee82e2302bfaa8ba74460179d05546440067479 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 28 Jul 2022 20:33:53 +0200
Subject: [PATCH 16/21] Upgrade to version 0.3.8 (#37)

* Upgrade to v0.3.8

* Auto-update README

Co-authored-by: yunohost-bot <yunohost-bot@users.noreply.github.com>
Co-authored-by: yunohost-bot <yunohost@yunohost.org>
---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index 37c4376..1ff01ef 100644
--- a/manifest.json
+++ b/manifest.json
@@ -114,4 +114,4 @@
             }
         ]
     }
-}
\ No newline at end of file
+}

From c5e75eef321e93f043cea2b26929627d5fd5352a Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 12 Aug 2022 00:59:00 +0200
Subject: [PATCH 17/21] Fix config panel (invalid variable name)

---
 config_panel.toml | 4 ++--
 manifest.json     | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/config_panel.toml b/config_panel.toml
index 4f68eb0..1494197 100644
--- a/config_panel.toml
+++ b/config_panel.toml
@@ -176,7 +176,7 @@ name = "Instance config"
 
 help = "Config pertaining to instance federation settings, pages to hide/expose, etc."
 
-[gotosocial.instance.expose-peers]
+[gotosocial.instance.instance_expose_peers]
 ask.en = "API: Expose peers?"
 ask.fr = "API : Exposer les pairs ?"
 bind = "instance-expose-peers:__FINALPATH__/config.yaml"
@@ -186,7 +186,7 @@ help.en = "Allow unauthenticated users to make queries to /api/v1/instance/peers
 help.fr = "Permet aux utilisateurs non authentifiés d'effectuer des requêtes API sur /api/v1/instance/peers?filter=open afin d'afficher la liste des instances avec lesquelles votre instance est en relation. Même s'il est défini à 'false', les utilisateurs authentifiés (membres de l'instance) seront toujours en mesure d'interroger l'API."
 type = "select"
 
-[gotosocial.instance.expose-suspended]
+[gotosocial.instance.instance_expose_suspended]
 ask.en = "API: Expose suspended?"
 ask.fr = "API : Exposer les instances bloquées ?"
 bind = "instance-expose-suspended:__FINALPATH__/config.yaml"
diff --git a/manifest.json b/manifest.json
index 1ff01ef..f30de81 100644
--- a/manifest.json
+++ b/manifest.json
@@ -6,7 +6,7 @@
         "en": "An ActivityPub social network server, written in Golang.",
         "fr": "Un serveur de réseau social basé sur ActivityPub écrit en Golang."
     },
-    "version": "0.3.8~ynh1",
+    "version": "0.3.8~ynh2",
     "url": "https://github.com/superseriousbusiness/gotosocial",
     "upstream": {
         "license": "AGPL-3.0-only",
@@ -114,4 +114,4 @@
             }
         ]
     }
-}
+}
\ No newline at end of file

From c6eaf34c87283374fc208582ff98e39be455498d Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 11 Aug 2022 22:59:08 +0000
Subject: [PATCH 18/21] Auto-update README

---
 README.md    | 2 +-
 README_fr.md | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 26a1ff4..9dbb868 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
-**Shipped version:** 0.3.8~ynh1
+**Shipped version:** 0.3.8~ynh2
 
 ## Screenshots
 
diff --git a/README_fr.md b/README_fr.md
index cbcfb1a..ce5c012 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,7 +23,7 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
-**Version incluse :** 0.3.8~ynh1
+**Version incluse :** 0.3.8~ynh2
 
 ## Captures d'écran
 

From 35c270ffca4c37185263a3a3b29eddbed16ac11f Mon Sep 17 00:00:00 2001
From: yunohost-bot <yunohost@yunohost.org>
Date: Thu, 11 Aug 2022 23:15:57 +0000
Subject: [PATCH 19/21] Auto-update README

---
 README.md    | 2 ++
 README_fr.md | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 9dbb868..e9e0b9b 100644
--- a/README.md
+++ b/README.md
@@ -23,8 +23,10 @@ With GoToSocial, you can keep in touch with your friends, post, read, and share
 
 Documentation is at [docs.gotosocial.org](https://docs.gotosocial.org).
 
+
 **Shipped version:** 0.3.8~ynh2
 
+
 ## Screenshots
 
 ![Screenshot of GoToSocial](./doc/screenshots/screenshot.jpg)
diff --git a/README_fr.md b/README_fr.md
index ce5c012..8715564 100644
--- a/README_fr.md
+++ b/README_fr.md
@@ -23,8 +23,10 @@ Avec GoToSocial, vous pouvez rester en contact avec vos amis, publier, lire et p
 
 Vous pouvez consulter la documentation à l'adresse : [docs.gotosocial.org](https://docs.gotosocial.org).
 
+
 **Version incluse :** 0.3.8~ynh2
 
+
 ## Captures d'écran
 
 ![Capture d'écran de GoToSocial](./doc/screenshots/screenshot.jpg)

From 5368f5e0b7ad8ce0d7f623875b7ded0a589b7680 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 12 Aug 2022 01:18:10 +0200
Subject: [PATCH 20/21] fix dupe

---
 scripts/upgrade | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index 4398740..67edb38 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -136,10 +136,6 @@ fi
 # Upgrade from <0.3.7~ynh1:
 if ynh_compare_current_package_version --comparison lt --version 0.3.7~ynh1 || [ -z "$instance_expose_peers" ]
 then
-	# import old parameters
-	registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
-	registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)
-	registration_reason=$(ynh_app_setting_get --app="$app" --key=registration_reason)
 	# import old parameters
 	registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open)
 	registration_approval=$(ynh_app_setting_get --app="$app" --key=registration_approval)

From 0def3108ba7cd84ee6bdcff33c6f196a3e34a7c3 Mon Sep 17 00:00:00 2001
From: OniriCorpe <oniricorpe@disroot.org>
Date: Fri, 12 Aug 2022 03:04:27 +0200
Subject: [PATCH 21/21] upgrade the ynh minimum version

---
 manifest.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest.json b/manifest.json
index f30de81..1731a0f 100644
--- a/manifest.json
+++ b/manifest.json
@@ -22,7 +22,7 @@
         "email": ""
     },
     "requirements": {
-        "yunohost": ">= 4.3.1.8"
+        "yunohost": ">= 11.0.6"
     },
     "multi_instance": true,
     "services": [