diff --git a/README.md b/README.md index 978a600..7454fed 100644 --- a/README.md +++ b/README.md @@ -10,4 +10,5 @@ + [ ] 支持 Telegram + [ ] 重新编写 README + [ ] 推广 -+ [ ] 支持从外部系统获取 Token \ No newline at end of file ++ [ ] 支持从外部系统获取 Token ++ [ ] 支持 Bark \ No newline at end of file diff --git a/channel/email.go b/channel/email.go index b87d55e..3bb95e9 100644 --- a/channel/email.go +++ b/channel/email.go @@ -1,7 +1,9 @@ package channel import ( + "bytes" "errors" + "github.com/yuin/goldmark" "message-pusher/common" "message-pusher/model" ) @@ -14,5 +16,14 @@ func SendEmailMessage(message *Message, user *model.User) error { if subject == "" { subject = message.Title } + if message.Content != "" { + var buf bytes.Buffer + err := goldmark.Convert([]byte(message.Content), &buf) + if err != nil { + common.SysLog(err.Error()) + } else { + message.HTMLContent = buf.String() + } + } return common.SendEmail(subject, user.Email, message.HTMLContent) } diff --git a/channel/telegram.go b/channel/telegram.go deleted file mode 100644 index 9c86d4a..0000000 --- a/channel/telegram.go +++ /dev/null @@ -1 +0,0 @@ -package channel diff --git a/controller/message.go b/controller/message.go index 46cb180..d2254c0 100644 --- a/controller/message.go +++ b/controller/message.go @@ -1,10 +1,8 @@ package controller import ( - "bytes" "encoding/json" "github.com/gin-gonic/gin" - "github.com/yuin/goldmark" "message-pusher/channel" "message-pusher/common" "message-pusher/model" @@ -79,15 +77,6 @@ func pushMessageHelper(c *gin.Context, message *channel.Message) { if message.Title == "" { message.Title = common.SystemName } - if message.Content != "" { - var buf bytes.Buffer - err := goldmark.Convert([]byte(message.Content), &buf) - if err != nil { - common.SysLog(err.Error()) - } else { - message.HTMLContent = buf.String() - } - } if message.Channel == "" { message.Channel = user.Channel if message.Channel == "" {