diff --git a/Chart.yaml b/Chart.yaml index 0cf3cf1..9169cf7 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: mautrix-whatsapp -version: 0.0.1 +version: 0.0.2 appVersion: 0.10.7 annotations: artifacthub.io/images: | diff --git a/README.md b/README.md index e283c1c..4e40a24 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # mautrix-whatsapp -![Version: 0.0.1](https://img.shields.io/badge/Version-0.0.1-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.7](https://img.shields.io/badge/AppVersion-0.10.7-informational?style=flat-square) +![Version: 0.0.2](https://img.shields.io/badge/Version-0.0.2-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 0.10.7](https://img.shields.io/badge/AppVersion-0.10.7-informational?style=flat-square) A Matrix-whatsapp puppeting bridge. @@ -57,7 +57,7 @@ A Matrix-whatsapp puppeting bridge. | config.bridge.disable_bridge_alerts | bool | `false` | | | config.bridge.disable_reply_fallbacks | bool | `false` | | | config.bridge.disable_status_broadcast_send | bool | `true` | | -| config.bridge.displayname_template | string | `"{{or .BusinessName .PushName .JID}} (WA)"` | | +| config.bridge.displayname_template | string | `"{{ \"{{or .PushName .BusinessName .JID }} (WA)\" }}"` | | | config.bridge.double_puppet_allow_discovery | bool | `false` | | | config.bridge.double_puppet_server_map."example.com" | string | `"https://example.com"` | | | config.bridge.enable_status_broadcast | bool | `true` | | @@ -136,14 +136,14 @@ A Matrix-whatsapp puppeting bridge. | config.bridge.provisioning.shared_secret | string | `"generate"` | | | config.bridge.relay.admin_only | bool | `true` | | | config.bridge.relay.enabled | bool | `false` | | -| config.bridge.relay.message_formats."m.audio" | string | `"{{ .Sender.Displayname }} sent an audio file"` | | -| config.bridge.relay.message_formats."m.emote" | string | `"* {{ .Sender.Displayname }} {{ .Message }}"` | | -| config.bridge.relay.message_formats."m.file" | string | `"{{ .Sender.Displayname }} sent a file"` | | -| config.bridge.relay.message_formats."m.image" | string | `"{{ .Sender.Displayname }} sent an image"` | | -| config.bridge.relay.message_formats."m.location" | string | `"{{ .Sender.Displayname }} sent a location"` | | -| config.bridge.relay.message_formats."m.notice" | string | `"{{ .Sender.Displayname }}: {{ .Message }}"` | | -| config.bridge.relay.message_formats."m.text" | string | `"{{ .Sender.Displayname }}: {{ .Message }}"` | | -| config.bridge.relay.message_formats."m.video" | string | `"{{ .Sender.Displayname }} sent a video"` | | +| config.bridge.relay.message_formats."m.audio" | string | `"{{\"{{ .Sender.Displayname }} sent an audio file\"}}"` | | +| config.bridge.relay.message_formats."m.emote" | string | `"{{\"* {{ .Sender.Displayname }} {{ .Message }}\"}}"` | | +| config.bridge.relay.message_formats."m.file" | string | `"{{\"{{ .Sender.Displayname }} sent a file\"}}"` | | +| config.bridge.relay.message_formats."m.image" | string | `"{{\"{{ .Sender.Displayname }} sent an image\"}}"` | | +| config.bridge.relay.message_formats."m.location" | string | `"{{\"{{ .Sender.Displayname }} sent a location\"}}"` | | +| config.bridge.relay.message_formats."m.notice" | string | `"{{\"{{ .Sender.Displayname }}: {{ .Message }}\"}}"` | | +| config.bridge.relay.message_formats."m.text" | string | `"{{\"{{ .Sender.Displayname }}: {{ .Message }}\"}}"` | | +| config.bridge.relay.message_formats."m.video" | string | `"{{\"{{ .Sender.Displayname }} sent a video\"}}"` | | | config.bridge.resend_bridge_info | bool | `false` | | | config.bridge.send_presence_on_typing | bool | `false` | | | config.bridge.status_broadcast_tag | string | `"m.lowpriority"` | | @@ -152,7 +152,7 @@ A Matrix-whatsapp puppeting bridge. | config.bridge.tag_only_on_create | bool | `true` | | | config.bridge.url_previews | bool | `false` | | | config.bridge.user_avatar_sync | bool | `true` | | -| config.bridge.username_template | string | `"whatsapp_{{.}}"` | | +| config.bridge.username_template | string | `"whatsapp_{{ \"{{.}}\" }}"` | | | config.bridge.whatsapp_thumbnail | bool | `false` | | | config.homeserver.address | string | `"https://matrix.example.com"` | | | config.homeserver.async_media | bool | `false` | | diff --git a/values.yaml b/values.yaml index 135c202..5b210e4 100644 --- a/values.yaml +++ b/values.yaml @@ -166,7 +166,7 @@ config: bridge: # Localpart template of MXIDs for WhatsApp users. # {{.}} is replaced with the phone number of the WhatsApp user. - username_template: whatsapp_{{.}} + username_template: 'whatsapp_{{ "{{.}}" }}' # Displayname template for WhatsApp users. # {{.PushName}} - nickname set by the WhatsApp user # {{.BusinessName}} - validated WhatsApp business name @@ -174,7 +174,7 @@ config: # 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: '{{or .BusinessName .PushName .JID}} (WA)' + displayname_template: '{{ "{{or .PushName .BusinessName .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: false @@ -513,14 +513,14 @@ config: admin_only: true # The formats to use when sending messages to WhatsApp via the relaybot. message_formats: - m.text: '{{ .Sender.Displayname }}: {{ .Message }}' - m.notice: '{{ .Sender.Displayname }}: {{ .Message }}' - m.emote: '* {{ .Sender.Displayname }} {{ .Message }}' - m.file: '{{ .Sender.Displayname }} sent a file' - m.image: '{{ .Sender.Displayname }} sent an image' - m.audio: '{{ .Sender.Displayname }} sent an audio file' - m.video: '{{ .Sender.Displayname }} sent a video' - m.location: '{{ .Sender.Displayname }} sent a location' + m.text: '{{"{{ .Sender.Displayname }}: {{ .Message }}"}}' + m.notice: '{{"{{ .Sender.Displayname }}: {{ .Message }}"}}' + m.emote: '{{"* {{ .Sender.Displayname }} {{ .Message }}"}}' + m.file: '{{"{{ .Sender.Displayname }} sent a file"}}' + m.image: '{{"{{ .Sender.Displayname }} sent an image"}}' + m.audio: '{{"{{ .Sender.Displayname }} sent an audio file"}}' + m.video: '{{"{{ .Sender.Displayname }} sent a video"}}' + m.location: '{{"{{ .Sender.Displayname }} sent a location"}}' # Logging config. See https://github.com/tulir/zeroconfig for details. logging: