From 77c56f61d74c40e71fe6aa1dd3a7ba6fa8d58aa1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lo=C3=AFc=20Kalbermatter?= Date: Thu, 16 May 2024 09:26:23 +0200 Subject: [PATCH] fix: invalid values --- Chart.yaml | 2 +- README.md | 22 +++++++++++----------- values.yaml | 20 ++++++++++---------- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/Chart.yaml b/Chart.yaml index cbf4f33..66d85f0 100644 --- a/Chart.yaml +++ b/Chart.yaml @@ -1,7 +1,7 @@ apiVersion: v2 type: application name: mautrix-meta -version: 0.0.1 +version: 0.0.2 appVersion: 0.3.0 annotations: artifacthub.io/images: | diff --git a/README.md b/README.md index 86faca9..53f0fba 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # mautrix-meta -![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.3.0](https://img.shields.io/badge/AppVersion-0.3.0-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.3.0](https://img.shields.io/badge/AppVersion-0.3.0-informational?style=flat-square) A Matrix-meta puppeting bridge. @@ -54,7 +54,7 @@ A Matrix-meta puppeting bridge. | config.bridge.delivery_receipts | bool | `false` | | | config.bridge.disable_bridge_alerts | bool | `false` | | | config.bridge.disable_xma | bool | `false` | | -| config.bridge.displayname_template | string | `"{{or .DisplayName .Username \"Unknown user\"}}"` | | +| config.bridge.displayname_template | string | `"{{ \"{{or .DisplayName .Username `Unknown User`}} (IG)\" }}"` | | | config.bridge.double_puppet_allow_discovery | bool | `false` | | | config.bridge.double_puppet_server_map."example.com" | string | `"https://example.com"` | | | config.bridge.encryption.allow | bool | `false` | | @@ -97,17 +97,17 @@ A Matrix-meta 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.sync_direct_chat_list | bool | `false` | | -| config.bridge.username_template | string | `"instagram_{{.}}"` | | +| config.bridge.username_template | string | `"instagram_{{ \"{{.}}\" }}"` | | | config.homeserver.address | string | `"https://matrix.example.com"` | | | config.homeserver.async_media | bool | `false` | | | config.homeserver.domain | string | `"example.com"` | | diff --git a/values.yaml b/values.yaml index 434ad5c..62fb2f4 100644 --- a/values.yaml +++ b/values.yaml @@ -165,12 +165,12 @@ config: bridge: # Localpart template of MXIDs for FB/IG users. # {{.}} is replaced with the internal ID of the FB/IG user. - username_template: instagram_{{.}} + username_template: 'instagram_{{ "{{.}}" }}' # Displayname template for FB/IG users. This is also used as the room name in DMs if private_chat_portal_meta is enabled. # {{.DisplayName}} - The display name set by the user. # {{.Username}} - The username set by the user. # {{.ID}} - The internal user ID of the user. - displayname_template: '{{or .DisplayName .Username "Unknown user"}}' + displayname_template: '{{ "{{or .DisplayName .Username `Unknown User`}} (IG)" }}' # Whether to explicitly set the avatar and room name for private chat portal rooms. # If set to `default`, this will be enabled in encrypted rooms and disabled in unencrypted rooms. # If set to `always`, all DM rooms will have explicit names and avatars set. @@ -376,14 +376,14 @@ config: admin_only: true # The formats to use when sending messages to Meta 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: