From cf46361f090f104431300e38deebda62a3a46b1b Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 17 Nov 2022 06:17:11 +0000 Subject: [PATCH 1/9] Upgrade to v0.7.2 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 55c4ed4..1158b69 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.1/mautrix-whatsapp-amd64 -SOURCE_SUM=0679bc54f825b202d9498f6e079386d3473369dde2e3c656b1a5a067249105f2 +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.2/mautrix-whatsapp-amd64 +SOURCE_SUM=a3b95115021427766ea37596b8a3a05404334eca65ff75acecbad6468cf1f494 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/arm64.src b/conf/arm64.src index b299312..f768bd8 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.1/mautrix-whatsapp-arm64 -SOURCE_SUM=a537598b6e63d71620afe8b7d8f05744524fb5c5bf1a54d4b5a404e3033556ad +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.2/mautrix-whatsapp-arm64 +SOURCE_SUM=51088729e5915eb5c99282d63e0b86d691d1e3d495e978ffc8f993bd8c5f6540 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/armhf.src b/conf/armhf.src index 9386828..e56bb02 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.1/mautrix-whatsapp-arm -SOURCE_SUM=25424f6b57563127387c1fd11337ce1a08e8c18d493808f99caa043bd85e538d +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.2/mautrix-whatsapp-arm +SOURCE_SUM=27b35ebbc80801d3c0235fbac236908815737dd1b60237abf39dbb8bddff993c SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/manifest.json b/manifest.json index e647b7d..cdd7ad3 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix / Synapse puppeting bridge for WhatsApp", "fr": "Passerelle Matrix / Synapse pour WhatsApp" }, - "version": "0.7.1~ynh1", + "version": "0.7.2~ynh1", "url": "https://github.com/mautrix/whatsapp", "upstream": { "license": "AGPL-3.0-or-later", From 967a9c8680d0a065324115e780c190b973ad5a81 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Thu, 17 Nov 2022 06:17:18 +0000 Subject: [PATCH 2/9] 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 27f9715..cbb59ea 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) ** Attention: always backup and restore the Yunohost matrix_synapse et mautrix_whatsapp apps together!** -**Shipped version:** 0.7.1~ynh1 +**Shipped version:** 0.7.2~ynh1 ## Disclaimers / important information ## List of known public services diff --git a/README_fr.md b/README_fr.md index fd25968..3ba814b 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ C'est pourquoi [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_y ** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix_synapse et mautrix_whatsapp en même temps!** -**Version incluse :** 0.7.1~ynh1 +**Version incluse :** 0.7.2~ynh1 ## Avertissements / informations importantes ## Liste de passerelles publiques From a7e94201100d7f8c0c8ba9115e07b28b081f3bd0 Mon Sep 17 00:00:00 2001 From: Dante Date: Fri, 25 Nov 2022 10:50:13 +0000 Subject: [PATCH 3/9] Add config.yaml changes --- conf/config.yaml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/conf/config.yaml b/conf/config.yaml index 792868c..c294539 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -63,6 +63,11 @@ appservice: # You should disable bridge -> sync_with_custom_puppets when this is enabled. ephemeral_events: true + # Should incoming events be handled asynchronously? + # This may be necessary for large public instances with lots of messages going through. + # However, messages will not be guaranteed to be bridged in the same order they were sent in. + async_transactions: false + # Authentication tokens for AS <-> HS communication. Autogenerated; do not modify. as_token: "This value is generated when generating the registration" hs_token: "This value is generated when generating the registration" From fa1367335afabd7a24f7dd6b1878b3dde6d044cf Mon Sep 17 00:00:00 2001 From: Dante Date: Sun, 27 Nov 2022 11:47:03 +0000 Subject: [PATCH 4/9] Add docs for e2be --- README.md | 6 ++++++ README_fr.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/README.md b/README.md index 27f9715..b65ca65 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,12 @@ following configuration file with SSH: ```/opt/yunohost/mautrix_whatsapp/config.yaml``` and then restarting the mautrix_whatsapp service. +#### End-to-bridge encryption +The bridge can optionally encrypt messages between Matrix users and the bridge to hide messages from the homeserver. Using Postgres is strongly recommended when using end-to-bridge encryption. + +If you want to enable it, look for the option ```bridge → encryption``` in the config file. If you only set ```allow: true```, the bridge won't enable encryption on its own, but will work in encrypted rooms. If you set ```default: true```, the bridge will automatically enable encryption in new portals. +There is also the possibility to set ```require: true``` to enforce encryption on any of the messages that you send (this will drop any unencrypted messages). + ## YunoHost specific features #### Multi-user support diff --git a/README_fr.md b/README_fr.md index fd25968..ec22e34 100644 --- a/README_fr.md +++ b/README_fr.md @@ -58,6 +58,12 @@ La passerelle est [configurée avec les paramètres standards adaptés pour votr puis en redémarrant le service: ``` sudo yunohost service restart mautrix_whatsapp``` +#### End-to-bridge encryption +Le robot peut éventuellement chiffrer les messages entre les utilisateurs de Matrix et la passarelle pour cacher les messages du serveur domestique. L'utilisation de Postgres est fortement recommandée lors de l'utilisation du chiffrement end-to-bridge. + +Si vous voulez l'activer, cherchez l'option ```bridge → encryption``` dans le fichier de configuration. Si vous définissez uniquement l'option ``allow: true``, le robot n'activera pas le chiffrement de lui-même, mais travaillera dans les portails chiffrés. Si vous définissez ```default: true```, la passerelle activera automatiquement le chiffrement dans les nouveaux portails. +Il y a également la possibilité de définir ```require: true``` pour imposer le chiffrement sur tous les messages que vous envoyez (cela interdira tous les messages non chiffrés). + ### Support multi-comptes * Les utilisateur.ice.s du Robot ne sont pas liés aux comptes Yunohost. N'importe quel compte Matrix ou serveur Synapse autorisés dans la configuration de la passerelle peut inviter/utiliser le Robot. From 3243827dda363ea0ffa1ab7a20d5dceb0986aa8a Mon Sep 17 00:00:00 2001 From: Dante Date: Sun, 27 Nov 2022 11:51:06 +0000 Subject: [PATCH 5/9] Add docs for e2be on doc files --- README.md | 6 ------ README_fr.md | 6 ------ doc/DISCLAIMER.md | 6 ++++++ doc/DISCLAIMER_fr.md | 6 ++++++ 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/README.md b/README.md index b65ca65..27f9715 100644 --- a/README.md +++ b/README.md @@ -71,12 +71,6 @@ following configuration file with SSH: ```/opt/yunohost/mautrix_whatsapp/config.yaml``` and then restarting the mautrix_whatsapp service. -#### End-to-bridge encryption -The bridge can optionally encrypt messages between Matrix users and the bridge to hide messages from the homeserver. Using Postgres is strongly recommended when using end-to-bridge encryption. - -If you want to enable it, look for the option ```bridge → encryption``` in the config file. If you only set ```allow: true```, the bridge won't enable encryption on its own, but will work in encrypted rooms. If you set ```default: true```, the bridge will automatically enable encryption in new portals. -There is also the possibility to set ```require: true``` to enforce encryption on any of the messages that you send (this will drop any unencrypted messages). - ## YunoHost specific features #### Multi-user support diff --git a/README_fr.md b/README_fr.md index ec22e34..fd25968 100644 --- a/README_fr.md +++ b/README_fr.md @@ -58,12 +58,6 @@ La passerelle est [configurée avec les paramètres standards adaptés pour votr puis en redémarrant le service: ``` sudo yunohost service restart mautrix_whatsapp``` -#### End-to-bridge encryption -Le robot peut éventuellement chiffrer les messages entre les utilisateurs de Matrix et la passarelle pour cacher les messages du serveur domestique. L'utilisation de Postgres est fortement recommandée lors de l'utilisation du chiffrement end-to-bridge. - -Si vous voulez l'activer, cherchez l'option ```bridge → encryption``` dans le fichier de configuration. Si vous définissez uniquement l'option ``allow: true``, le robot n'activera pas le chiffrement de lui-même, mais travaillera dans les portails chiffrés. Si vous définissez ```default: true```, la passerelle activera automatiquement le chiffrement dans les nouveaux portails. -Il y a également la possibilité de définir ```require: true``` pour imposer le chiffrement sur tous les messages que vous envoyez (cela interdira tous les messages non chiffrés). - ### Support multi-comptes * Les utilisateur.ice.s du Robot ne sont pas liés aux comptes Yunohost. N'importe quel compte Matrix ou serveur Synapse autorisés dans la configuration de la passerelle peut inviter/utiliser le Robot. diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index c64e70e..735b94b 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -42,6 +42,12 @@ following configuration file with SSH: ```/opt/yunohost/mautrix_whatsapp/config.yaml``` and then restarting the mautrix_whatsapp service. +#### End-to-bridge encryption +The bridge can optionally encrypt messages between Matrix users and the bridge to hide messages from the homeserver. Using Postgres is strongly recommended when using end-to-bridge encryption. + +If you want to enable it, look for the option ```bridge → encryption``` in the config file. If you only set ```allow: true```, the bridge won't enable encryption on its own, but will work in encrypted rooms. If you set ```default: true```, the bridge will automatically enable encryption in new portals. +There is also the possibility to set ```require: true``` to enforce encryption on any of the messages that you send (this will drop any unencrypted messages). + ## YunoHost specific features #### Multi-user support diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index a6abd6f..cd9208c 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -29,6 +29,12 @@ La passerelle est [configurée avec les paramètres standards adaptés pour votr puis en redémarrant le service: ``` sudo yunohost service restart mautrix_whatsapp``` +#### End-to-bridge encryption +Le robot peut éventuellement chiffrer les messages entre les utilisateurs de Matrix et la passarelle pour cacher les messages du serveur domestique. L'utilisation de Postgres est fortement recommandée lors de l'utilisation du chiffrement end-to-bridge. + +Si vous voulez l'activer, cherchez l'option ```bridge → encryption``` dans le fichier de configuration. Si vous définissez uniquement l'option ``allow: true``, le robot n'activera pas le chiffrement de lui-même, mais travaillera dans les portails chiffrés. Si vous définissez ```default: true```, la passerelle activera automatiquement le chiffrement dans les nouveaux portails. +Il y a également la possibilité de définir ```require: true``` pour imposer le chiffrement sur tous les messages que vous envoyez (cela interdira tous les messages non chiffrés). + ### Support multi-comptes * Les utilisateur.ice.s du Robot ne sont pas liés aux comptes Yunohost. N'importe quel compte Matrix ou serveur Synapse autorisés dans la configuration de la passerelle peut inviter/utiliser le Robot. From 87d67ab296e7bf9400be41adc971ef5d927100c9 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sun, 27 Nov 2022 11:51:39 +0000 Subject: [PATCH 6/9] Auto-update README --- README.md | 6 ++++++ README_fr.md | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/README.md b/README.md index 27f9715..b65ca65 100644 --- a/README.md +++ b/README.md @@ -71,6 +71,12 @@ following configuration file with SSH: ```/opt/yunohost/mautrix_whatsapp/config.yaml``` and then restarting the mautrix_whatsapp service. +#### End-to-bridge encryption +The bridge can optionally encrypt messages between Matrix users and the bridge to hide messages from the homeserver. Using Postgres is strongly recommended when using end-to-bridge encryption. + +If you want to enable it, look for the option ```bridge → encryption``` in the config file. If you only set ```allow: true```, the bridge won't enable encryption on its own, but will work in encrypted rooms. If you set ```default: true```, the bridge will automatically enable encryption in new portals. +There is also the possibility to set ```require: true``` to enforce encryption on any of the messages that you send (this will drop any unencrypted messages). + ## YunoHost specific features #### Multi-user support diff --git a/README_fr.md b/README_fr.md index fd25968..ec22e34 100644 --- a/README_fr.md +++ b/README_fr.md @@ -58,6 +58,12 @@ La passerelle est [configurée avec les paramètres standards adaptés pour votr puis en redémarrant le service: ``` sudo yunohost service restart mautrix_whatsapp``` +#### End-to-bridge encryption +Le robot peut éventuellement chiffrer les messages entre les utilisateurs de Matrix et la passarelle pour cacher les messages du serveur domestique. L'utilisation de Postgres est fortement recommandée lors de l'utilisation du chiffrement end-to-bridge. + +Si vous voulez l'activer, cherchez l'option ```bridge → encryption``` dans le fichier de configuration. Si vous définissez uniquement l'option ``allow: true``, le robot n'activera pas le chiffrement de lui-même, mais travaillera dans les portails chiffrés. Si vous définissez ```default: true```, la passerelle activera automatiquement le chiffrement dans les nouveaux portails. +Il y a également la possibilité de définir ```require: true``` pour imposer le chiffrement sur tous les messages que vous envoyez (cela interdira tous les messages non chiffrés). + ### Support multi-comptes * Les utilisateur.ice.s du Robot ne sont pas liés aux comptes Yunohost. N'importe quel compte Matrix ou serveur Synapse autorisés dans la configuration de la passerelle peut inviter/utiliser le Robot. From 89a84c710669d49a1b7cacb4905377d928528bb1 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 17 Dec 2022 06:13:45 +0000 Subject: [PATCH 7/9] Upgrade to v0.8.0 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- manifest.json | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 1158b69..17056fd 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.2/mautrix-whatsapp-amd64 -SOURCE_SUM=a3b95115021427766ea37596b8a3a05404334eca65ff75acecbad6468cf1f494 +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.0/mautrix-whatsapp-amd64 +SOURCE_SUM=b7fcef1d665c08fb3fd0c24f65ab179aeef24d1558ef539374887f635bcd7c0e SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/arm64.src b/conf/arm64.src index f768bd8..3916508 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.2/mautrix-whatsapp-arm64 -SOURCE_SUM=51088729e5915eb5c99282d63e0b86d691d1e3d495e978ffc8f993bd8c5f6540 +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.0/mautrix-whatsapp-arm64 +SOURCE_SUM=389f126bb25ad0d8173a761f59a731a351eb02f1d95478cc5e3e2af1ff97b1c3 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/armhf.src b/conf/armhf.src index e56bb02..5296888 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.7.2/mautrix-whatsapp-arm -SOURCE_SUM=27b35ebbc80801d3c0235fbac236908815737dd1b60237abf39dbb8bddff993c +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.0/mautrix-whatsapp-arm +SOURCE_SUM=5ebe0488106ed1377a76380639a41eca473eafb3b8f24396005a2999a350de46 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/manifest.json b/manifest.json index cdd7ad3..24c4b80 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "Matrix / Synapse puppeting bridge for WhatsApp", "fr": "Passerelle Matrix / Synapse pour WhatsApp" }, - "version": "0.7.2~ynh1", + "version": "0.8.0~ynh1", "url": "https://github.com/mautrix/whatsapp", "upstream": { "license": "AGPL-3.0-or-later", From 6db7e4faf3bee2c7ec88f4c36a3b1d1a31be2f4c Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 17 Dec 2022 06:13:51 +0000 Subject: [PATCH 8/9] 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 5e9f6f0..b59f872 100644 --- a/README.md +++ b/README.md @@ -24,7 +24,7 @@ Therefore, [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_ynh) ** Attention: always backup and restore the Yunohost matrix_synapse et mautrix_whatsapp apps together!** -**Shipped version:** 0.7.2~ynh1 +**Shipped version:** 0.8.0~ynh1 ## Disclaimers / important information ## List of known public services diff --git a/README_fr.md b/README_fr.md index 1bd030d..121ca8a 100644 --- a/README_fr.md +++ b/README_fr.md @@ -24,7 +24,7 @@ C'est pourquoi [Synapse for YunoHost](https://github.com/YunoHost-Apps/synapse_y ** Attention : sauvegardez et restaurez toujours les deux applications Yunohost matrix_synapse et mautrix_whatsapp en même temps!** -**Version incluse :** 0.7.2~ynh1 +**Version incluse :** 0.8.0~ynh1 ## Avertissements / informations importantes ## Liste de passerelles publiques From a46e5ea5253c7486ef951cd257458afb09664da6 Mon Sep 17 00:00:00 2001 From: Dante Date: Sat, 17 Dec 2022 11:30:46 +0000 Subject: [PATCH 9/9] Add changes to config.yaml --- conf/config.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/conf/config.yaml b/conf/config.yaml index c294539..4f40caa 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -2,7 +2,7 @@ homeserver: # The address that this appservice can use to connect to the homeserver. address: https://__DOMAIN__ - # The domain of the homeserver (for MXIDs, etc). + # The domain of the homeserver (also known as server_name, used for MXIDs, etc). domain: __SERVER_NAME__ # What software is the homeserver running? @@ -29,11 +29,12 @@ appservice: # Database config. database: - # The database type. "sqlite3" and "postgres" are supported. + # The database type. "sqlite3-fk-wal" and "postgres" are supported. #type: sqlite3 type: postgres # The database URI. - # SQLite: File name is enough. https://github.com/mattn/go-sqlite3#connection-string + # SQLite: A raw file path is supported, but `file:?_txlock=immediate` is recommended. + # https://github.com/mattn/go-sqlite3#connection-string # Postgres: Connection string. For example, postgres://user:password@host/database?sslmode=disable # To connect via Unix socket, use something like postgres:///dbname?host=/var/run/postgresql uri: postgres://__APP__:__DB_PWD__@localhost:5432/__DB_NAME__ @@ -301,6 +302,8 @@ bridge: # Send captions in the same message as images. This will send data compatible with both MSC2530 and MSC3552. # This is currently not supported in most clients. caption_in_message: false + # Should polls be sent using MSC3381 event types? + extev_polls: false # Should Matrix edits be bridged to WhatsApp edits? # Official WhatsApp clients don't render edits yet, but once they do, the bridge should work with them right away. send_whatsapp_edits: false