From af6fa4d1b88762ac08bee2323109014c5d0cd217 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 17 Jun 2023 06:13:23 +0000 Subject: [PATCH 1/3] Upgrade to v0.8.6 --- conf/amd64.src | 4 ++-- conf/arm64.src | 4 ++-- conf/armhf.src | 4 ++-- conf/config.yaml | 19 ++++++++++++++----- manifest.json | 2 +- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/conf/amd64.src b/conf/amd64.src index 3716081..9821286 100644 --- a/conf/amd64.src +++ b/conf/amd64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.5/mautrix-whatsapp-amd64 -SOURCE_SUM=2989419b6c8ce870189359a44a1642a22e6cc87d6344123622fa2d59d073a339 +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.6/mautrix-whatsapp-amd64 +SOURCE_SUM=a9e3e1c920dbd5ba35a6a91209d267fa9a8f98ce43c81d56c5126e965fcd8eaa SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/arm64.src b/conf/arm64.src index 4296588..7fd7193 100644 --- a/conf/arm64.src +++ b/conf/arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.5/mautrix-whatsapp-arm64 -SOURCE_SUM=e9c34620f5748bac34f4d15d9e9088ecf8676288edc9460bf6245688eafd6367 +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.6/mautrix-whatsapp-arm64 +SOURCE_SUM=dcac55fc3336a251ec6dc6f28b76199833505310f03ec526de5aee87852736aa SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/armhf.src b/conf/armhf.src index e63c3ca..bc1181d 100644 --- a/conf/armhf.src +++ b/conf/armhf.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.5/mautrix-whatsapp-arm -SOURCE_SUM=6f664454fccabe023c6d7eb8ad85ed80ba7c5691605e16977cfc67ffed1a252a +SOURCE_URL=https://github.com/mautrix/whatsapp/releases/download/v0.8.6/mautrix-whatsapp-arm +SOURCE_SUM=a76127e5e3ddd6ce99c578ad29a22a9b9609462c7a47dc8b9e2f6b4ab94f5396 SOURCE_SUM_PRG=sha256sum SOURCE_IN_SUBDIR=false SOURCE_FILENAME=mautrix-whatsapp diff --git a/conf/config.yaml b/conf/config.yaml index 0a9848e..7b755c1 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -15,6 +15,12 @@ homeserver: message_send_checkpoint_endpoint: null # Does the homeserver support https://github.com/matrix-org/matrix-spec-proposals/pull/2246? async_media: __ASYNC_MEDIA__ + # Should the bridge use a websocket for connecting to the homeserver? + # The server side is currently not documented anywhere and is only implemented by mautrix-wsproxy, + # mautrix-asmux (deprecated), and hungryserv (proprietary). + websocket: false + # How often should the websocket be pinged? Pinging will be disabled if this is zero. + ping_interval_seconds: 0 # Application service host/registration related details. # Changing these values requires regeneration of the registration. appservice: @@ -91,7 +97,7 @@ bridge: # The following variables are also available, but will cause problems on multi-user instances: # {{.FullName}} - full name from contact list # {{.FirstName}} - first name from contact list - displayname_template: "{{if .BusinessName}}{{.BusinessName}}{{else if .PushName}}{{.PushName}}{{else}}{{.JID}}{{end}} (WA)" + displayname_template: "{{or .BusinessName .PushName .JID}} (WA)" # Should the bridge create a space for each logged-in user and add bridged rooms to it? # Users who logged in before turning this on should run `!wa sync space` to create and fill the space for the first time. personal_filtering_spaces: __PERSONAL_FILTERING_SPACES__ @@ -397,6 +403,9 @@ bridge: # session before changing it. The Matrix spec recommends 100 as the # default. messages: 100 + # Disable rotating keys when a user's devices change? + # You should not enable this option unless you understand all the implications. + disable_device_change_key_rotation: false # Settings for provisioning API provisioning: # Prefix for the provisioning API paths. @@ -414,9 +423,9 @@ bridge: # domain - All users on that homeserver # mxid - Specific user permissions: - "__LISTRELAY__": relay - "__LISTUSER__": user - "__LISTADMIN__": admin + "__LISTRELAY__": "relay" + "__LISTUSER__": "user" + "__LISTADMIN__": "admin" # Settings for relay mode relay: # Whether relay mode should be allowed. If allowed, `!wa set-relay` can be used to turn any @@ -442,7 +451,7 @@ logging: format: pretty-colored - type: file format: json - filename: /var/log/__APP__/__APP__.log + filename: ./logs/mautrix-whatsapp.log max_size: 100 max_backups: 10 compress: true diff --git a/manifest.json b/manifest.json index 828a084..233694d 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.8.5~ynh1", + "version": "0.8.6~ynh1", "url": "https://github.com/mautrix/whatsapp", "upstream": { "license": "AGPL-3.0-or-later", From 7b27de65a888a5ea844af54d19c6469692c4c3f6 Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 17 Jun 2023 06:13:29 +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 85cc47b..dbefc64 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,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.8.5~ynh1 +**Shipped version:** 0.8.6~ynh1 ## Disclaimers / important information ## List of known public services diff --git a/README_fr.md b/README_fr.md index c32deed..0fcbe0f 100644 --- a/README_fr.md +++ b/README_fr.md @@ -25,7 +25,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.8.5~ynh1 +**Version incluse :** 0.8.6~ynh1 ## Avertissements / informations importantes ## Liste de passerelles publiques From e910a265980bf70e5d99e38890bae26956b784d6 Mon Sep 17 00:00:00 2001 From: Dante Date: Tue, 20 Jun 2023 18:40:30 +0200 Subject: [PATCH 3/3] Fix logging filename config value --- .github/workflows/updater.sh | 2 +- conf/config.yaml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/updater.sh b/.github/workflows/updater.sh index 029c141..4e85e56 100755 --- a/.github/workflows/updater.sh +++ b/.github/workflows/updater.sh @@ -148,7 +148,7 @@ yq -i '.bridge.encryption.require = "__ENCRYPTION_REQUIRE__"' $configFilePath yq -i 'with(.bridge.permissions ; . = { "__LISTRELAY__": "relay", "__LISTUSER__": "user", "__LISTADMIN__": "admin" } | ... style="double")' $configFilePath yq -i '.bridge.relay.enabled = "__ENABLE_RELAYBOT__"' $configFilePath yq -i '.bridge.relay.admin_only = "__ADMIN_ONLY__"' $configFilePath -yq -i '.logging.writers.filename = "/var/log/__APP__"' $configFilePath +yq -i '.logging.writers.filename = "/var/log/__APP__/__APP__.log"' $configFilePath yq -i '.logging.min_level = "__PRINT_LEVEL__"' $configFilePath #================================================= diff --git a/conf/config.yaml b/conf/config.yaml index 7b755c1..6c5e29a 100644 --- a/conf/config.yaml +++ b/conf/config.yaml @@ -451,7 +451,7 @@ logging: format: pretty-colored - type: file format: json - filename: ./logs/mautrix-whatsapp.log + filename: /var/log/__APP__/__APP__.log max_size: 100 max_backups: 10 compress: true