chore: do not render HTML in advance
This commit is contained in:
@@ -11,3 +11,4 @@
|
|||||||
+ [ ] 重新编写 README
|
+ [ ] 重新编写 README
|
||||||
+ [ ] 推广
|
+ [ ] 推广
|
||||||
+ [ ] 支持从外部系统获取 Token
|
+ [ ] 支持从外部系统获取 Token
|
||||||
|
+ [ ] 支持 Bark
|
||||||
@@ -1,7 +1,9 @@
|
|||||||
package channel
|
package channel
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"bytes"
|
||||||
"errors"
|
"errors"
|
||||||
|
"github.com/yuin/goldmark"
|
||||||
"message-pusher/common"
|
"message-pusher/common"
|
||||||
"message-pusher/model"
|
"message-pusher/model"
|
||||||
)
|
)
|
||||||
@@ -14,5 +16,14 @@ func SendEmailMessage(message *Message, user *model.User) error {
|
|||||||
if subject == "" {
|
if subject == "" {
|
||||||
subject = message.Title
|
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)
|
return common.SendEmail(subject, user.Email, message.HTMLContent)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
package channel
|
|
||||||
@@ -1,10 +1,8 @@
|
|||||||
package controller
|
package controller
|
||||||
|
|
||||||
import (
|
import (
|
||||||
"bytes"
|
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"github.com/gin-gonic/gin"
|
"github.com/gin-gonic/gin"
|
||||||
"github.com/yuin/goldmark"
|
|
||||||
"message-pusher/channel"
|
"message-pusher/channel"
|
||||||
"message-pusher/common"
|
"message-pusher/common"
|
||||||
"message-pusher/model"
|
"message-pusher/model"
|
||||||
@@ -79,15 +77,6 @@ func pushMessageHelper(c *gin.Context, message *channel.Message) {
|
|||||||
if message.Title == "" {
|
if message.Title == "" {
|
||||||
message.Title = common.SystemName
|
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 == "" {
|
if message.Channel == "" {
|
||||||
message.Channel = user.Channel
|
message.Channel = user.Channel
|
||||||
if message.Channel == "" {
|
if message.Channel == "" {
|
||||||
|
|||||||
Reference in New Issue
Block a user