Merge branch 'main' into hide-sender-address-support

bot/bot.go

@@ -61,10 +61,17 @@ func (b *Bot) Error(ctx context.Context, roomID id.RoomID, message string, args
 
 // Notice sends a notice message to the matrix room
 func (b *Bot) Notice(ctx context.Context, roomID id.RoomID, message string, args ...interface{}) {
-	b.lp.Send(roomID, &event.MessageEventContent{
+	_, err := b.lp.Send(roomID, &event.MessageEventContent{
 		MsgType: event.MsgNotice,
 		Body:    fmt.Sprintf(message, args...),
 	})
+	if err != nil {
+		if sentry.HasHubOnContext(ctx) {
+			sentry.GetHubFromContext(ctx).CaptureException(err)
+		} else {
+			sentry.CaptureException(err)
+		}
+	}
 }
 
 // Start performs matrix /sync
@@ -83,7 +90,7 @@ func (b *Bot) Start() error {
 }
 
 // Send email to matrix room
-func (b *Bot) Send(ctx context.Context, from, to, subject, body string, files []*utils.File) error {
+func (b *Bot) Send(ctx context.Context, from, to, subject, plaintext, html string, files []*utils.File) error {
 	roomID, ok := b.GetMapping(ctx, utils.Mailbox(to))
 	if !ok {
 		return errors.New("room not found")
@@ -103,7 +110,11 @@ func (b *Bot) Send(ctx context.Context, from, to, subject, body string, files []
 	text.WriteString("# ")
 	text.WriteString(subject)
 	text.WriteString("\n\n")
-	text.WriteString(format.HTMLToMarkdown(body))
+	if html != "" {
+		text.WriteString(format.HTMLToMarkdown(html))
+	} else {
+		text.WriteString(plaintext)
+	}
 
 	content := format.RenderMarkdown(text.String(), true, true)
 	_, err = b.lp.Send(roomID, content)