From fe7e9d54ee4a6901c7915f6ec8b9c7857494f9f9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 27 Nov 2023 06:24:29 +0000 Subject: [PATCH 1/4] Upgrade to v0.15.0 --- conf/app.src | 4 ++-- conf/config.yaml | 24 ++++-------------------- manifest.json | 2 +- 3 files changed, 7 insertions(+), 23 deletions(-) diff --git a/conf/app.src b/conf/app.src index f8487da..cd37600 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/telegram/archive/refs/tags/v0.14.2.tar.gz -SOURCE_SUM=8071beb09970d7a337e1a1f7700ecd3f4ef774ba51f2e7199f0216883f023786 +SOURCE_URL=https://github.com/mautrix/telegram/archive/refs/tags/v0.15.0.tar.gz +SOURCE_SUM=93060a58be005f441402e569d9ba3ad84bdc51e551a2e2d40b5e7e2b01f2413e SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/config.yaml b/conf/config.yaml index debc8f3..c0f96cb 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -325,6 +325,8 @@ bridge: # Disable generating reply fallbacks? Some extremely bad clients still rely on them, # but they're being phased out and will be completely removed in the future. disable_reply_fallbacks: false + # Should cross-chat replies from Telegram be bridged? Most servers and clients don't support this. + cross_room_replies: false # Whether or not the bridge should send a read receipt from the bridge bot when a message has # been sent to Telegram. delivery_receipts: false @@ -360,23 +362,6 @@ bridge: backfill: # Allow backfilling at all? enable: true - # Use MSC2716 for backfilling? - # - # This requires a server with MSC2716 support, which is currently an experimental feature in Synapse. - # It can be enabled by setting experimental_features -> msc2716_enabled to true in homeserver.yaml. - msc2716: false - # Use double puppets for backfilling? - # - # If using MSC2716, the double puppets must be in the appservice's user ID namespace - # (because the bridge can't use the double puppet access token with batch sending). - # - # Even without MSC2716, bridging old messages with correct timestamps requires the double - # puppets to be in an appservice namespace, or the server to be modified to allow - # overriding timestamps anyway. - # - # Also note that adding users to the appservice namespace may have unexpected side effects, - # as described in https://docs.mau.fi/bridges/general/double-puppeting.html#appservice-method - double_puppet_backfill: false # Whether or not to enable backfilling in normal groups. # Normal groups have numerous technical problems in Telegram, and backfilling normal groups # will likely cause problems if there are multiple Matrix users in the group. @@ -384,10 +369,9 @@ bridge: # If a backfilled chat is older than this number of hours, mark it as read even if it's unread on Telegram. # Set to -1 to let any chat be unread. unread_hours_threshold: 720 - # Forward backfilling limits. These apply to both MSC2716 and legacy backfill. + # Forward backfilling limits. # # Using a negative initial limit is not recommended, as it would try to backfill everything in a single batch. - # MSC2716 and the incremental settings are meant for backfilling everything incrementally rather than at once. forward_limits: # Number of messages to backfill immediately after creating a portal. initial: @@ -403,7 +387,7 @@ bridge: channel: 100 # Timeout for forward backfills in seconds. If you have a high limit, you'll have to increase this too. forward_timeout: 900 - # Settings for incremental backfill of history. These only apply when using MSC2716. + # Settings for incremental backfill of history. These only apply to Beeper, as upstream abandoned MSC2716. incremental: # Maximum number of messages to backfill per batch. messages_per_batch: 100 diff --git a/manifest.json b/manifest.json index 933360d..58d6fbe 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Telegram puppeting bridge for Matrix/Synapse", "fr": "Passerelle Telegram pour Matrix/Synapse" }, - "version": "0.14.2~ynh1", + "version": "0.15.0~ynh1", "url": "https://docs.mau.fi/bridges/python/telegram/index.html", "upstream": { "license": "AGPL-3.0-or-later", From e43651e597cd93d5e6c7fa8e9622bf7f6ab7d63c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Mon, 27 Nov 2023 06:24:35 +0000 Subject: [PATCH 2/4] Auto-update README --- README.md | 4 ++-- README_fr.md | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 837bf3e..1dfa93b 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in 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. -**Shipped version:** 0.14.2~ynh1 +**Shipped version:** 0.15.0~ynh1 ## Disclaimers / important information ## List of known public services @@ -121,7 +121,7 @@ git config --local core.hooksPath .githooks * Official user documentation: * Official admin documentation: * 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 3819d08..f2c357d 100644 --- a/README_fr.md +++ b/README_fr.md @@ -22,7 +22,7 @@ La passerelle ["Mautrix-Telegram"](https://docs.mau.fi/bridges/python/telegram/i ** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix-synapse et mautrix_telegram en même temps!** -**Version incluse :** 0.14.2~ynh1 +**Version incluse :** 0.15.0~ynh1 ## Avertissements / informations importantes ## Liste de passerelles publiques @@ -124,7 +124,7 @@ git config --local core.hooksPath .githooks * Documentation officielle utilisateur : * Documentation officielle de l’admin : * 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 5b9ddcd00cc417b016b4a1ad503f5bca85beee7e Mon Sep 17 00:00:00 2001 From: Dante Date: Tue, 12 Dec 2023 11:21:10 +0000 Subject: [PATCH 3/4] Add PREUPGRADE notices --- doc/PRE_UPGRADE.d/v0.15.0.md | 2 ++ doc/PRE_UPGRADE.d/v0.15.0_es.md | 2 ++ doc/PRE_UPGRADE.d/v0.15.0_fr.md | 2 ++ 3 files changed, 6 insertions(+) create mode 100644 doc/PRE_UPGRADE.d/v0.15.0.md create mode 100644 doc/PRE_UPGRADE.d/v0.15.0_es.md create mode 100644 doc/PRE_UPGRADE.d/v0.15.0_fr.md diff --git a/doc/PRE_UPGRADE.d/v0.15.0.md b/doc/PRE_UPGRADE.d/v0.15.0.md new file mode 100644 index 0000000..1c02c81 --- /dev/null +++ b/doc/PRE_UPGRADE.d/v0.15.0.md @@ -0,0 +1,2 @@ +This version removes support for MSC2716 backfilling so the values `backfill: msc2716` and `backfill: double_puppet_backfill` in `config.yaml` are removed. +If you are using those, adjust your configuration before upgrading. \ No newline at end of file diff --git a/doc/PRE_UPGRADE.d/v0.15.0_es.md b/doc/PRE_UPGRADE.d/v0.15.0_es.md new file mode 100644 index 0000000..87b5da3 --- /dev/null +++ b/doc/PRE_UPGRADE.d/v0.15.0_es.md @@ -0,0 +1,2 @@ +Esta versión elimina el soporte para MSC2716 backfilling, por lo que se eliminan los valores `backfill: msc2716` y `backfill: double_puppet_backfill` en `config.yaml`. +Si los utiliza, ajuste la configuración antes de actualizar. \ No newline at end of file diff --git a/doc/PRE_UPGRADE.d/v0.15.0_fr.md b/doc/PRE_UPGRADE.d/v0.15.0_fr.md new file mode 100644 index 0000000..0b92633 --- /dev/null +++ b/doc/PRE_UPGRADE.d/v0.15.0_fr.md @@ -0,0 +1,2 @@ +Cette version supprime le support du backfilling MSC2716, donc les valeurs `backfill : msc2716` et `backfill : double_puppet_backfill` dans `config.yaml` sont supprimées. +Si vous utilisez ces valeurs, ajustez votre configuration avant la mise à jour. \ No newline at end of file From a6c845e4626bc70fb22bc754ec0eab8516a9e9e0 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 12 Dec 2023 11:21:26 +0000 Subject: [PATCH 4/4] Auto-update README --- README.md | 21 +++++++++++++++++++++ README_fr.md | 26 +++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index b47e78d..6a64793 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,24 @@ + + +# Matrix-Telegram bridge for YunoHost + +[![Integration level](https://dash.yunohost.org/integration/mautrix_telegram.svg)](https://dash.yunohost.org/appci/app/mautrix_telegram) ![Working status](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.status.svg) ![Maintenance status](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.maintain.svg) + +[![Install Matrix-Telegram bridge with YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_telegram) + +*[Lire ce readme en français.](./README_fr.md)* + +> *This package allows you to install Matrix-Telegram bridge 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 + +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. + + **Shipped version:** 0.15.0~ynh1 ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 97091d0..b9a0ebe 100644 --- a/README_fr.md +++ b/README_fr.md @@ -1,4 +1,28 @@ -**Version incluse:** 0.15.0~ynh1 + + +# Matrix-Telegram bridge pour YunoHost + +[![Niveau d’intégration](https://dash.yunohost.org/integration/mautrix_telegram.svg)](https://dash.yunohost.org/appci/app/mautrix_telegram) ![Statut du fonctionnement](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.status.svg) ![Statut de maintenance](https://ci-apps.yunohost.org/ci/badges/mautrix_telegram.maintain.svg) + +[![Installer Matrix-Telegram bridge avec YunoHost](https://install-app.yunohost.org/install-with-yunohost.svg)](https://install-app.yunohost.org/?app=mautrix_telegram) + +*[Read this readme in english.](./README.md)* + +> *Ce package vous permet d’installer Matrix-Telegram bridge 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.* + +## Vue d’ensemble + +Une passerelle entre Matrix et Telegram empaquetée comme un service YunoHost. Les messages, médias et notifications sont relayées entre un compte Telegram et un compte Matrix. +La passerelle ["Mautrix-Telegram"](https://docs.mau.fi/bridges/python/telegram/index.html) consiste en un Service d'Application Matrix-Synapse et repose sur une base-de-données postgresql. C'est pourquoi [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) doit être préalablemnet installé. + +** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix-synapse et mautrix_telegram en même temps!** + + +**Version incluse :** 0.15.0~ynh1 ## Documentations et ressources * Site officiel de l’app :