Hass/message-pusher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 4 Wiki Activity

feat: group message support specify target (#121)

Browse Source 
* feat: group message support specify target

* chore: remove text for customized descriptions like i18n

* fix: update priority

---------

Co-authored-by: JustSong <songquanpeng@foxmail.com>
This commit is contained in:
0fatal
2024-11-10 11:06:38 +08:00
committed by GitHub
co-authored by JustSong
parent ef7c2d0a9d
commit 6f3f53c85a
2 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
channel/email.go
+1 -1
View File
@@ -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)
channel/group.go
+6 -1
View File
@@ -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("无效的群组消息配置，子通道数量与子目标数量不一致")
} }