From ce782ff6fb1109811bfefa8d7c329af34517fab5 Mon Sep 17 00:00:00 2001 From: Wim Date: Mon, 4 Apr 2022 00:19:31 +0200 Subject: [PATCH] Change discord non-native threading behaviour (discord) (#1791) Sorta regression introduced by 9a8ce9b17e560433731eb5efa3cee7ced0b93605 which changes the way we get replies of matrix. This causes issues like https://github.com/42wim/matterbridge/issues/1780 We "fix" this by mimicking the old behaviour when "PreserveThreading" is disabled. --- bridge/discord/discord.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 1c2e8ca4..cd3db76d 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -272,7 +272,8 @@ func (b *Bdiscord) Send(msg config.Message) (string, error) { // Handle prefix hint for unthreaded messages. if msg.ParentNotFound() { msg.ParentID = "" - msg.Text = fmt.Sprintf("[thread]: %s", msg.Text) + msg.Text = strings.TrimPrefix(msg.Text, "\n") + msg.Text = fmt.Sprintf("> %s %s", msg.Username, msg.Text) } // Use webhook to send the message