heimoshuiyu/postmoogle
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

deconstruct getSubject and getBody

Browse Source
This commit is contained in:
Aine
2022-09-06 22:34:21 +03:00
parent bbb6bec35f
commit db135c0cb1
1 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
bot/email.go
View File

@@ -84,22 +84,6 @@ func (b *Bot) Send2Matrix(ctx context.Context, email *utils.Email) error {
return nil return nil
} }
func (b *Bot) getBody(content *event.MessageEventContent) string {
if content.FormattedBody != "" {
return content.FormattedBody
}
return content.Body
}
func (b *Bot) getSubject(content *event.MessageEventContent) string {
if content.Body == "" {
return ""
}
return strings.SplitN(content.Body, "\n", 1)[0]
}
func (b *Bot) getParentEmail(evt *event.Event) (string, string, string) { func (b *Bot) getParentEmail(evt *event.Event) (string, string, string) {
content := evt.Content.AsMessage() content := evt.Content.AsMessage()
parentID := utils.EventParent(evt.ID, content) parentID := utils.EventParent(evt.ID, content)
@@ -160,10 +144,14 @@ func (b *Bot) Send2Email(ctx context.Context, to, subject, body string) error {
content := evt.Content.AsMessage() content := evt.Content.AsMessage()
if subject == "" { if subject == "" {
subject = b.getSubject(content) subject = strings.SplitN(content.Body, "\n", 1)[0]
} }
if body == "" { if body == "" {
body = b.getBody(content) if content.FormattedBody != "" {
body = content.FormattedBody
} else {
body = content.Body
}
} }
ID := evt.ID.String()[1:] + "@" + b.domain ID := evt.ID.String()[1:] + "@" + b.domain