From 60bacdbfcf1f9a49950ecaed446298fcd482589f Mon Sep 17 00:00:00 2001 From: oppiliappan Date: Tue, 20 May 2025 21:17:18 +0100 Subject: [PATCH] appview: use typed request helper for RepoBranchResponse --- appview/state/pull.go | 15 +-------------- knotclient/unsigned.go | 4 ++-- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/appview/state/pull.go b/appview/state/pull.go index e949dfa6..6e485aea 100644 --- a/appview/state/pull.go +++ b/appview/state/pull.go @@ -247,25 +247,12 @@ func (s *State) resubmitCheck(f *FullyResolvedRepo, pull *db.Pull, stack db.Stac return pages.Unknown } - resp, err := us.Branch(ownerDid, repoName, pull.PullSource.Branch) + result, err := us.Branch(ownerDid, repoName, pull.PullSource.Branch) if err != nil { log.Println("failed to reach knotserver", err) return pages.Unknown } - body, err := io.ReadAll(resp.Body) - if err != nil { - log.Printf("error reading response body: %v", err) - return pages.Unknown - } - defer resp.Body.Close() - - var result types.RepoBranchResponse - if err := json.Unmarshal(body, &result); err != nil { - log.Println("failed to parse response:", err) - return pages.Unknown - } - latestSourceRev := pull.Submissions[pull.LastRoundNumber()].SourceRev if pull.IsStacked() && stack != nil { diff --git a/knotclient/unsigned.go b/knotclient/unsigned.go index ec4d9f5e..85b82065 100644 --- a/knotclient/unsigned.go +++ b/knotclient/unsigned.go @@ -142,7 +142,7 @@ func (us *UnsignedClient) Tags(ownerDid, repoName string) (*types.RepoTagsRespon return do[types.RepoTagsResponse](us, req) } -func (us *UnsignedClient) Branch(ownerDid, repoName, branch string) (*http.Response, error) { +func (us *UnsignedClient) Branch(ownerDid, repoName, branch string) (*types.RepoBranchResponse, error) { const ( Method = "GET" ) @@ -154,7 +154,7 @@ func (us *UnsignedClient) Branch(ownerDid, repoName, branch string) (*http.Respo return nil, err } - return us.client.Do(req) + return do[types.RepoBranchResponse](us, req) } func (us *UnsignedClient) DefaultBranch(ownerDid, repoName string) (*types.RepoDefaultBranchResponse, error) { -- 2.51.2