From a6dd24cf0d4012181aac7d1c478db7ba333042e0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Pi=C3=A9dallu?= Date: Sun, 9 Jun 2024 23:30:47 +0200 Subject: [PATCH 1/4] Fix config_panel.toml: bad help key --- config_panel.toml | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/config_panel.toml b/config_panel.toml index c6a23ce..8236951 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -73,7 +73,7 @@ services = ["__APP__"] [privacy.portal_rooms.text] ask = ''' !! Inviting the Bridge in an encrypted room !! - !! breaks real End-to-End Encryption (e2ee) !! + !! breaks real End-to-End Encryption (e2ee) !! !! Messages will be unencrypted on the Bridge Server !! ''' type = "markdown" @@ -85,7 +85,7 @@ services = ["__APP__"] no = "false" help = "Enable so-called End-to-Bridge (e2b) Encryption. For the Bridge to work in group chat Rooms with End-to-End Encryption (e2ee) enabled." bind = "encryption>allow:__INSTALL_DIR__/config.yaml" - + [privacy.portal_rooms.encryption_default] ask = "Force-enable Encryption in all Portal Rooms the Bridge creates?" type = "boolean" @@ -127,12 +127,10 @@ services = ["__APP__"] name = "Advanced Settings" services = ["__APP__"] - [advanced.help] + [advanced.helptext] name = "SETTINGS FOR EXPERTS IN SERVER ADMINISTRATION" - - [advanced.help.text] - ask = "!! There are **security and privacy risks** if you change these settings without knowing what you do !!" - type = "markdown" + ask = "!! There are **security and privacy risks** if you change these settings without knowing what you do !!" + type = "markdown" [advanced.telegram] name = "Telegram API MetaData" @@ -160,7 +158,7 @@ services = ["__APP__"] type = "string" help = "Defaults to 'mautrix-telegram'. 'auto' would set OS name+version" bind = ":__INSTALL_DIR__/config.yaml" - + [advanced.appservice] name = "HomeServer Application Service" @@ -197,4 +195,3 @@ services = ["__APP__"] help = "Defaults to: '8000'. The path is always /metrics" bind = "metrics>listen_port:__INSTALL_DIR__/config.yaml" visible = "enable_metrics" - From b72abe51e2e9a991cb8e26ad5ac054441e5d5ae9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 9 Jun 2024 21:31:00 +0000 Subject: [PATCH 2/4] Auto-update READMEs --- ALL_README.md | 1 + README_es.md | 44 ++++++++++++++++++++++++++++++++++++++++++++ README_zh_Hans.md | 2 +- 3 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 README_es.md diff --git a/ALL_README.md b/ALL_README.md index a01b345..152f2e7 100644 --- a/ALL_README.md +++ b/ALL_README.md @@ -1,6 +1,7 @@ # All available README files by language - [Read the README in English](README.md) +- [Lea 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) diff --git a/README_es.md b/README_es.md new file mode 100644 index 0000000..d99dae4 --- /dev/null +++ b/README_es.md @@ -0,0 +1,44 @@ + + +# Matrix-Telegram bridge para Yunohost + +[![Nivel de integración](https://dash.yunohost.org/integration/mautrix_telegram.svg)](https://dash.yunohost.org/appci/app/mautrix_telegram) ![Estado funcional](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.status.svg) ![Estado En Mantención](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.maintain.svg) + +[![Instalar Matrix-Telegram bridge con Yunhost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_telegram) + +*[Leer este README en otros idiomas.](./ALL_README.md)* + +> *Este paquete le permite instalarMatrix-Telegram bridge 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 puppeting bridge between Matrix and Telegram packaged as a YunoHost service. Messages, notifications (and sometimes media) are bridged between a Telegram user and a Matrix user. Currently the Matrix user can NOT invite other Matrix user in a bridged Telegram room, so only someone with a Telegram account can participate to Telegram group conversations. The ["Mautrix-Telegram"](https://docs.mau.fi/bridges/python/telegram/index.html) bridge is a Synapse App Service and relies on postgresql. Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) should be installed beforehand. + + +**Versión actual:** 0.15.1~ynh2 +## Documentaciones y recursos + +- Sitio web oficial: +- Documentación usuario oficial: +- Documentación administrador 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/mautrix_telegram_ynh/tree/testing + +Para probar la rama `testing`, sigue asÍ: + +```bash +sudo yunohost app install https://github.com/YunoHost-Apps/mautrix_telegram_ynh/tree/testing --debug +o +sudo yunohost app upgrade mautrix_telegram -u https://github.com/YunoHost-Apps/mautrix_telegram_ynh/tree/testing --debug +``` + +**Mas informaciones sobre el empaquetado de aplicaciones:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index ecec6f6..933db1b 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -3,7 +3,7 @@ 请勿手动编辑。 --> -# YunoHost 的 Matrix-Telegram bridge +# YunoHost 上的 Matrix-Telegram bridge [![集成程度](https://dash.yunohost.org/integration/mautrix_telegram.svg)](https://dash.yunohost.org/appci/app/mautrix_telegram) ![工作状态](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.status.svg) ![维护状态](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.maintain.svg) From 18259c28d15da0c0a4a7ea1f229782a1f2851dbd Mon Sep 17 00:00:00 2001 From: Salamandar <6552989+Salamandar@users.noreply.github.com> Date: Mon, 10 Jun 2024 10:45:23 +0200 Subject: [PATCH 3/4] Update config_panel.toml - helptext should be a sub-key --- config_panel.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config_panel.toml b/config_panel.toml index 8236951..7fd64f6 100644 --- a/config_panel.toml +++ b/config_panel.toml @@ -127,7 +127,7 @@ services = ["__APP__"] name = "Advanced Settings" services = ["__APP__"] - [advanced.helptext] + [advanced.general.helptext] name = "SETTINGS FOR EXPERTS IN SERVER ADMINISTRATION" ask = "!! There are **security and privacy risks** if you change these settings without knowing what you do !!" type = "markdown" From 6d00d1f7ebd4cec950a037f9cb7fa3dc6dfe472c Mon Sep 17 00:00:00 2001 From: Yunohost-Bot <> Date: Sun, 23 Jun 2024 03:39:55 +0200 Subject: [PATCH 4/4] [autopatch] Do not delete logs on app removal --- scripts/remove | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/remove b/scripts/remove index 5e432a1..2d6010c 100755 --- a/scripts/remove +++ b/scripts/remove @@ -57,7 +57,6 @@ ynh_secure_remove --file="/etc/matrix-$synapse_instance/app-service/$app.yaml" /opt/yunohost/matrix-$synapse_instance/update_synapse_for_appservice.sh || ynh_die --message="Synapse can't restart with the appservice configuration" # Remove the log files -ynh_secure_remove --file="/var/log/$app" #================================================= # END OF SCRIPT