From a854693c8a9bfa6cdbba63d0b3cb2811b6fc50f5 Mon Sep 17 00:00:00 2001 From: chenyifan01 Date: Fri, 12 Aug 2022 17:06:42 +0800 Subject: [PATCH] #2624 update --- modules/auth/wechat/cloudbrain.go | 8 ++++++++ modules/auth/wechat/template.go | 4 ++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/modules/auth/wechat/cloudbrain.go b/modules/auth/wechat/cloudbrain.go index a64087a03..5dbe0a4ea 100644 --- a/modules/auth/wechat/cloudbrain.go +++ b/modules/auth/wechat/cloudbrain.go @@ -53,6 +53,10 @@ func (CloudbrainStartMsg) Url(ctx *TemplateContext) string { return getCloudbrainTemplateUrl(*ctx.Cloudbrain, repo) } +func (CloudbrainStartMsg) TemplateId(ctx *TemplateContext) string { + return setting.CloudbrainStartedTemplateId +} + type CloudbrainStopMsg struct { } @@ -92,6 +96,10 @@ func (CloudbrainStopMsg) Url(ctx *TemplateContext) string { return getCloudbrainTemplateUrl(*ctx.Cloudbrain, repo) } +func (CloudbrainStopMsg) TemplateId(ctx *TemplateContext) string { + return setting.CloudbrainStoppedTemplateId +} + var startMsg = &CloudbrainStartMsg{} var stopMsg = &CloudbrainStopMsg{} diff --git a/modules/auth/wechat/template.go b/modules/auth/wechat/template.go index bc206e3b2..cd8e21f74 100644 --- a/modules/auth/wechat/template.go +++ b/modules/auth/wechat/template.go @@ -3,7 +3,6 @@ package wechat import ( "code.gitea.io/gitea/models" "code.gitea.io/gitea/modules/log" - "code.gitea.io/gitea/modules/setting" "errors" "fmt" ) @@ -13,6 +12,7 @@ type Template interface { Data(ctx *TemplateContext) *DefaultWechatTemplate MsgId(ctx *TemplateContext) string Url(ctx *TemplateContext) string + TemplateId(ctx *TemplateContext) string } type TemplateContext struct { @@ -36,7 +36,7 @@ func SendTemplateMsg(template Template, ctx *TemplateContext, userId int64) erro } req := TemplateMsgRequest{ ToUser: openId, - TemplateId: setting.CloudbrainStartedTemplateId, + TemplateId: template.TemplateId(ctx), Url: template.Url(ctx), ClientMsgId: template.MsgId(ctx), Data: template.Data(ctx),