From 17731e05ff47c72013fb52d1fc2236b4d7da269b Mon Sep 17 00:00:00 2001
From: a1012112796 <1012112796@qq.com>
Date: Sun, 21 Mar 2021 18:11:22 +0800
Subject: [PATCH] fix double 'push tag' action feed (#15078)
Signed-off-by: a1012112796 <1012112796@qq.com>
---
modules/notification/action/action.go | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/modules/notification/action/action.go b/modules/notification/action/action.go
index 3530e48b1c..776bee6a0c 100644
--- a/modules/notification/action/action.go
+++ b/modules/notification/action/action.go
@@ -332,7 +332,8 @@ func (a *actionNotifier) NotifyPushCommits(pusher *models.User, repo *models.Rep
func (a *actionNotifier) NotifyCreateRef(doer *models.User, repo *models.Repository, refType, refFullName string) {
opType := models.ActionCommitRepo
if refType == "tag" {
- opType = models.ActionPushTag
+ // has sent same action in `NotifyPushCommits`, so skip it.
+ return
}
if err := models.NotifyWatchers(&models.Action{
ActUserID: doer.ID,
@@ -350,7 +351,8 @@ func (a *actionNotifier) NotifyCreateRef(doer *models.User, repo *models.Reposit
func (a *actionNotifier) NotifyDeleteRef(doer *models.User, repo *models.Repository, refType, refFullName string) {
opType := models.ActionDeleteBranch
if refType == "tag" {
- opType = models.ActionDeleteTag
+ // has sent same action in `NotifyPushCommits`, so skip it.
+ return
}
if err := models.NotifyWatchers(&models.Action{
ActUserID: doer.ID,