Merge remote-tracking branch 'origin/testing' into testing

README_es.md

@@ -0,0 +1,48 @@
+<!--
+Este archivo README esta generado automaticamente<https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+No se debe editar a mano.
+-->
+
+# Iceshrimp para Yunohost
+
+[![Nivel de integración](https://dash.yunohost.org/integration/iceshrimp.svg)](https://dash.yunohost.org/appci/app/iceshrimp) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/iceshrimp.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/iceshrimp.maintain.svg)
+
+[![Instalar Iceshrimp con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=iceshrimp)
+
+*[Leer este README en otros idiomas.](./ALL_README.md)*
+
+> *Este paquete le permite instalarIceshrimp 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
+
+Iceshrimp is a decentralized and federated social networking service, implementing the ActivityPub standard.
+
+It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
+
+**Versión actual:** 2023.12.6~ynh1
+
+## Capturas
+
+![Captura de Iceshrimp](./doc/screenshots/example.jpg)
+
+## Documentaciones y recursos
+
+- Sitio web oficial: <https://iceshrimp.dev>
+- Repositorio del código fuente oficial de la aplicación : <https://iceshrimp.dev/iceshrimp/iceshrimp>
+- Catálogo YunoHost: <https://apps.yunohost.org/app/iceshrimp>
+- Reportar un error: <https://github.com/YunoHost-Apps/iceshrimp_ynh/issues>
+
+## Información para desarrolladores
+
+Por favor enviar sus correcciones a la [`branch testing`](https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing
+
+Para probar la rama `testing`, sigue asÍ:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade iceshrimp -u https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing --debug
+```
+
+**Mas informaciones sobre el empaquetado de aplicaciones:** <https://yunohost.org/packaging_apps>

README_it.md

@@ -0,0 +1,48 @@
+<!--
+N.B.: Questo README è stato automaticamente generato da <https://github.com/YunoHost/apps/tree/master/tools/readme_generator>
+NON DEVE essere modificato manualmente.
+-->
+
+# Iceshrimp per YunoHost
+
+[![Livello di integrazione](https://dash.yunohost.org/integration/iceshrimp.svg)](https://dash.yunohost.org/appci/app/iceshrimp) ![Stato di funzionamento](https://ci-apps.yunohost.org/ci/badges/iceshrimp.status.svg) ![Stato di manutenzione](https://ci-apps.yunohost.org/ci/badges/iceshrimp.maintain.svg)
+
+[![Installa Iceshrimp con YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=iceshrimp)
+
+*[Leggi questo README in altre lingue.](./ALL_README.md)*
+
+> *Questo pacchetto ti permette di installare Iceshrimp su un server YunoHost in modo semplice e veloce.*  
+> *Se non hai YunoHost, consulta [la guida](https://yunohost.org/install) per imparare a installarlo.*
+
+## Panoramica
+
+Iceshrimp is a decentralized and federated social networking service, implementing the ActivityPub standard.
+
+It was forked from Calckey Firefish (itself a fork of Misskey) in mid-2023, to focus on stability, performance and usability instead of new features.
+
+**Versione pubblicata:** 2023.12.5~ynh1
+
+## Screenshot
+
+![Screenshot di Iceshrimp](./doc/screenshots/example.jpg)
+
+## Documentazione e risorse
+
+- Sito web ufficiale dell’app: <https://iceshrimp.dev>
+- Repository upstream del codice dell’app: <https://iceshrimp.dev/iceshrimp/iceshrimp>
+- Store di YunoHost: <https://apps.yunohost.org/app/iceshrimp>
+- Segnala un problema: <https://github.com/YunoHost-Apps/iceshrimp_ynh/issues>
+
+## Informazioni per sviluppatori
+
+Si prega di inviare la tua pull request alla [branch di `testing`](https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing).
+
+Per provare la branch di `testing`, si prega di procedere in questo modo:
+
+```bash
+sudo yunohost app install https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing --debug
+o
+sudo yunohost app upgrade iceshrimp -u https://github.com/YunoHost-Apps/iceshrimp_ynh/tree/testing --debug
+```
+
+**Maggiori informazioni riguardo il pacchetto di quest’app:** <https://yunohost.org/packaging_apps>

README_zh_Hans.md

@@ -3,7 +3,6 @@
 请勿手动编辑。
 -->
 
-# YunoHost 的 Iceshrimp
 
 [![集成程度](https://dash.yunohost.org/integration/iceshrimp.svg)](https://dash.yunohost.org/appci/app/iceshrimp) ![工作状态](https://ci-apps.yunohost.org/ci/badges/iceshrimp.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/iceshrimp.maintain.svg)
 

manifest.toml

@@ -5,7 +5,6 @@ name = "Iceshrimp"
 description.en = "Decentralized and federated social networking service"
 description.fr = "Service de réseau social décentralisé et fédéré"
 
-version = "2023.12.7~ynh1"
 
 maintainers = ["oufmilo"]
 
@@ -15,7 +14,7 @@ website = "https://iceshrimp.dev"
 code = "https://iceshrimp.dev/iceshrimp/iceshrimp"
 
 [integration]
-yunohost = ">= 11.2"
+yunohost = ">= 11.2.12"
 architectures = "all"
 multi_instance = false
 
@@ -56,4 +55,4 @@ ram.runtime = "2G"
     extras.yarn.packages = "yarn"
 
     [resources.database]
-    type = "postgresql"
+    type = "postgresql"

scripts/_common.sh

@@ -15,45 +15,3 @@ NODEJS_VERSION="20"
 #=================================================
 # 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
-}

scripts/install

@@ -69,9 +69,9 @@ ynh_script_progression --message="Building app... This will take some time." --w
 
 pushd "$install_dir"
 	ynh_use_nodejs
-	corepack enable
+	env $ynh_node_load_PATH corepack enable
-	corepack prepare --activate
+	env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn run init
 popd
@@ -112,4 +112,4 @@ ynh_systemd_action --service_name=$app --action="start" --log_path=systemd --lin
 # END OF SCRIPT
 #=================================================
 
-ynh_script_progression --message="Installation of $app completed"
+ynh_script_progression --message="Installation of $app completed"

scripts/restore

@@ -39,9 +39,9 @@ ynh_script_progression --message="Reinstalling yarn..." --weight=1
 # Define and install yarn
 pushd "$install_dir"	
 	ynh_use_nodejs
-	corepack enable
+	env $ynh_node_load_PATH corepack enable
-	corepack prepare --activate
+	env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare --activate
-	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install 
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn install
 	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build
 popd
 

scripts/upgrade

@@ -97,9 +97,9 @@ ynh_script_progression --message="Building app..."
 
 pushd "$install_dir"
 	ynh_use_nodejs
-    corepack enable
+	env $ynh_node_load_PATH corepack enable
-    corepack prepare --activate
+	env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 corepack prepare --activate
-    ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn cleanall
+	ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH COREPACK_ENABLE_DOWNLOAD_PROMPT=0 yarn cleanall
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn install
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH NODE_ENV=production yarn build
     ynh_exec_warn_less ynh_exec_as $app env $ynh_node_load_PATH yarn migrate

tests.toml

@@ -16,4 +16,3 @@ test_format = 1.0
     # Commits to test upgrade from
     # -------------------------------
 
-    test_upgrade_from.301fb02ad44d52c752769dd02de86d88c2c035e9.name = "2023.12.6"