From 7dd75d22f57271fce3220c4b47d732cd65771e52 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 27 Sep 2022 06:42:37 +0000 Subject: [PATCH 1/3] Upgrade to v0.12.1 --- conf/app.src | 4 ++-- manifest.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/conf/app.src b/conf/app.src index 2b46828..fba02b4 100644 --- a/conf/app.src +++ b/conf/app.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/telegram/archive/refs/tags/v0.12.0.tar.gz -SOURCE_SUM=bcc971d638a985d5196c1986f8f332b0f8236b6f34da712bec8662ab38523434 +SOURCE_URL=https://github.com/mautrix/telegram/archive/refs/tags/v0.12.1.tar.gz +SOURCE_SUM=c149a83551247577c2c8c933be8a5ff7593335c64d4e3a577fc8c7d41f0a0999 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/manifest.json b/manifest.json index bfd0ce5..8707770 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.12.0~ynh1", + "version": "0.12.1~ynh1", "url": "https://docs.mau.fi/bridges/python/telegram/index.html", "upstream": { "license": "AGPL-3.0-or-later", From dab896e2b92cca89a2b2a2322c679b17c78b94d3 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Tue, 27 Sep 2022 06:42:41 +0000 Subject: [PATCH 2/3] 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 4087800..221780e 100644 --- a/README.md +++ b/README.md @@ -18,7 +18,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.12.0~ynh1 +**Shipped version:** 0.12.1~ynh1 ## Disclaimers / important information diff --git a/README_fr.md b/README_fr.md index ab145a1..f98b9fb 100644 --- a/README_fr.md +++ b/README_fr.md @@ -21,7 +21,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.12.0~ynh1 +**Version incluse :** 0.12.1~ynh1 ## Avertissements / informations importantes From 3aa31d83bba91ee5420e528a5e210c3b4e0a4f17 Mon Sep 17 00:00:00 2001 From: Dante Date: Wed, 28 Sep 2022 19:23:50 +0100 Subject: [PATCH 3/3] Add new config options from v0.12.1 --- conf/config.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/conf/config.yaml b/conf/config.yaml index 15048a3..b8ce7c8 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -7,7 +7,9 @@ homeserver: # Whether or not to verify the SSL certificate of the homeserver. # Only applies if address starts with https:// verify_ssl: true - asmux: false + # What software is the homeserver running? + # Standard Matrix homeservers like Synapse, Dendrite and Conduit should just use "standard" here. + software: standard # Number of retries for all HTTP requests if the homeserver isn't reachable. http_retry_count: 4 # The URL to push real-time bridge status to. @@ -45,6 +47,7 @@ appservice: # https://magicstack.github.io/asyncpg/current/api/index.html#asyncpg.pool.create_pool # https://docs.python.org/3/library/sqlite3.html#sqlite3.connect # For sqlite, min_size is used as the connection thread pool size and max_size is ignored. + # Additionally, SQLite supports init_commands as an array of SQL queries to run on connect (e.g. to set PRAGMAs). database_opts: {} # Public part of web server for out-of-Matrix interaction with the bridge. @@ -253,6 +256,8 @@ bridge: # Default to encryption, force-enable encryption in all portals the bridge creates # This will cause the bridge bot to be in private chats for the encryption to work properly. default: __IS_ENCRYPTION_ENABLED__ + # Whether to use MSC2409/MSC3202 instead of /sync long polling for receiving encryption-related data. + appservice: false # Require encryption, drop any unencrypted messages. require: __IS_ENCRYPTION_ENABLED__ # Enable key sharing? If enabled, key requests for rooms where users are in will be fulfilled.