From ed17d981388cdbae7a49875413201f55edeccf62 Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 12 Apr 2023 16:56:11 +0200 Subject: [PATCH 1/4] indentation harmonization --- scripts/upgrade | 52 ++++++++++++++++++++++++------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/scripts/upgrade b/scripts/upgrade index 16def1b..041e688 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -267,32 +267,32 @@ fi # Upgrade from <0.8.0~ynh3: if ynh_compare_current_package_version --comparison lt --version 0.8.0~ynh3 then - # get settings from problem key - allow_custom_css=$(ynh_app_setting_get --app="$app" --key=allow_custom_css) - approval_required=$(ynh_app_setting_get --app="$app" --key=approval_required) - reason_required=$(ynh_app_setting_get --app="$app" --key=reason_required) - registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open) - # apply setting to correct key if set on old key - if [ -n "$allow_custom_css" ] - then - ynh_app_setting_set --app="$app" --key=accounts_allow_custom_css --value="$allow_custom_css" - ynh_app_setting_delete --app="$app" --key=allow_custom_css - fi - if [ -n "$approval_required" ] - then - ynh_app_setting_set --app="$app" --key=accounts_approval_required --value="$approval_required" - ynh_app_setting_delete --app="$app" --key=approval_required - fi - if [ -n "$reason_required" ] - then - ynh_app_setting_set --app="$app" --key=accounts_reason_required --value="$reason_required" - ynh_app_setting_delete --app="$app" --key=reason_required - fi - if [ -n "$registration_open" ] - then - ynh_app_setting_set --app="$app" --key=accounts_registration_open --value="$registration_open" - ynh_app_setting_delete --app="$app" --key=registration_open - fi + # get settings from problem key + allow_custom_css=$(ynh_app_setting_get --app="$app" --key=allow_custom_css) + approval_required=$(ynh_app_setting_get --app="$app" --key=approval_required) + reason_required=$(ynh_app_setting_get --app="$app" --key=reason_required) + registration_open=$(ynh_app_setting_get --app="$app" --key=registration_open) + # apply setting to correct key if set on old key + if [ -n "$allow_custom_css" ] + then + ynh_app_setting_set --app="$app" --key=accounts_allow_custom_css --value="$allow_custom_css" + ynh_app_setting_delete --app="$app" --key=allow_custom_css + fi + if [ -n "$approval_required" ] + then + ynh_app_setting_set --app="$app" --key=accounts_approval_required --value="$approval_required" + ynh_app_setting_delete --app="$app" --key=approval_required + fi + if [ -n "$reason_required" ] + then + ynh_app_setting_set --app="$app" --key=accounts_reason_required --value="$reason_required" + ynh_app_setting_delete --app="$app" --key=reason_required + fi + if [ -n "$registration_open" ] + then + ynh_app_setting_set --app="$app" --key=accounts_registration_open --value="$registration_open" + ynh_app_setting_delete --app="$app" --key=registration_open + fi fi #================================================= From d70bd632ec7a74b74a4837edba707b24cac16be8 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Apr 2023 13:41:37 +0000 Subject: [PATCH 2/4] Upgrade to v0.8.1 --- conf/arm64.src | 6 +++--- conf/armv6.src | 6 +++--- conf/armv7.src | 6 +++--- conf/i386.src | 6 +++--- conf/x86-64.src | 6 +++--- manifest.json | 2 +- 6 files changed, 16 insertions(+), 16 deletions(-) diff --git a/conf/arm64.src b/conf/arm64.src index b22b1a8..9638143 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_arm64.tar.gz -SOURCE_SUM=5dc2e205f8d254c4b17880d830efc34e135a3feade5347d8bfe8ad04912cf121 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_arm64.tar.gz +SOURCE_SUM=671d66a6c7cd6b96b7499bf3e6419a1c4cc9278ff532191c0bcecc025fd4a0db SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.8.0_linux_arm64.tar.gz +SOURCE_FILENAME=gotosocial_0.8.1_linux_arm64.tar.gz diff --git a/conf/armv6.src b/conf/armv6.src index cbe155c..9ce61fd 100644 --- a/conf/armv6.src +++ b/conf/armv6.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_armv6.tar.gz -SOURCE_SUM=9551e2d8f30db11a5b3c5539e4ed67f6ffd78d94afebb09c5ec98a91d7da4e3a +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_armv6.tar.gz +SOURCE_SUM=207aed157dd418d6a4a7e4cff74de0724e08b0be24cf7208122988a2d9da44cc SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.8.0_linux_armv6.tar.gz +SOURCE_FILENAME=gotosocial_0.8.1_linux_armv6.tar.gz diff --git a/conf/armv7.src b/conf/armv7.src index 3cafb01..a67e712 100644 --- a/conf/armv7.src +++ b/conf/armv7.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_armv7.tar.gz -SOURCE_SUM=7598eabfaed6ec6de0f7846d80b913708a2f115aac6cbce3be5428d92a63a6e4 +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_armv7.tar.gz +SOURCE_SUM=54117d643829ec0c3a8e47d036d2485747d301299964dd33178308e560e1b265 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.8.0_linux_armv7.tar.gz +SOURCE_FILENAME=gotosocial_0.8.1_linux_armv7.tar.gz diff --git a/conf/i386.src b/conf/i386.src index d78b7b5..d0c8e9c 100644 --- a/conf/i386.src +++ b/conf/i386.src @@ -1,7 +1,7 @@ -SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.0/gotosocial_0.8.0_linux_386.tar.gz -SOURCE_SUM=17ef690197873b23759d7d84c4801689637eba5093d24b8903fa46032d18b15b +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_386.tar.gz +SOURCE_SUM=8d1436b1eab293e97f3de3572b3631da1efb12b23dc29ffcdb76b40f8f925a0c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.8.0_linux_386.tar.gz +SOURCE_FILENAME=gotosocial_0.8.1_linux_386.tar.gz diff --git a/conf/x86-64.src b/conf/x86-64.src index 4cff682..512ed20 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.8.0/gotosocial_0.8.0_linux_amd64.tar.gz -SOURCE_SUM=7384267428167e8852223998995f83cad7670cd803688d562eda0d9c5d95ce5a +SOURCE_URL=https://github.com/superseriousbusiness/gotosocial/releases/download/v0.8.1/gotosocial_0.8.1_linux_amd64.tar.gz +SOURCE_SUM=32475bc78db64dbcfadb61b6c9b63542d9687fb9d42fa4c866f8136d86f8cf6d SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_EXTRACT=true SOURCE_IN_SUBDIR=false -SOURCE_FILENAME=gotosocial_0.8.0_linux_amd64.tar.gz +SOURCE_FILENAME=gotosocial_0.8.1_linux_amd64.tar.gz diff --git a/manifest.json b/manifest.json index 0ba3e16..9360a62 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "ActivityPub social network server", "fr": "Serveur de réseau social basé sur ActivityPub" }, - "version": "0.8.0~ynh3", + "version": "0.8.1~ynh1", "url": "https://github.com/superseriousbusiness/gotosocial", "upstream": { "license": "AGPL-3.0-only", From f5b4848e4c5d447845ebfcdfe3bd2a4c463d6ee0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Wed, 19 Apr 2023 13:41:44 +0000 Subject: [PATCH 3/4] 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 1c1509b..eca101f 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,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.8.0~ynh3 +**Shipped version:** 0.8.1~ynh1 ## Screenshots diff --git a/README_fr.md b/README_fr.md index c887184..b0c72d0 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,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.8.0~ynh3 +**Version incluse :** 0.8.1~ynh1 ## Captures d’écran From 8369b8d9ef339fb9fca3c4e3fe3ccb2b2266c13f Mon Sep 17 00:00:00 2001 From: OniriCorpe Date: Wed, 19 Apr 2023 16:01:52 +0200 Subject: [PATCH 4/4] fix small config typos (upstream) --- conf/config.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index a43a3ac..8e1fde9 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -317,9 +317,9 @@ cache: user-ttl: "30m" user-sweep-freq: "1m" - webfinger-max-size": 250 + webfinger-max-size: 250 webfinger-ttl: "24h" - webfinger-sweep-freq": "1m" + webfinger-sweep-freq: "1m" ###################### ##### WEB CONFIG #####