diff --git a/.gitignore b/.gitignore index e3ba009e..51f3f406 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ # Exclude configuration file matterbridge.toml + +# Exclude IDE Files +.vscode diff --git a/bridge/discord/webhook.go b/bridge/discord/webhook.go index 7b136bcb..3afb942d 100644 --- a/bridge/discord/webhook.go +++ b/bridge/discord/webhook.go @@ -82,10 +82,8 @@ func (b *Bdiscord) webhookSend(msg *config.Message, channelID string) (*discordg ContentType: "", Reader: bytes.NewReader(*fi.Data), } - content := "" - if msg.Text == "" { - content = fi.Comment - } + content := fi.Comment + _, e2 := b.transmitter.Send( channelID, &discordgo.WebhookParams{ diff --git a/bridge/telegram/handlers.go b/bridge/telegram/handlers.go index df7e7180..84881f7f 100644 --- a/bridge/telegram/handlers.go +++ b/bridge/telegram/handlers.go @@ -162,11 +162,6 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) { // handle entities (adding URLs) b.handleEntities(&rmsg, message) - - // handle Comments - if rmsg.Comment != "" { - rmsg.Text = rmsg.Text + "\n" + rmsg.Comment - } if rmsg.Text != "" || len(rmsg.Extra) > 0 { rmsg.Text = helper.RemoveEmptyNewLines(rmsg.Text)