From 5fdc54be3c35c99726a21dfd2c0e3a21501d78a1 Mon Sep 17 00:00:00 2001
From: Tobias Manske <mail@tobiasmanske.de>
Date: Fri, 22 Dec 2023 17:24:22 +0100
Subject: [PATCH] mautrix-signal: ported to go, config needs changes

---
 .../matrix/mautrix-signal/config.yaml         | 44 ++++---------------
 1 file changed, 8 insertions(+), 36 deletions(-)

diff --git a/ansible/plays/services/matrix/mautrix-signal/config.yaml b/ansible/plays/services/matrix/mautrix-signal/config.yaml
index 7795955..4866fa3 100644
--- a/ansible/plays/services/matrix/mautrix-signal/config.yaml
+++ b/ansible/plays/services/matrix/mautrix-signal/config.yaml
@@ -115,23 +115,14 @@ bridge:
     # {% raw %}
     # Localpart template of MXIDs for Signal users.
     # {userid} is replaced with the UUID of the Signal user.
-    username_template: signal_{userid}
+    username_template: "signal_{{.}}"
     # Displayname template for Signal users.
     # {displayname} is replaced with the displayname of the Signal user, which is the first
     # available variable in displayname_preference. The variables in displayname_preference
     # can also be used here directly.
-    displayname_template: '{displayname} (Signal)'
+    # FIXME: ContactName is not save for multi-user instances.
+    displayname_template: '{{or .ProfileName .ContactName .PhoneNumber "Unknown User"}} (Signal)'
     # {% endraw %}
-    # Whether or not contact list displaynames should be used.
-    # Possible values: disallow, allow, prefer
-    #
-    # Multi-user instances are recommended to disallow contact list names, as otherwise there can
-    # be conflicts between names from different users' contact lists.
-    contact_list_names: disallow
-    # Available variables: full_name, first_name, last_name, phone, uuid
-    displayname_preference:
-    - full_name
-    - phone
     autocreate_group_portal: true
     # Whether or not to create portals for all contacts on login/connect.
     autocreate_contact_portal: false
@@ -206,7 +197,7 @@ bridge:
 
     # Whether or not to explicitly set the avatar and room name for private
     # chat portal rooms. This will be implicitly enabled if encryption.default is true.
-    private_chat_portal_meta: true
+    private_chat_portal_meta: "default"
     # Whether or not the bridge should send a read receipt from the bridge bot when a message has
     # been sent to Signal. This let's you check manually whether the bridge is receiving your
     # messages.
@@ -307,28 +298,9 @@ bridge:
     # OpenStreetMap: 'https://www.openstreetmap.org/?mlat={lat}&mlon={long}'
     location_format: https://www.google.com/maps/place/{lat},{long}
 
-# Python logging configuration.
-#
-# See section 16.7.2 of the Python documentation for more info:
-# https://docs.python.org/3.6/library/logging.config.html#configuration-dictionary-schema
 logging:
-    version: 1
-    formatters:
-        colored:
-            (): mautrix_signal.util.ColorFormatter
-            format: '[%(asctime)s] [%(levelname)s@%(name)s] %(message)s'
-        normal:
-            format: '[%(asctime)s] [%(levelname)s@%(name)s] %(message)s'
-    handlers:
-        console:
-            class: logging.StreamHandler
-            formatter: colored
-    loggers:
-        mau:
-            level: DEBUG
-        aiohttp:
-            level: INFO
-    root:
-        level: DEBUG
-        handlers: [console]
+    min_level: debug
+    writers:
+    - type: stdout
+      format: json