From 91edc6efb18476d9bbc7d3e78918379e360b5a2e Mon Sep 17 00:00:00 2001
From: Akshay <nerdy@peppe.rs>
Date: Sat, 22 Mar 2025 15:21:03 +0000
Subject: [PATCH] fix a few final bugs

---
 .../templates/fragments/pullActions.html      |  4 ++--
 appview/state/pull.go                         | 23 +++++++++++--------
 appview/state/signer.go                       | 14 +++++------
 3 files changed, 22 insertions(+), 19 deletions(-)

diff --git a/appview/pages/templates/fragments/pullActions.html b/appview/pages/templates/fragments/pullActions.html
index c600813..17940eb 100644
--- a/appview/pages/templates/fragments/pullActions.html
+++ b/appview/pages/templates/fragments/pullActions.html
@@ -46,7 +46,7 @@
         </button>
         {{ end }}
 
-        {{ if and $isPullAuthor $isPushAllowed $isOpen $isLastRound }}
+        {{ if and (or $isPullAuthor $isPushAllowed) $isOpen $isLastRound }}
         <button 
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/close"
           hx-swap="none"
@@ -56,7 +56,7 @@
         </button>
         {{ end }}
 
-        {{ if and $isPullAuthor $isPushAllowed $isClosed $isLastRound }}
+        {{ if and (or $isPullAuthor $isPushAllowed) $isClosed $isLastRound }}
         <button 
           hx-post="/{{ .RepoInfo.FullName }}/pulls/{{ .Pull.PullId }}/reopen"
           hx-swap="none"
diff --git a/appview/state/pull.go b/appview/state/pull.go
index f0eb0ee..c20623c 100644
--- a/appview/state/pull.go
+++ b/appview/state/pull.go
@@ -136,18 +136,21 @@ func (s *State) mergeCheck(f *FullyResolvedRepo, pull *db.Pull) types.MergeCheck
 		}
 	}
 
-	resp, err := ksClient.MergeCheck([]byte(pull.LatestPatch()), pull.OwnerDid, f.RepoName, pull.TargetBranch)
+	resp, err := ksClient.MergeCheck([]byte(pull.LatestPatch()), f.OwnerDid(), f.RepoName, pull.TargetBranch)
 	if err != nil {
 		log.Println("failed to check for mergeability:", err)
-		switch resp.StatusCode {
-		case 400:
-			return types.MergeCheckResponse{
-				Error: "failed to check merge status: does this knot support PRs?",
-			}
-		default:
-			return types.MergeCheckResponse{
-				Error: "failed to check merge status: this knot is unreachable",
-			}
+		return types.MergeCheckResponse{
+			Error: "failed to check merge status",
+		}
+	}
+	switch resp.StatusCode {
+	case 404:
+		return types.MergeCheckResponse{
+			Error: "failed to check merge status: this knot does not support PRs",
+		}
+	case 400:
+		return types.MergeCheckResponse{
+			Error: "failed to check merge status: does this knot support PRs?",
 		}
 	}
 
diff --git a/appview/state/signer.go b/appview/state/signer.go
index 311c531..9a5b907 100644
--- a/appview/state/signer.go
+++ b/appview/state/signer.go
@@ -166,14 +166,14 @@ func (s *SignedClient) Merge(
 		Method = "POST"
 	)
 	endpoint := fmt.Sprintf("/%s/%s/merge", ownerDid, targetRepo)
-	
+
 	mr := types.MergeRequest{
-		Branch: branch,
+		Branch:        branch,
 		CommitMessage: commitMessage,
-		CommitBody: commitBody,
-		AuthorName: authorName,
-		AuthorEmail: authorEmail,
-		Patch: string(patch),
+		CommitBody:    commitBody,
+		AuthorName:    authorName,
+		AuthorEmail:   authorEmail,
+		Patch:         string(patch),
 	}
 
 	body, _ := json.Marshal(mr)
@@ -192,7 +192,7 @@ func (s *SignedClient) MergeCheck(patch []byte, ownerDid, targetRepo, branch str
 	)
 	endpoint := fmt.Sprintf("/%s/%s/merge/check", ownerDid, targetRepo)
 
-	body, _ := json.Marshal(map[string]interface{}{
+	body, _ := json.Marshal(map[string]any{
 		"patch":  string(patch),
 		"branch": branch,
 	})
-- 
2.51.2