From 3e7e355dd687c3899aee8b2c5a64b50e31ee1a0e Mon Sep 17 00:00:00 2001 From: Franziska Kunsmann Date: Sat, 19 Mar 2022 07:02:11 +0100 Subject: [PATCH] rx300: update mautrix-whatsapp to 0.3.0 --- bundles/mautrix-whatsapp/files/config.yaml | 88 ++++++++++++---------- nodes/rx300.py | 6 +- 2 files changed, 52 insertions(+), 42 deletions(-) diff --git a/bundles/mautrix-whatsapp/files/config.yaml b/bundles/mautrix-whatsapp/files/config.yaml index 07b0f45..93bf55e 100644 --- a/bundles/mautrix-whatsapp/files/config.yaml +++ b/bundles/mautrix-whatsapp/files/config.yaml @@ -1,6 +1,9 @@ homeserver: address: ${node.metadata['mautrix-whatsapp']['homeserver']['url']} domain: ${node.metadata['mautrix-whatsapp']['homeserver']['domain']} + asmux: false + status_endpoint: null + message_send_checkpoint_endpoint: null appservice: address: http://${node.metadata['mautrix-whatsapp'].get('listen-addr', '127.0.0.1')}:${node.metadata['mautrix-whatsapp'].get('port', 20020)} @@ -8,23 +11,27 @@ appservice: port: ${node.metadata['mautrix-whatsapp'].get('port', 20020)} database: type: postgres - uri: postgres://${node.metadata['mautrix-whatsapp']['database']['user']}:${node.metadata['mautrix-whatsapp']['database']['password']}@${node.metadata['mautrix-whatsapp']['database'].get('host', 'localhost')}/${node.metadata['mautrix-whatsapp']['database']['database']}?sslmode=disable + uri: postgres://${node.metadata.get('mautrix-whatsapp/database/user')}:${node.metadata.get('mautrix-whatsapp/database/password')}@${node.metadata.get('mautrix-whatsapp/database/host', 'localhost')}/${node.metadata.get('mautrix-whatsapp/database/database')}?sslmode=disable max_open_conns: 20 max_idle_conns: 2 + max_conn_idle_time: null + max_conn_lifetime: null provisioning: prefix: /_matrix/provision/v1 -% if node.metadata['mautrix-whatsapp']['provisioning']['enabled']: - shared_secret: ${node.metadata['mautrix-whatsapp']['provisioning']['shared_secret']} +% if node.metadata.get('mautrix-whatsapp/provisioning/enabled'): + shared_secret: ${node.metadata.get('mautrix-whatsapp/provisioning/shared_secret')} % else: shared_secret: disable % endif + segment_key: null id: whatsapp bot: username: whatsappbot displayname: WhatsApp bridge bot avatar: mxc://maunium.net/NeXNQarUbrlYBiPCpprYsRqr - as_token: ${node.metadata['mautrix-whatsapp']['as_token']} - hs_token: ${node.metadata['mautrix-whatsapp']['hs_token']} + ephemeral_events: false + as_token: ${node.metadata.get('mautrix-whatsapp/as_token')} + hs_token: ${node.metadata.get('mautrix-whatsapp/hs_token')} metrics: enabled: false @@ -32,43 +39,52 @@ metrics: whatsapp: os_name: Mautrix-WhatsApp bridge - browser_name: mx-wa + browser_name: unknown bridge: username_template: whatsapp_{{.}} - displayname_template: "{{if .Notify}}{{.Notify}}{{else}}{{.Jid}}{{end}} (WhatsApp)" - community_template: whatsapp_{{.Localpart}}={{.Server}} - connection_timeout: 20 - fetch_message_on_timeout: false + displayname_template: "{{if .PushName}}{{.PushName}}{{else if .BusinessName}}{{.BusinessName}}{{else}}{{.JID}}{{end}} (WhatsApp)" + personal_filtering_spaces: true delivery_receipts: true - login_qr_regen_count: 2 - max_connection_attempts: 3 - connection_retry_delay: -1 - report_connection_retry: true - chat_list_wait: 30 - portal_sync_wait: 600 - user_message_buffer: 1024 + call_start_notices: true + identity_change_notices: true portal_message_buffer: 128 - call_notices: - start: true - end: true - initial_chat_sync_count: 20 - initial_history_fill_count: 50 - initial_history_disable_notifications: false - recovery_chat_sync_limit: -1 - recovery_history_backfill: true - sync_max_chat_age: ${node.metadata['mautrix-whatsapp'].get('sync_max_days', 7)*24*60*60} + history_sync: + create_portals: true + max_age: ${node.metadata.get('mautrix-whatsapp/sync_max_days', 7)*24*60*60} + backfill: false + double_puppet_backfill: false + request_full_sync: false + user_avatar_sync: true + bridge_matrix_leave: true sync_with_custom_puppets: true sync_direct_chat_list: false default_bridge_receipts: true default_bridge_presence: true - login_shared_secret: null - invite_own_puppet_for_backfilling: true - private_chat_portal_meta: false + send_presence_on_typing: false + force_active_delivery_receipts: false + double_puppet_allow_discovery: false + private_chat_portal_meta: true + bridge_notices: true resend_bridge_info: false + mute_bridging: false + archive_tag: "m.lowpriority" + pinned_tag: null + tag_only_on_create: false + enable_status_broadcast: true + mute_status_broadcast: true whatsapp_thumbnail: false allow_user_invite: false + federate_rooms: false + disappearing_messages_in_groups: true + disable_bridge_alerts: false + url_previews: false command_prefix: "!wa" + management_room_text: + welcome: "Hello, I'm a WhatsApp bridge bot." + welcome_connected: "Use `help` for help." + welcome_unconnected: "Use `help` for help or `login` to log in." + additional_help: "" encryption: allow: false # requires login_shared_secret to be set default: false @@ -77,18 +93,12 @@ bridge: require_cross_signing: false require_verification: true permissions: -% for user, permission in node.metadata['mautrix-whatsapp']['permissions'].items(): +% for user, permission in node.metadata.get('mautrix-whatsapp/permissions').items(): ${user}: ${permission} % endfor - relaybot: + relay: enabled: false - management: "!whatsapp-relaybot:${node.metadata['mautrix-whatsapp']['homeserver']['domain']}" - invites: -% for user, permission in node.metadata['mautrix-whatsapp']['permissions'].items(): -% if permission > 50: - - ${user} -% endif -% endfor + admin_only: false message_formats: m.text: "{{ .Sender.Displayname }}: {{ .Message }}" m.notice: "{{ .Sender.Displayname }}: {{ .Message }}" @@ -104,5 +114,5 @@ logging: file_name_format: null file_date_format: 2006-01-02 file_mode: 0600 - timestamp_format: null + timestamp_format: "" print_level: info diff --git a/nodes/rx300.py b/nodes/rx300.py index ab8c308..1bfb225 100644 --- a/nodes/rx300.py +++ b/nodes/rx300.py @@ -244,14 +244,14 @@ nodes['rx300'] = { }, }, 'mautrix-whatsapp': { - 'version': 'v0.2.4', - 'sha1': 'f997ff0662c903c4d832419ace108f4110bd5b08', + 'version': 'v0.3.0', + 'sha1': '10d65afccb4e7e477125310088022a137a4f0589', 'homeserver': { 'domain': 'franzi.business', 'url': 'https://matrix.franzi.business', }, 'permissions': { - "'@kunsi:franzi.business'": 100, + "'@kunsi:franzi.business'": 'admin', }, }, 'miniflux': {