hrfee/jfa-go
1
0
Fork 0
mirror of https://github.com/hrfee/jfa-go.git synced 2024-12-22 17:10:10 +00:00
Code Issues Projects Releases Wiki Activity

Telegram: Use markdown for custom emails/announcements

Browse Source 
Had no idea telegram supported this, pretty cool.
This commit is contained in:
Harvey Tindall 2021-05-07 16:33:44 +01:00
parent 716d6a931a
commit 36edd4ab0d
Signed by: hrfee
GPG Key ID: BBC65952848FB1A2
2 changed files with 62 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
email.go
View File

@ -9,6 +9,7 @@ import (
"fmt" "fmt"
"html/template" "html/template"
"io" "io"
"io/fs"
"net/smtp" "net/smtp"
"os" "os"
"strconv" "strconv"
@ -102,9 +103,10 @@ type Emailer struct {
// Message stores content. // Message stores content.
type Message struct { type Message struct {
Subject string `json:"subject"` Subject string `json:"subject"`
HTML string `json:"html"` HTML string `json:"html"`
Text string `json:"text"` Text string `json:"text"`
Markdown string `json:"markdown"`
} }
func (emailer *Emailer) formatExpiry(expiry time.Time, tzaware bool, datePattern, timePattern string) (d, t, expiresIn string) { func (emailer *Emailer) formatExpiry(expiry time.Time, tzaware bool, datePattern, timePattern string) (d, t, expiresIn string) {
@ -204,7 +206,7 @@ type templ interface {
Execute(wr io.Writer, data interface{}) error Execute(wr io.Writer, data interface{}) error
} }
func (emailer *Emailer) construct(app *appContext, section, keyFragment string, data map[string]interface{}) (html, text string, err error) { func (emailer *Emailer) construct(app *appContext, section, keyFragment string, data map[string]interface{}) (html, text, markdown string, err error) {
var tpl templ var tpl templ
if substituteStrings == "" { if substituteStrings == "" {
data["jellyfin"] = "Jellyfin" data["jellyfin"] = "Jellyfin"
@ -212,14 +214,31 @@ func (emailer *Emailer) construct(app *appContext, section, keyFragment string,
data["jellyfin"] = substituteStrings data["jellyfin"] = substituteStrings
} }
var keys []string var keys []string
if app.config.Section("email").Key("plaintext").MustBool(false) { plaintext := app.config.Section("email").Key("plaintext").MustBool(false)
keys = []string{"text"} telegram := app.config.Section("telegram").Key("enabled").MustBool(false)
text = "" if plaintext {
if telegram {
keys = []string{"text"}
text, markdown = "", ""
} else {
keys = []string{"text"}
text = ""
}
} else { } else {
keys = []string{"html", "text"} if telegram {
keys = []string{"html", "text", "markdown"}
} else {
keys = []string{"html", "text"}
}
} }
for _, key := range keys { for _, key := range keys {
filesystem, fpath := app.GetPath(section, keyFragment+key) var filesystem fs.FS
var fpath string
if key == "markdown" {
filesystem, fpath = app.GetPath(section, keyFragment+"text")
} else {
filesystem, fpath = app.GetPath(section, keyFragment+key)
}
if key == "html" { if key == "html" {
tpl, err = template.ParseFS(filesystem, fpath) tpl, err = template.ParseFS(filesystem, fpath)
} else { } else {
@ -228,15 +247,28 @@ func (emailer *Emailer) construct(app *appContext, section, keyFragment string,
if err != nil { if err != nil {
return return
} }
// For constructTemplate, if "md" is found in data it's used in stead of "text".
foundMarkdown := false
if key == "markdown" {
_, foundMarkdown = data["md"]
if foundMarkdown {
data["plaintext"], data["md"] = data["md"], data["plaintext"]
}
}
var tplData bytes.Buffer var tplData bytes.Buffer
err = tpl.Execute(&tplData, data) err = tpl.Execute(&tplData, data)
if err != nil { if err != nil {
return return
} }
if foundMarkdown {
data["plaintext"], data["md"] = data["md"], data["plaintext"]
}
if key == "html" { if key == "html" {
html = tplData.String() html = tplData.String()
} else { } else if key == "text" {
text = tplData.String() text = tplData.String()
} else {
markdown = tplData.String()
} }
} }
return return
@ -282,7 +314,7 @@ func (emailer *Emailer) constructConfirmation(code, username, key string, app *a
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "email_confirmation", "email_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "email_confirmation", "email_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -297,10 +329,11 @@ func (emailer *Emailer) constructTemplate(subject, md string, app *appContext) (
text := stripMarkdown(md) text := stripMarkdown(md)
message := app.config.Section("email").Key("message").String() message := app.config.Section("email").Key("message").String()
var err error var err error
email.HTML, email.Text, err = emailer.construct(app, "template_email", "email_", map[string]interface{}{ email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "template_email", "email_", map[string]interface{}{
"text": template.HTML(html), "text": template.HTML(html),
"plaintext": text, "plaintext": text,
"message": message, "message": message,
"md": md,
}) })
if err != nil { if err != nil {
return nil, err return nil, err
@ -353,7 +386,7 @@ func (emailer *Emailer) constructInvite(code string, invite Invite, app *appCont
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "invite_emails", "email_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "invite_emails", "email_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -392,7 +425,7 @@ func (emailer *Emailer) constructExpiry(code string, invite Invite, app *appCont
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "notifications", "expiry_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "notifications", "expiry_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -446,7 +479,7 @@ func (emailer *Emailer) constructCreated(code, username, address string, invite
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "notifications", "created_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "notifications", "created_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -520,7 +553,7 @@ func (emailer *Emailer) constructReset(pwr PasswordReset, app *appContext, noSub
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "password_resets", "email_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "password_resets", "email_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -561,7 +594,7 @@ func (emailer *Emailer) constructDeleted(reason string, app *appContext, noSub b
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "deletion", "email_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "deletion", "email_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -602,7 +635,7 @@ func (emailer *Emailer) constructDisabled(reason string, app *appContext, noSub
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "disable_enable", "disabled_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "disable_enable", "disabled_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -643,7 +676,7 @@ func (emailer *Emailer) constructEnabled(reason string, app *appContext, noSub b
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "disable_enable", "enabled_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "disable_enable", "enabled_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -708,7 +741,7 @@ func (emailer *Emailer) constructWelcome(username string, expiry time.Time, app
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "welcome_email", "email_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "welcome_email", "email_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err
@ -743,7 +776,7 @@ func (emailer *Emailer) constructUserExpired(app *appContext, noSub bool) (*Mess
) )
email, err = emailer.constructTemplate(email.Subject, content, app) email, err = emailer.constructTemplate(email.Subject, content, app)
} else { } else {
email.HTML, email.Text, err = emailer.construct(app, "user_expiry", "email_", template) email.HTML, email.Text, email.Markdown, err = emailer.construct(app, "user_expiry", "email_", template)
} }
if err != nil { if err != nil {
return nil, err return nil, err

10
telegram.go
View File

@ -193,10 +193,16 @@ func (t *TelegramDaemon) QuoteReply(upd *tg.Update, content string) error {
return err return err
} }
// Send will send a telegram message to a list of chat IDs. message.text is used. // Send will send a telegram message to a list of chat IDs. message.text is used if no markdown is given.
func (t *TelegramDaemon) Send(message *Message, ID ...int64) error { func (t *TelegramDaemon) Send(message *Message, ID ...int64) error {
for _, id := range ID { for _, id := range ID {
msg := tg.NewMessage(id, message.Text) var msg tg.MessageConfig
if message.Markdown == "" {
msg = tg.NewMessage(id, message.Text)
} else {
msg = tg.NewMessage(id, strings.ReplaceAll(message.Markdown, ".", "\\."))
msg.ParseMode = "MarkdownV2"
}
_, err := t.bot.Send(msg) _, err := t.bot.Send(msg)
if err != nil { if err != nil {
return err return err