浏览代码

feat: group message support specify target (#121)

* feat: group message support specify target

* chore: remove text for customized descriptions like i18n

* fix: update priority

---------

Co-authored-by: JustSong <[email protected]>
0fatal 11 月之前
父节点
当前提交
6f3f53c85a
共有 2 个文件被更改,包括 7 次插入2 次删除
  1. 1 1
      channel/email.go
  2. 6 1
      channel/group.go

+ 1 - 1
channel/email.go

@@ -23,7 +23,7 @@ func SendEmailMessage(message *model.Message, user *model.User, channel_ *model.
 	if subject == common.SystemName || subject == "" {
 	if subject == common.SystemName || subject == "" {
 		subject = message.Description
 		subject = message.Description
 	} else {
 	} else {
-		content = fmt.Sprintf("描述:%s\n\n%s", message.Description, message.Content)
+		content = fmt.Sprintf("%s\n\n%s", message.Description, message.Content)
 	}
 	}
 	var err error
 	var err error
 	message.HTMLContent, err = common.Markdown2HTML(content)
 	message.HTMLContent, err = common.Markdown2HTML(content)

+ 6 - 1
channel/group.go

@@ -9,7 +9,12 @@ import (
 
 
 func SendGroupMessage(message *model.Message, user *model.User, channel_ *model.Channel) error {
 func SendGroupMessage(message *model.Message, user *model.User, channel_ *model.Channel) error {
 	subChannels := strings.Split(channel_.AppId, "|")
 	subChannels := strings.Split(channel_.AppId, "|")
-	subTargets := strings.Split(channel_.AccountId, "|")
+	var subTargets []string
+	if message.To != "" {
+		subTargets = strings.Split(message.To, "|")
+	} else {
+		subTargets = strings.Split(channel_.AccountId, "|")
+	}
 	if len(subChannels) != len(subTargets) {
 	if len(subChannels) != len(subTargets) {
 		return errors.New("无效的群组消息配置,子通道数量与子目标数量不一致")
 		return errors.New("无效的群组消息配置,子通道数量与子目标数量不一致")
 	}
 	}