From 2eecb63488f04eb8faf2e94c9aa7fad0d7ce9623 Mon Sep 17 00:00:00 2001 From: "Luke T. Shumaker" Date: Mon, 15 Apr 2024 10:28:38 -0600 Subject: imworkingon: Fix merged status --- cmd/generate/src_contribs.go | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) (limited to 'cmd/generate') diff --git a/cmd/generate/src_contribs.go b/cmd/generate/src_contribs.go index 4cbaa4f..46683d3 100644 --- a/cmd/generate/src_contribs.go +++ b/cmd/generate/src_contribs.go @@ -73,12 +73,18 @@ func (c Contribution) fetchStatus() (string, error) { urlStr := "https://api.github.com/repos/" + user + "/" + repo + "/pulls/" + prnum var obj struct { - State string `json:"state"` + // State values are "open" and "closed". + State string `json:"state"` + Merged bool `json:"merged"` } if err := httpGetJSON(urlStr, &obj); err != nil { return "", err } - return obj.State, nil + ret := obj.State + if obj.Merged { + ret = "merged" + } + return ret, nil } if m := reGitLabMR.FindStringSubmatch(c.URLs[0]); m != nil { authority := m[1] @@ -88,12 +94,18 @@ func (c Contribution) fetchStatus() (string, error) { urlStr := "https://" + authority + "/api/v4/projects/" + url.QueryEscape(projectID) + "/merge_requests/" + mrnum var obj struct { + // State values are "opened", "closed", "locked", and "merged". State string `json:"state"` } if err := httpGetJSON(urlStr, &obj); err != nil { return "", err } - return obj.State, nil + + ret := obj.State + if ret == "opened" { + ret = "open" + } + return ret, nil } if len(c.URLs) > 1 { for _, u := range c.URLs[1:] { -- cgit v1.2.3-2-g168b