From 6f3f53c85a49b746185740a9a0bd2440ae5ae5ef Mon Sep 17 00:00:00 2001 From: 0fatal <72899968+0fatal@users.noreply.github.com> Date: Sun, 10 Nov 2024 11:06:38 +0800 Subject: [PATCH] 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 --- channel/email.go | 2 +- channel/group.go | 7 ++++++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/channel/email.go b/channel/email.go index 9a7a81d..b281ef8 100644 --- a/channel/email.go +++ b/channel/email.go @@ -23,7 +23,7 @@ func SendEmailMessage(message *model.Message, user *model.User, channel_ *model. if subject == common.SystemName || subject == "" { subject = message.Description } 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 message.HTMLContent, err = common.Markdown2HTML(content) diff --git a/channel/group.go b/channel/group.go index 3c116d4..1ff6955 100644 --- a/channel/group.go +++ b/channel/group.go @@ -9,7 +9,12 @@ import ( func SendGroupMessage(message *model.Message, user *model.User, channel_ *model.Channel) error { 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) { return errors.New("无效的群组消息配置,子通道数量与子目标数量不一致") }