From 1bebc6c2891ba4f5a2481ac4c1117492df0f8147 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:56:56 +0200 Subject: [PATCH 01/13] Fix restore --- scripts/restore | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/scripts/restore b/scripts/restore index 0fea344..c20e113 100644 --- a/scripts/restore +++ b/scripts/restore @@ -31,6 +31,23 @@ ynh_script_progression --message="Reinstalling dependencies..." --weight=5 # Define and install dependencies ynh_install_nodejs --nodejs_version=$NODEJS_VERSION +#================================================= +# ADD A CONFIGURATION +#================================================= +ynh_script_progression --message="Adding a configuration file..." --weight=1 + +# Configure redis +redis_db=$(ynh_redis_get_free_db) +ynh_app_setting_set --app="$app" --key=redis_db --value="$redis_db" + +ynh_add_config --template="../conf/default.yml" --destination="$install_dir/.config/default.yml" + +chmod 750 "$install_dir" +chmod -R o-rwx "$install_dir" +chown -R $app:www-data "$install_dir" +chmod 400 "$install_dir/.config/default.yml" +chown $app:$app "$install_dir/.config/default.yml" + #================================================= # REINSTALL PNPM #================================================= From ae7750b452f57ad3657e86dcd16f6b2fab2febf5 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:56:17 +0200 Subject: [PATCH 02/13] Update updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 7643597..d88eff2 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -11,7 +11,7 @@ # Remove this exit command when you are ready to run this Action -exit 1 +# exit 1 #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS From bc2024c375dba19fdf83fd46e1593c33bf014f27 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 19 Jul 2023 13:59:52 +0200 Subject: [PATCH 03/13] Update updater.sh --- .github/workflows/updater.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index d88eff2..7643597 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -11,7 +11,7 @@ # Remove this exit command when you are ready to run this Action -# exit 1 +exit 1 #================================================= # FETCHING LATEST RELEASE AND ITS ASSETS From 55f3b19a65ec01c23a4fc86d92b2fe410cd52300 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Wed, 19 Jul 2023 15:13:23 +0200 Subject: [PATCH 04/13] Delete .github/workflows directory --- .github/workflows/updater.sh | 140 ---------------------------------- .github/workflows/updater.yml | 50 ------------ 2 files changed, 190 deletions(-) delete mode 100755 .github/workflows/updater.sh delete mode 100644 .github/workflows/updater.yml diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh deleted file mode 100755 index 7643597..0000000 --- a/.github/workflows/updater.sh +++ /dev/null @@ -1,140 +0,0 @@ -#!/bin/bash - -#================================================= -# PACKAGE UPDATING HELPER -#================================================= - -# This script is meant to be run by GitHub Actions -# The YunoHost-Apps organisation offers a template Action to run this script periodically -# Since each app is different, maintainers can adapt its contents so as to perform -# automatic actions when a new upstream release is detected. - -# Remove this exit command when you are ready to run this Action - -exit 1 - -#================================================= -# FETCHING LATEST RELEASE AND ITS ASSETS -#================================================= - -# Fetching information -current_version=$(cat manifest.toml | tomlq -j '.version|split("~")[0]') -repo=$(cat manifest.toml | tomlq -j '.upstream.code|split("https://codeberg.org/")[1]') - -# Some jq magic is needed, because the latest upstream release is not always the latest version (e.g. security patches for older versions) -latest_release_json=$(curl --silent "https://codeberg.org/api/v1/repos/calckey/calckey/releases" | jq -r '[.[] | select( .prerelease != true )][0]') -version=$(echo $latest_release_json | jq -r '.tag_name') -assets=$(echo $latest_release_json | jq -r '[ .tarball_url ] | join(" ") | @sh' | tr -d "'") - -# Later down the script, we assume the version has only digits and dots -# Sometimes the release name starts with a "v", so let's filter it out. -# You may need more tweaks here if the upstream repository has different naming conventions. -if [[ ${version:0:1} == "v" || ${version:0:1} == "V" ]]; then - version=${version:1} -fi - -# Setting up the environment variables -echo "Current version: $current_version" -echo "Latest release from upstream: $version" -echo "VERSION=$version" >> $GITHUB_ENV -echo "REPO=$repo" >> $GITHUB_ENV -# For the time being, let's assume the script will fail -echo "PROCEED=false" >> $GITHUB_ENV - -# Proceed only if the retrieved version is greater than the current one -if ! dpkg --compare-versions "$current_version" "lt" "$version" ; then - echo "::warning ::No new version available" - exit 0 -# Proceed only if a PR for this new version does not already exist -elif git ls-remote -q --exit-code --heads https://github.com/$GITHUB_REPOSITORY.git ci-auto-update-v$version ; then - echo "::warning ::A branch already exists for this update" - exit 0 -fi - -# Each release can hold multiple assets (e.g. binaries for different architectures, source code, etc.) -echo "${#assets[@]} available asset(s)" - -#================================================= -# UPDATE SOURCE FILES -#================================================= - -# Here we use the $assets variable to get the resources published in the upstream release. -# Here is an example for Grav, it has to be adapted in accordance with how the upstream releases look like. - -# Let's loop over the array of assets URLs -for asset_url in ${assets[@]}; do - -echo "Handling asset at $asset_url" - -# Assign the asset to a source file in conf/ directory -# Here we base the source file name upon a unique keyword in the assets url (admin vs. update) -# Leave $src empty to ignore the asset -case $asset_url in - *"admin"*) - src="app" - ;; - *"update"*) - src="app-upgrade" - ;; - *) - src="" - ;; -esac - -# If $src is not empty, let's process the asset -if [ ! -z "$src" ]; then - -# Create the temporary directory -tempdir="$(mktemp -d)" - -# Download sources and calculate checksum -filename=${asset_url##*/} -curl --silent -4 -L $asset_url -o "$tempdir/$filename" -checksum=$(sha256sum "$tempdir/$filename" | head -c 64) - -# Delete temporary directory -rm -rf $tempdir - -# Get extension -if [[ $filename == *.tar.gz ]]; then - extension=tar.gz -else - extension=${filename##*.} -fi - -# Rewrite source file -cat < conf/$src.src -SOURCE_URL=$asset_url -SOURCE_SUM=$checksum -SOURCE_SUM_PRG=sha256sum -SOURCE_FORMAT=$extension -SOURCE_IN_SUBDIR=true -SOURCE_FILENAME= -EOT -echo "... conf/$src.src updated" - -else -echo "... asset ignored" -fi - -done - -#================================================= -# SPECIFIC UPDATE STEPS -#================================================= - -# Any action on the app's source code can be done. -# The GitHub Action workflow takes care of committing all changes after this script ends. - -#================================================= -# GENERIC FINALIZATION -#================================================= - -# Replace new version in manifest -echo "$(tomlq -s --indent 4 ".[] | .version = \"$version~ynh1\"" manifest.toml)" > manifest.toml - -# No need to update the README, yunohost-bot takes care of it - -# The Action will proceed only if the PROCEED environment variable is set to true -echo "PROCEED=true" >> $GITHUB_ENV -exit 0 diff --git a/.github/workflows/updater.yml b/.github/workflows/updater.yml deleted file mode 100644 index 4a866ff..0000000 --- a/.github/workflows/updater.yml +++ /dev/null @@ -1,50 +0,0 @@ -# This workflow allows GitHub Actions to automagically update your app whenever a new upstream release is detected. -# You need to enable Actions in your repository settings, and fetch this Action from the YunoHost-Apps organization. -# This file should be enough by itself, but feel free to tune it to your needs. -# It calls updater.sh, which is where you should put the app-specific update steps. -name: Check for new upstream releases -on: - # Allow to manually trigger the workflow - workflow_dispatch: - # Run it every day at 6:00 UTC - schedule: - - cron: '0 6 * * *' -jobs: - updater: - runs-on: ubuntu-latest - steps: - - name: Fetch the source code - uses: actions/checkout@v3 - with: - token: ${{ secrets.GITHUB_TOKEN }} - - name: Run the updater script - id: run_updater - run: | - # Setting up Git user - git config --global user.name 'yunohost-bot' - git config --global user.email 'yunohost-bot@users.noreply.github.com' - # Run the updater script - /bin/bash .github/workflows/updater.sh - - name: Commit changes - id: commit - if: ${{ env.PROCEED == 'true' }} - run: | - git commit -am "Upgrade to v$VERSION" - - name: Create Pull Request - id: cpr - if: ${{ env.PROCEED == 'true' }} - uses: peter-evans/create-pull-request@v4 - with: - token: ${{ secrets.GITHUB_TOKEN }} - commit-message: Update to version ${{ env.VERSION }} - committer: 'yunohost-bot ' - author: 'yunohost-bot ' - signoff: false - base: testing - branch: ci-auto-update-v${{ env.VERSION }} - delete-branch: true - title: 'Upgrade to version ${{ env.VERSION }}' - body: | - Upgrade to v${{ env.VERSION }} - [See upstream release page](https://github.com/${{ env.REPO }}/releases/tag/v${{ env.VERSION }}) - draft: false From 38255f1d83cd03498cc9f7ae90a3a4e567dae85e Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:52:37 +0200 Subject: [PATCH 05/13] Fix sha256 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5abc9e2..823eca8 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,7 +41,7 @@ ram.runtime = "2G" [resources.sources.main] url = "https://codeberg.org/calckey/calckey/archive/v13.1.4.1.tar.gz" - sha256 = "5bd66e8ade6abaf205da6c4ad9a9389719c09ce0bbf672389e1b84af48afcbbc" + sha256 = "20ca08c1b5fec5c5029a7f85d1a97d19955722e7cbe84c45089bcc7c9bfb8af1" [resources.system_user] From 8ba06100a1d1b4cd448d21ad7efd2e5de5588fce Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 28 Jul 2023 13:56:48 +0200 Subject: [PATCH 06/13] Fix sha256 --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 823eca8..034a666 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,8 +40,8 @@ ram.runtime = "2G" [resources] [resources.sources.main] - url = "https://codeberg.org/calckey/calckey/archive/v13.1.4.1.tar.gz" - sha256 = "20ca08c1b5fec5c5029a7f85d1a97d19955722e7cbe84c45089bcc7c9bfb8af1" + url = "https://codeberg.org/firefish/firefish/archive/v13.1.4.1.tar.gz" + sha256 = "5bd66e8ade6abaf205da6c4ad9a9389719c09ce0bbf672389e1b84af48afcbbc" [resources.system_user] From 6aef0b99af1f6ee8e465fa3273292533738f3df1 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Fri, 28 Jul 2023 14:03:03 +0200 Subject: [PATCH 07/13] Fix sha256 --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 034a666..5eb5c91 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,7 +41,7 @@ ram.runtime = "2G" [resources.sources.main] url = "https://codeberg.org/firefish/firefish/archive/v13.1.4.1.tar.gz" - sha256 = "5bd66e8ade6abaf205da6c4ad9a9389719c09ce0bbf672389e1b84af48afcbbc" + sha256 = "20ca08c1b5fec5c5029a7f85d1a97d19955722e7cbe84c45089bcc7c9bfb8af1" [resources.system_user] From 81b98c525d091d999e8f97fa6606fa04e6f2218a Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 29 Jul 2023 09:51:01 +0200 Subject: [PATCH 08/13] Update manifest.toml --- manifest.toml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/manifest.toml b/manifest.toml index 5eb5c91..5fd3abb 100644 --- a/manifest.toml +++ b/manifest.toml @@ -40,7 +40,7 @@ ram.runtime = "2G" [resources] [resources.sources.main] - url = "https://codeberg.org/firefish/firefish/archive/v13.1.4.1.tar.gz" + url = "https://git.joinfirefish.org/firefish/firefish/-/archive/v13.1.4.1/firefish-v13.1.4.1.tar.gz" sha256 = "20ca08c1b5fec5c5029a7f85d1a97d19955722e7cbe84c45089bcc7c9bfb8af1" [resources.system_user] @@ -57,4 +57,4 @@ ram.runtime = "2G" packages = "ffmpeg, postgresql, build-essential" [resources.database] - type = "postgresql" \ No newline at end of file + type = "postgresql" From e46a6a82acfd87435101ba823de7fbba020f1909 Mon Sep 17 00:00:00 2001 From: oufmilo <44617467+oufmilo@users.noreply.github.com> Date: Sat, 29 Jul 2023 09:52:01 +0200 Subject: [PATCH 09/13] Update manifest.toml --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 5fd3abb..aec8fed 100644 --- a/manifest.toml +++ b/manifest.toml @@ -41,7 +41,7 @@ ram.runtime = "2G" [resources.sources.main] url = "https://git.joinfirefish.org/firefish/firefish/-/archive/v13.1.4.1/firefish-v13.1.4.1.tar.gz" - sha256 = "20ca08c1b5fec5c5029a7f85d1a97d19955722e7cbe84c45089bcc7c9bfb8af1" + sha256 = "658965f878fb0f5b22a6f29b5c63723f052a64f6b9bd8d9a3da93849231e3e62" [resources.system_user] From 38117a9b107fe0b1d56a8c219cc70513b58d6caa Mon Sep 17 00:00:00 2001 From: tituspijean Date: Tue, 26 Sep 2023 11:19:48 +0200 Subject: [PATCH 10/13] Add deprecation notice --- manifest.toml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/manifest.toml b/manifest.toml index aec8fed..0b40952 100644 --- a/manifest.toml +++ b/manifest.toml @@ -15,6 +15,10 @@ website = "https://i.calckey.cloud/" demo = "https://i.calckey.cloud/" code = "https://codeberg.org/calckey/calckey" +[antifeatures] +deprecated-software.en = "Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances." +deprecated-software.fr = "Calckey a été remplacée par Firefish, installez plutôt cette nouvelle application. Une procédure de migration est en cours de développement pour les instances existantes." + [integration] yunohost = ">= 11.1.14" architectures = "all" From d0e086a996a380ad481fae9b10568cc72d215129 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 31 Oct 2023 14:00:20 +0000 Subject: [PATCH 11/13] Auto-update README --- README.md | 6 +++++- README_fr.md | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 80bd35c..f44463b 100644 --- a/README.md +++ b/README.md @@ -33,11 +33,15 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo ![Screenshot of Calckey](./doc/screenshots/screenshot-calckey.png) +## :red_circle: Antifeatures + +- **Upstream not maintained**: Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances. + ## Documentation and resources * Official app website: * Upstream app code repository: -* YunoHost documentation for this app: +* YunoHost Store: * Report a bug: ## Developer info diff --git a/README_fr.md b/README_fr.md index fe38311..20eaa54 100644 --- a/README_fr.md +++ b/README_fr.md @@ -31,11 +31,15 @@ Un fork grandement amélioré de Misskey avec une meilleure UI/UX, sécurité, f ![Capture d’écran de Calckey](./doc/screenshots/screenshot-calckey.png) +## :red_circle: Fonctions indésirables + +- **Upstream not maintained**: Calckey a été remplacée par Firefish, installez plutôt cette nouvelle application. Une procédure de migration est en cours de développement pour les instances existantes. + ## Documentations et ressources * Site officiel de l’app : * Dépôt de code officiel de l’app : -* Documentation YunoHost pour cette app : +* YunoHost Store: * Signaler un bug : ## Informations pour les développeurs From 0d5125c82e54f15502fe569a89e24c3a7eaed1f2 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 20 May 2024 14:10:37 +0000 Subject: [PATCH 12/13] Auto-update READMEs --- ALL_README.md | 8 +++++++ README.md | 24 +++++++++---------- README_es.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++ README_eu.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++ README_fr.md | 34 +++++++++++++-------------- README_gl.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 59 +++++++++++++++++++++++++++++++++++++++++++++++ 7 files changed, 273 insertions(+), 29 deletions(-) create mode 100644 ALL_README.md create mode 100644 README_es.md create mode 100644 README_eu.md create mode 100644 README_gl.md create mode 100644 README_zh_Hans.md diff --git a/ALL_README.md b/ALL_README.md new file mode 100644 index 0000000..8938aae --- /dev/null +++ b/ALL_README.md @@ -0,0 +1,8 @@ +# All available README files by language + +- [Read the README in English](README.md) +- [Lee el README en español](README_es.md) +- [Irakurri README euskaraz](README_eu.md) +- [Lire le README en français](README_fr.md) +- [Le o README en galego](README_gl.md) +- [阅读中文（简体）的 README](README_zh_Hans.md) diff --git a/README.md b/README.md index f44463b..1b5a1a7 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Install Calckey with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) -*[Lire ce readme en français.](./README_fr.md)* +*[Read this README in other languages.](./ALL_README.md)* -> *This package allows you to install Calckey quickly and simply on a YunoHost server. -If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/install) to learn how to install it.* +> *This package allows you to install Calckey quickly and simply on a YunoHost server.* +> *If you don't have YunoHost, please consult [the guide](https://yunohost.org/install) to learn how to install it.* ## Overview @@ -27,7 +27,7 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo **Shipped version:** 13.1.4.1~ynh1 -**Demo:** https://i.calckey.cloud/ +**Demo:** ## Screenshots @@ -39,18 +39,18 @@ A greatly enhanced fork of Misskey with better UI/UX, security, features, and mo ## Documentation and resources -* Official app website: -* Upstream app code repository: -* YunoHost Store: -* Report a bug: +- Official app website: +- Upstream app code repository: +- YunoHost Store: +- Report a bug: ## Developer info -Please send your pull request to the [testing branch](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing). +Please send your pull request to the [`testing` branch](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing). -To try the testing branch, please proceed like that. +To try the `testing` branch, please proceed like that: -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug or sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..b8c8415 --- /dev/null +++ b/README_es.md @@ -0,0 +1,59 @@ + + +# Calckey para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg) + +[![Instalar Calckey con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarCalckey rapidamente y simplement en un servidor YunoHost.* +> *Si no tiene YunoHost, visita [the guide](https://yunohost.org/install) para aprender como instalarla.* + +## Descripción general + + +A greatly enhanced fork of Misskey with better UI/UX, security, features, and more! https://i.calckey.cloud/ + + + Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more! + Calckey adds many quality of life changes and bug fixes for users and instance admins alike. + + + +**Versión actual:** 13.1.4.1~ynh1 + +**Demo:** + +## Capturas + +![Captura de Calckey](./doc/screenshots/screenshot-calckey.png) + +## :red_circle: funcionalidades no deseadas + +- **Upstream not maintained**: Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances. + +## Documentaciones y recursos + +- Sitio web oficial: +- Repositorio del código fuente oficial de la aplicación : +- Catálogo YunoHost: +- Reportar un error: + +## Información para desarrolladores + +Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +o +sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_eu.md b/README_eu.md new file mode 100644 index 0000000..58a2f62 --- /dev/null +++ b/README_eu.md @@ -0,0 +1,59 @@ + + +# Calckey YunoHost-erako + +[![Integrazio maila](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Funtzionamendu egoera](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Mantentze egoera](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg) + +[![Instalatu Calckey YunoHost-ekin](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) + +*[Irakurri README hau beste hizkuntzatan.](./ALL_README.md)* + +> *Pakete honek Calckey YunoHost zerbitzari batean azkar eta zailtasunik gabe instalatzea ahalbidetzen dizu.* +> *YunoHost ez baduzu, kontsultatu [gida](https://yunohost.org/install) nola instalatu ikasteko.* + +## Aurreikuspena + + +A greatly enhanced fork of Misskey with better UI/UX, security, features, and more! https://i.calckey.cloud/ + + + Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more! + Calckey adds many quality of life changes and bug fixes for users and instance admins alike. + + + +**Paketatutako bertsioa:** 13.1.4.1~ynh1 + +**Demoa:** + +## Pantaila-argazkiak + +![Calckey(r)en pantaila-argazkia](./doc/screenshots/screenshot-calckey.png) + +## :red_circle: Ezaugarri zalantzagarriak + +- **Jatorrizko garapena utzita**: Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances. + +## Dokumentazioa eta baliabideak + +- Aplikazioaren webgune ofiziala: +- Jatorrizko aplikazioaren kode-gordailua: +- YunoHost Denda: +- Eman errore baten berri: + +## Garatzaileentzako informazioa + +Bidali `pull request`a [`testing` abarrera](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing). + +`testing` abarra probatzeko, ondorengoa egin: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +edo +sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +``` + +**Informazio gehiago aplikazioaren paketatzeari buruz:** diff --git a/README_fr.md b/README_fr.md index 20eaa54..0637a5c 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,6 +1,6 @@ # Calckey pour YunoHost @@ -9,10 +9,10 @@ It shall NOT be edited by hand. [![Installer Calckey avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) -*[Read this readme in english.](./README.md)* +*[Lire le README dans d'autres langues.](./ALL_README.md)* -> *Ce package vous permet d’installer Calckey rapidement et simplement sur un serveur YunoHost. -Si vous n’avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour savoir comment l’installer et en profiter.* +> *Ce package vous permet d’installer Calckey rapidement et simplement sur un serveur YunoHost.* +> *Si vous n’avez pas YunoHost, consultez [ce guide](https://yunohost.org/install) pour savoir comment l’installer et en profiter.* ## Vue d’ensemble @@ -23,35 +23,35 @@ Un fork grandement amélioré de Misskey avec une meilleure UI/UX, sécurité, f Calckey ajoute de nombreux changements de qualité de vie et des corrections de bogues pour les utilisateurs et les administrateurs d'instance. -**Version incluse :** 13.1.4.1~ynh1 +**Version incluse :** 13.1.4.1~ynh1 -**Démo :** https://i.calckey.cloud/ +**Démo :** ## Captures d’écran ![Capture d’écran de Calckey](./doc/screenshots/screenshot-calckey.png) -## :red_circle: Fonctions indésirables +## :red_circle: Anti-fonctionnalités -- **Upstream not maintained**: Calckey a été remplacée par Firefish, installez plutôt cette nouvelle application. Une procédure de migration est en cours de développement pour les instances existantes. +- **Application non maintenue **: Calckey a été remplacée par Firefish, installez plutôt cette nouvelle application. Une procédure de migration est en cours de développement pour les instances existantes. ## Documentations et ressources -* Site officiel de l’app : -* Dépôt de code officiel de l’app : -* YunoHost Store: -* Signaler un bug : +- Site officiel de l’app : +- Dépôt de code officiel de l’app : +- YunoHost Store : +- Signaler un bug : ## Informations pour les développeurs -Merci de faire vos pull request sur la [branche testing](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing). +Merci de faire vos pull request sur la [branche `testing`](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing). -Pour essayer la branche testing, procédez comme suit. +Pour essayer la branche `testing`, procédez comme suit : -``` bash +```bash sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug ou sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug ``` -**Plus d’infos sur le packaging d’applications :** \ No newline at end of file +**Plus d’infos sur le packaging d’applications :** diff --git a/README_gl.md b/README_gl.md new file mode 100644 index 0000000..ecbe9ab --- /dev/null +++ b/README_gl.md @@ -0,0 +1,59 @@ + + +# Calckey para YunoHost + +[![Nivel de integración](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![Estado de funcionamento](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![Estado de mantemento](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg) + +[![Instalar Calckey con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) + +*[Le este README en outros idiomas.](./ALL_README.md)* + +> *Este paquete permíteche instalar Calckey de xeito rápido e doado nun servidor YunoHost.* +> *Se non usas YunoHost, le a [documentación](https://yunohost.org/install) para saber como instalalo.* + +## Vista xeral + + +A greatly enhanced fork of Misskey with better UI/UX, security, features, and more! https://i.calckey.cloud/ + + + Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more! + Calckey adds many quality of life changes and bug fixes for users and instance admins alike. + + + +**Versión proporcionada:** 13.1.4.1~ynh1 + +**Demo:** + +## Capturas de pantalla + +![Captura de pantalla de Calckey](./doc/screenshots/screenshot-calckey.png) + +## :red_circle: Debes considerar + +- **Upstream not maintained**: Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances. + +## Documentación e recursos + +- Web oficial da app: +- Repositorio de orixe do código: +- Tenda YunoHost: +- Informar dun problema: + +## Info de desenvolvemento + +Envía a túa colaboración á [rama `testing`](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing). + +Para probar a rama `testing`, procede deste xeito: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +ou +sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +``` + +**Máis info sobre o empaquetado da app:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md new file mode 100644 index 0000000..5f4826c --- /dev/null +++ b/README_zh_Hans.md @@ -0,0 +1,59 @@ + + +# YunoHost 上的 Calckey + +[![集成程度](https://dash.yunohost.org/integration/calckey.svg)](https://dash.yunohost.org/appci/app/calckey) ![工作状态](https://ci-apps.yunohost.org/ci/badges/calckey.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/calckey.maintain.svg) + +[![使用 YunoHost 安装 Calckey](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=calckey) + +*[阅读此 README 的其它语言版本。](./ALL_README.md)* + +> *通过此软件包，您可以在 YunoHost 服务器上快速、简单地安装 Calckey。* +> *如果您还没有 YunoHost，请参阅[指南](https://yunohost.org/install)了解如何安装它。* + +## 概况 + + +A greatly enhanced fork of Misskey with better UI/UX, security, features, and more! https://i.calckey.cloud/ + + + Calckey is based off of Misskey, a powerful microblogging server on ActivityPub with features such as emoji reactions, a customizable web UI, rich chatting, and much more! + Calckey adds many quality of life changes and bug fixes for users and instance admins alike. + + + +**分发版本：** 13.1.4.1~ynh1 + +**演示：** + +## 截图 + +![Calckey 的截图](./doc/screenshots/screenshot-calckey.png) + +## :red_circle: 负面特征 + +- **Upstream not maintained**: Calckey has been replaced by Firefish, install that new app instead. A migration procedure is being developed for existing instances. + +## 文档与资源 + +- 官方应用网站： +- 上游应用代码库： +- YunoHost 商店： +- 报告 bug： + +## 开发者信息 + +请向 [`testing` 分支](https://github.com/YunoHost-Apps/calckey_ynh/tree/testing) 发送拉取请求。 + +如要尝试 `testing` 分支，请这样操作： + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +或 +sudo yunohost app upgrade calckey -u https://github.com/YunoHost-Apps/calckey_ynh/tree/testing --debug +``` + +**有关应用打包的更多信息：** From 22fb2f8d05fb77e2f0987601482bff36662f69ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Mon, 20 May 2024 16:11:06 +0200 Subject: [PATCH 13/13] Use standard redis helpers --- manifest.toml | 10 +++++----- scripts/_common.sh | 42 ------------------------------------------ 2 files changed, 5 insertions(+), 47 deletions(-) diff --git a/manifest.toml b/manifest.toml index 0b40952..e3adcfe 100644 --- a/manifest.toml +++ b/manifest.toml @@ -20,12 +20,12 @@ deprecated-software.en = "Calckey has been replaced by Firefish, install that ne deprecated-software.fr = "Calckey a été remplacée par Firefish, installez plutôt cette nouvelle application. Une procédure de migration est en cours de développement pour les instances existantes." [integration] -yunohost = ">= 11.1.14" -architectures = "all" +yunohost = ">= 11.2.12" +architectures = "all" multi_instance = false -ldap = "not_relevant" -sso = "not_relevant" -disk = "50M" +ldap = "not_relevant" +sso = "not_relevant" +disk = "50M" ram.build = "2G" ram.runtime = "2G" diff --git a/scripts/_common.sh b/scripts/_common.sh index 42e7239..de73ab0 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -15,45 +15,3 @@ NODEJS_VERSION="19" #================================================= # EXPERIMENTAL HELPERS #================================================= - -#================================================= -# REDIS HELPERS -#================================================= - -# get the first available redis database -# -# usage: ynh_redis_get_free_db -# | returns: the database number to use -ynh_redis_get_free_db() { - local result max db - result="$(redis-cli INFO keyspace)" - - # get the num - max=$(cat /etc/redis/redis.conf | grep ^databases | grep -Eow "[0-9]+") - - db=0 - # default Debian setting is 15 databases - for i in $(seq 0 "$max") - do - if ! echo "$result" | grep -q "db$i" - then - db=$i - break 1 - fi - db=-1 - done - - test "$db" -eq -1 && ynh_die --message="No available Redis databases..." - - echo "$db" -} - -# Create a master password and set up global settings -# Please always call this script in install and restore scripts -# -# usage: ynh_redis_remove_db database -# | arg: database - the database to erase -ynh_redis_remove_db() { - local db=$1 - redis-cli -n "$db" flushall -}