浏览代码

chore: do not render HTML in advance

JustSong 2 年之前
父节点
当前提交
e47bebf16a
共有 4 个文件被更改,包括 13 次插入13 次删除
  1. 2 1
      README.md
  2. 11 0
      channel/email.go
  3. 0 1
      channel/telegram.go
  4. 0 11
      controller/message.go

+ 2 - 1
README.md

@@ -10,4 +10,5 @@
 + [ ] 支持 Telegram
 + [ ] 重新编写 README
 + [ ] 推广
-+ [ ] 支持从外部系统获取 Token
++ [ ] 支持从外部系统获取 Token
++ [ ] 支持 Bark

+ 11 - 0
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)
 }

+ 0 - 1
channel/telegram.go

@@ -1 +0,0 @@
-package channel

+ 0 - 11
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 == "" {