From 95d3b77bf7d076d618fce1b381b99f21547d67b0 Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Mon, 30 Aug 2021 06:36:15 +0000 Subject: [PATCH 1/6] update pkg/cibot/pullrequest.go. --- pkg/cibot/pullrequest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index cfa30fd..9b1dcd2 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -242,7 +242,7 @@ func (s *Server) UpdateLabelsBySourceBranchChange(delLabels, updateLabels []stri cBody := gitee.PullRequestCommentPostParam{} cBody.AccessToken = s.Config.GiteeToken cBody.Body = fmt.Sprintf(commentContent, strDelLabel, s.Config.BotName) - _, _, err = s.GiteeClient.PullRequestsApi.PostV5ReposOwnerRepoPullsNumberComments(s.Context, owner, repo, prNumber, cBody) + _, _, err := s.GiteeClient.PullRequestsApi.PostV5ReposOwnerRepoPullsNumberComments(s.Context, owner, repo, prNumber, cBody) if err != nil { glog.Errorf("unable to add comment in pull request: %v", err) return err -- Gitee From 8a6526db14318a591dc2d58237d0f03a1f20568e Mon Sep 17 00:00:00 2001 From: "George.Cao" Date: Mon, 30 Aug 2021 06:44:51 +0000 Subject: [PATCH 2/6] update pkg/cibot/pullrequest.go. --- pkg/cibot/pullrequest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index 9b1dcd2..c83e84b 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -224,7 +224,7 @@ func (s *Server) UpdateLabelsBySourceBranchChange(delLabels, updateLabels []stri body.AccessToken = optional.NewString(s.Config.GiteeToken) glog.Infof("invoke api to remove labels: %v", strLabel) //update pr - for _, dellalbe := range strDelLabel { + for _, dellalbe := range delLabels { response, err := s.GiteeClient.PullRequestsApi.DeleteV5ReposOwnerRepoPullsLabel(s.Context, owner, repo, prNumber, dellalbe, &body) if err != nil { if response != nil && response.StatusCode == 400 { -- Gitee From f09f2b744e160186671bdf1a498936991a270a08 Mon Sep 17 00:00:00 2001 From: georgecao Date: Fri, 10 Sep 2021 11:23:31 +0800 Subject: [PATCH 3/6] update ci-bot reply information. --- pkg/cibot/lgtm.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cibot/lgtm.go b/pkg/cibot/lgtm.go index 308a538..b677aa5 100644 --- a/pkg/cibot/lgtm.go +++ b/pkg/cibot/lgtm.go @@ -13,7 +13,7 @@ import ( const ( lgtmSelfOwnMessage = `Sorry, you cannot add ***lgtm*** to the pull request you created. :astonished:` lgtmAddedMessage = `***lgtm*** was added to this pull request by: ***%s***. :wave: -**NOTE:**: If this pull request is not merged while all conditions are met, comment "/check-pr" to try again. :smile: ` +**NOTE:** If this pull request is not merged while all conditions are met, comment "/check-pr" to try again. :smile: ` lgtmRemovedMessage = `***lgtm*** is removed in this pull request by: ***%s***. :flushed: ` lgtmAddNoPermissionMessage = `Thanks for your review, ***%s***, your opinion is very important to us.:wave: The maintainers will consider your advice carefully.` -- Gitee From 69ae4ec379111e9eb083611797f8ab44bae97b3f Mon Sep 17 00:00:00 2001 From: georgecao Date: Wed, 15 Sep 2021 11:26:46 +0800 Subject: [PATCH 4/6] update the limit number of maintainer in the first comment while pull request published. --- pkg/cibot/pullrequest.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkg/cibot/pullrequest.go b/pkg/cibot/pullrequest.go index c83e84b..4c0596d 100644 --- a/pkg/cibot/pullrequest.go +++ b/pkg/cibot/pullrequest.go @@ -61,7 +61,7 @@ func (s *Server) HandlePullRequestEvent(actionDesc string, event *gitee.PullRequ var committors []string if len(ps) > 0 { for _, p := range ps { - if len(committors) < 10 { + if len(committors) < 20 { committors = append(committors, fmt.Sprintf("***@%s***", p.User)) } } -- Gitee From 5781c02843da41c6679e7213ef8dc769d17e0fba Mon Sep 17 00:00:00 2001 From: wanghao Date: Tue, 28 Sep 2021 07:50:16 +0000 Subject: [PATCH 5/6] change log information --- pkg/cibot/ownerhandler.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cibot/ownerhandler.go b/pkg/cibot/ownerhandler.go index 8602f54..82d3193 100644 --- a/pkg/cibot/ownerhandler.go +++ b/pkg/cibot/ownerhandler.go @@ -190,11 +190,11 @@ func (handler *OwnerHandler) removeOwners(repo database.Repositories, expectedMe } if len(listOfRemove) > 0 { - glog.Infof("list of remove privileges: %v", listOfRemove) + glog.Errorf("list of remove privileges: %v", listOfRemove) memberbody := &gitee.DeleteV5ReposOwnerRepoCollaboratorsUsernameOpts{} memberbody.AccessToken = optional.NewString(handler.Config.GiteeToken) - glog.Infof("begin to remove privileges for %s/%s", repo.Owner, repo.Repo) + glog.Errorf("begin to remove privileges for %s/%s", repo.Owner, repo.Repo) for _, v := range listOfRemove { _, err := handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( handler.Context, repo.Owner, repo.Repo, v, memberbody) -- Gitee From b5d22e6240371bcf438b93c97fc4943141029945 Mon Sep 17 00:00:00 2001 From: wanghaosq Date: Thu, 30 Sep 2021 11:35:11 +0800 Subject: [PATCH 6/6] check privileges exit before invoke api to remove --- pkg/cibot/ownerhandler.go | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/pkg/cibot/ownerhandler.go b/pkg/cibot/ownerhandler.go index 82d3193..4d57d6b 100644 --- a/pkg/cibot/ownerhandler.go +++ b/pkg/cibot/ownerhandler.go @@ -190,17 +190,24 @@ func (handler *OwnerHandler) removeOwners(repo database.Repositories, expectedMe } if len(listOfRemove) > 0 { - glog.Errorf("list of remove privileges: %v", listOfRemove) + glog.Infof("list of remove privileges: %v", listOfRemove) memberbody := &gitee.DeleteV5ReposOwnerRepoCollaboratorsUsernameOpts{} memberbody.AccessToken = optional.NewString(handler.Config.GiteeToken) + checkBody := &gitee.GetV5ReposOwnerRepoCollaboratorsUsernameOpts{} + checkBody.AccessToken = optional.NewString(handler.Config.GiteeToken) - glog.Errorf("begin to remove privileges for %s/%s", repo.Owner, repo.Repo) + glog.Infof("begin to remove privileges for %s/%s", repo.Owner, repo.Repo) for _, v := range listOfRemove { - _, err := handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( - handler.Context, repo.Owner, repo.Repo, v, memberbody) + _,err := handler.GiteeClient.RepositoriesApi.GetV5ReposOwnerRepoCollaboratorsUsername(handler.Context, repo.Owner, repo.Repo, v, checkBody) if err != nil { - glog.Errorf("fail to remove privileges: %v", err) - continue + glog.Infof("%s is not in %s/%s", v, repo.Owner, repo.Repo) + }else{ + _, err = handler.GiteeClient.RepositoriesApi.DeleteV5ReposOwnerRepoCollaboratorsUsername( + handler.Context, repo.Owner, repo.Repo, v, memberbody) + if err != nil { + glog.Errorf("fail to remove privileges: %v", err) + continue + } } // remove from DB -- Gitee