fix: 定时任务恢复后提醒的消息也监听下 (#55)

* 定时任务恢复后发的消息也监听下 --------- Co-authored-by: shuang.gao <[email protected]> Co-authored-by: Yqchilde <[email protected]>
yqchilde · Mar 9, 2023 · d83e782 · d83e782
1 parent d7c5934
commit d83e782
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 22 deletions.
diff --git a/engine/robot/api.go b/engine/robot/api.go
@@ -169,6 +169,31 @@ func (ctx *Ctx) SendTextAndAt(groupWxId, wxId, text string) error {
 	return ctx.framework.SendTextAndAt(groupWxId, wxId, "", text)
 }
 
+// SendTextAndListen 发送文本消息到指定好友并监听发送的文本消息
+func (ctx *Ctx) SendTextAndListen(wxId, text string) error {
+	ctx.mutex.Lock()
+	defer ctx.mutex.Unlock()
+	if text == "" {
+		return nil
+	}
+	err := ctx.framework.SendText(wxId, text)
+	if err != nil {
+		return err
+	}
+
+	// 加入消息监听队列
+	event := Event{
+		Type:         EventSelfMessage,
+		FromUniqueID: wxId,
+		Message: &Message{
+			Type:    MsgTypeText,
+			Content: text,
+		},
+	}
+	eventBuffer.ProcessEvent(&event, ctx.framework)
+	return nil
+}
+
 // SendImage 发送图片消息到指定好友
 // 支持本地文件，图片路径以local://开头
 func (ctx *Ctx) SendImage(wxId, path string) error {
@@ -310,22 +335,7 @@ func (ctx *Ctx) ReplyTextAndListen(text string) error {
 	if text == "" {
 		return nil
 	}
-	err := ctx.SendText(ctx.Event.FromUniqueID, text)
-	if err != nil {
-		return err
-	}
-
-	// 加入消息监听队列
-	event := Event{
-		Type:         EventSelfMessage,
-		FromUniqueID: ctx.Event.FromUniqueID,
-		Message: &Message{
-			Type:    MsgTypeText,
-			Content: text,
-		},
-	}
-	eventBuffer.ProcessEvent(&event, ctx.framework)
-	return nil
+	return ctx.SendTextAndListen(ctx.Event.FromUniqueID, text)
 }
 
 // ReplyImage 回复图片消息

diff --git a/plugins/manager/cronjob.go b/plugins/manager/cronjob.go
@@ -71,7 +71,7 @@ func registerCronjob() {
 				// 恢复每月的提醒任务
 				if matched := regexp.MustCompile(RegexOfRemindEveryMonth).FindStringSubmatch(cronJob.Desc); matched != nil {
 					if _, err := AddRemindOfEveryMonth(ctx, cronJob.Tag, matched, func() {
-						ctx.SendText(cronJob.GroupId, cronJob.Remind)
+						ctx.SendTextAndListen(cronJob.GroupId, cronJob.Remind)
 					}); err != nil {
 						log.Errorf("恢复每月提醒任务失败: jobId: %d, error: %v", cronJob.Id, err)
 					}
@@ -80,7 +80,7 @@ func registerCronjob() {
 				// 恢复每周的提醒任务
 				if matched := regexp.MustCompile(RegexOfRemindEveryWeek).FindStringSubmatch(cronJob.Desc); matched != nil {
 					if _, err := AddRemindOfEveryWeek(ctx, cronJob.Tag, matched, func() {
-						ctx.SendText(cronJob.GroupId, cronJob.Remind)
+						ctx.SendTextAndListen(cronJob.GroupId, cronJob.Remind)
 					}); err != nil {
 						log.Errorf("恢复每周提醒任务失败: jobId: %d, error: %v", cronJob.Id, err)
 					}
@@ -89,7 +89,7 @@ func registerCronjob() {
 				// 恢复每天的提醒任务
 				if matched := regexp.MustCompile(RegexOfRemindEveryDay).FindStringSubmatch(cronJob.Desc); matched != nil {
 					if _, err := AddRemindOfEveryDay(ctx, cronJob.Tag, matched, func() {
-						ctx.SendText(cronJob.GroupId, cronJob.Remind)
+						ctx.SendTextAndListen(cronJob.GroupId, cronJob.Remind)
 					}); err != nil {
 						log.Errorf("恢复每天提醒任务失败: jobId: %d, error: %v", cronJob.Id, err)
 					}
@@ -98,7 +98,7 @@ func registerCronjob() {
 				// 恢复间隔提醒任务
 				if matched := regexp.MustCompile(RegexOfRemindInterval).FindStringSubmatch(cronJob.Desc); matched != nil {
 					if _, err := AddRemindForInterval(ctx, cronJob.Tag, matched, func() {
-						ctx.SendText(cronJob.GroupId, cronJob.Remind)
+						ctx.SendTextAndListen(cronJob.GroupId, cronJob.Remind)
 					}); err != nil {
 						log.Errorf("恢复间隔提醒任务失败: jobId: %d, error: %v", cronJob.Id, err)
 					}
@@ -107,7 +107,7 @@ func registerCronjob() {
 				// 恢复指定时间提醒任务
 				if matched := regexp.MustCompile(RegexOfRemindSpecifyTime).FindStringSubmatch(cronJob.Desc); matched != nil {
 					if _, err := AddRemindForSpecifyTime(ctx, cronJob.Tag, matched, func() {
-						ctx.SendText(cronJob.GroupId, cronJob.Remind)
+						ctx.SendTextAndListen(cronJob.GroupId, cronJob.Remind)
 					}); err != nil {
 						log.Errorf("恢复指定时间提醒任务失败: jobId: %d, error: %v", cronJob.Id, err)
 					}
@@ -116,7 +116,7 @@ func registerCronjob() {
 				// 恢复表达式提醒任务
 				if matched := regexp.MustCompile(RegexOfRemindExpression).FindStringSubmatch(cronJob.Desc); matched != nil {
 					if _, err := AddRemindForExpression(ctx, cronJob.Tag, matched, func() {
-						ctx.SendText(cronJob.GroupId, cronJob.Remind)
+						ctx.SendTextAndListen(cronJob.GroupId, cronJob.Remind)
 					}); err != nil {
 						log.Errorf("恢复表达式提醒任务失败: jobId: %d, error: %v", cronJob.Id, err)
 					}