From d73d335bf23ec2c07c5d453936b0595d07423a4a Mon Sep 17 00:00:00 2001
From: oppiliappan <me@oppi.li>
Date: Fri, 22 Aug 2025 16:24:28 +0100
Subject: [PATCH] appview: fixes for xrpc migration

Signed-off-by: oppiliappan <me@oppi.li>
---
 .../templates/repo/settings/general.html      |  4 +-
 appview/pulls/pulls.go                        | 62 ++++++-------------
 appview/repo/repo.go                          | 37 ++++-------
 3 files changed, 35 insertions(+), 68 deletions(-)

diff --git a/appview/pages/templates/repo/settings/general.html b/appview/pages/templates/repo/settings/general.html
index 65a1a6a9..3e20741b 100644
--- a/appview/pages/templates/repo/settings/general.html
+++ b/appview/pages/templates/repo/settings/general.html
@@ -8,6 +8,7 @@
     <div class="col-span-1 md:col-span-3 flex flex-col gap-6 p-2">
       {{ template "branchSettings" . }}
       {{ template "deleteRepo" . }}
+      <div id="operation-error" class="text-red-500 dark:text-red-400"></div>
     </div>
   </section>
 {{ end }}
@@ -22,7 +23,7 @@
         unless you specify a different branch.
       </p>
     </div>
-    <form hx-put="/{{ $.RepoInfo.FullName }}/settings/branches/default" class="col-span-1 md:col-span-1 md:justify-self-end group flex gap-2 items-stretch">
+    <form hx-put="/{{ $.RepoInfo.FullName }}/settings/branches/default" hx-swap="none" class="col-span-1 md:col-span-1 md:justify-self-end group flex gap-2 items-stretch">
       <select id="branch" name="branch" required class="p-1 max-w-64 border border-gray-200 bg-white dark:bg-gray-800 dark:text-white dark:border-gray-700">
         <option value="" disabled selected >
           Choose a default branch
@@ -54,6 +55,7 @@
       <button 
         class="btn group text-red-500 hover:text-red-700 dark:text-red-400 dark:hover:text-red-300 flex gap-2 items-center"  
         type="button"
+        hx-swap="none"
         hx-delete="/{{ $.RepoInfo.FullName }}/settings/delete"
         hx-confirm="Are you sure you want to delete {{ $.RepoInfo.FullName }}?">
           {{ i "trash-2" "size-4" }}
diff --git a/appview/pulls/pulls.go b/appview/pulls/pulls.go
index a37d28e4..ec254650 100644
--- a/appview/pulls/pulls.go
+++ b/appview/pulls/pulls.go
@@ -19,6 +19,7 @@ import (
 	"tangled.sh/tangled.sh/core/appview/pages"
 	"tangled.sh/tangled.sh/core/appview/pages/markup"
 	"tangled.sh/tangled.sh/core/appview/reporesolver"
+	"tangled.sh/tangled.sh/core/appview/xrpcclient"
 	"tangled.sh/tangled.sh/core/idresolver"
 	"tangled.sh/tangled.sh/core/knotclient"
 	"tangled.sh/tangled.sh/core/patchutil"
@@ -28,6 +29,7 @@ import (
 	"github.com/bluekeyes/go-gitdiff/gitdiff"
 	comatproto "github.com/bluesky-social/indigo/api/atproto"
 	lexutil "github.com/bluesky-social/indigo/lex/util"
+	indigoxrpc "github.com/bluesky-social/indigo/xrpc"
 	"github.com/go-chi/chi/v5"
 	"github.com/google/uuid"
 )
@@ -218,17 +220,14 @@ func (s *Pulls) mergeCheck(r *http.Request, f *reporesolver.ResolvedRepo, pull *
 		return types.MergeCheckResponse{}
 	}
 
-	client, err := s.oauth.ServiceClient(
-		r,
-		oauth.WithService(f.Knot),
-		oauth.WithLxm(tangled.RepoMergeCheckNSID),
-		oauth.WithDev(s.config.Core.Dev),
-	)
-	if err != nil {
-		log.Printf("failed to connect to knot server: %v", err)
-		return types.MergeCheckResponse{
-			Error: "failed to check merge status: could not connect to knot server",
-		}
+	scheme := "https"
+	if s.config.Core.Dev {
+		scheme = "http"
+	}
+	host := fmt.Sprintf("%s://%s", scheme, f.Knot)
+
+	xrpcc := indigoxrpc.Client{
+		Host: host,
 	}
 
 	patch := pull.LatestPatch()
@@ -893,19 +892,8 @@ func (s *Pulls) handleForkBasedPull(w http.ResponseWriter, r *http.Request, f *r
 			Repo:      fork.RepoAt().String(),
 		},
 	)
-	if err != nil {
-		xe, parseErr := xrpcerr.Unmarshal(err.Error())
-		if parseErr != nil {
-			log.Printf("failed to create hidden ref: %v", err)
-			s.pages.Notice(w, "pull", "Failed to create pull request. Try again later.")
-		} else {
-			log.Printf("failed to create hidden ref: %s", xe.Error())
-			if xe.Tag == "AccessControl" {
-				s.pages.Notice(w, "pull", "Branch based pull requests are not supported on this knot.")
-			} else {
-				s.pages.Notice(w, "pull", fmt.Sprintf("Failed to create pull request: %s", xe.Message))
-			}
-		}
+	if err := xrpcclient.HandleXrpcErr(err); err != nil {
+		s.pages.Notice(w, "pull", err.Error())
 		return
 	}
 
@@ -1501,13 +1489,13 @@ func (s *Pulls) resubmitFork(w http.ResponseWriter, r *http.Request) {
 			Repo:      forkRepo.RepoAt().String(),
 		},
 	)
-	if err != nil || !resp.Success {
-		if err != nil {
-			log.Printf("failed to update tracking branch: %s", err)
-		} else {
-			log.Printf("failed to update tracking branch: success=false")
-		}
-		s.pages.Notice(w, "resubmit-error", "Failed to create pull request. Try again later.")
+	if err := xrpcclient.HandleXrpcErr(err); err != nil {
+		s.pages.Notice(w, "resubmit-error", err.Error())
+		return
+	}
+	if !resp.Success {
+		log.Println("Failed to update tracking ref.", "err", resp.Error)
+		s.pages.Notice(w, "resubmit-error", "Failed to update tracking ref.")
 		return
 	}
 
@@ -1933,18 +1921,6 @@ func (s *Pulls) MergePull(w http.ResponseWriter, r *http.Request) {
 
 	patch := pullsToMerge.CombinedPatch()
 
-	client, err := s.oauth.ServiceClient(
-		r,
-		oauth.WithService(f.Knot),
-		oauth.WithLxm(tangled.RepoMergeNSID),
-		oauth.WithDev(s.config.Core.Dev),
-	)
-	if err != nil {
-		log.Printf("failed to connect to knot server: %v", err)
-		s.pages.Notice(w, "pull-merge-error", "Failed to merge pull request. Try again later.")
-		return
-	}
-
 	ident, err := s.idResolver.ResolveIdent(r.Context(), pull.OwnerDid)
 	if err != nil {
 		log.Printf("resolving identity: %s", err)
diff --git a/appview/repo/repo.go b/appview/repo/repo.go
index 94fcd1be..6ad885c4 100644
--- a/appview/repo/repo.go
+++ b/appview/repo/repo.go
@@ -930,6 +930,7 @@ func (rp *Repo) AddCollaborator(w http.ResponseWriter, r *http.Request) {
 func (rp *Repo) DeleteRepo(w http.ResponseWriter, r *http.Request) {
 	user := rp.oauth.GetUser(r)
 
+	noticeId := "operation-error"
 	f, err := rp.repoResolver.Resolve(r)
 	if err != nil {
 		log.Println("failed to get repo and knot", err)
@@ -949,7 +950,7 @@ func (rp *Repo) DeleteRepo(w http.ResponseWriter, r *http.Request) {
 	})
 	if err != nil {
 		log.Printf("failed to delete record: %s", err)
-		rp.pages.Notice(w, "settings-delete", "Failed to delete repository from PDS.")
+		rp.pages.Notice(w, noticeId, "Failed to delete repository from PDS.")
 		return
 	}
 	log.Println("removed repo record ", f.RepoAt().String())
@@ -973,17 +974,11 @@ func (rp *Repo) DeleteRepo(w http.ResponseWriter, r *http.Request) {
 			Name: f.Name,
 		},
 	)
-	if err != nil {
-		xe, parseErr := xrpcerr.Unmarshal(err.Error())
-		if parseErr != nil {
-			log.Printf("failed to delete repo from knot %s: %s", f.Knot, err)
-		} else {
-			log.Printf("failed to delete repo from knot %s: %s", f.Knot, xe.Error())
-		}
-		// Continue anyway since we want to clean up local state
-	} else {
-		log.Println("removed repo from knot ", f.Knot)
+	if err := xrpcclient.HandleXrpcErr(err); err != nil {
+		rp.pages.Notice(w, noticeId, err.Error())
+		return
 	}
+	log.Println("deleted repo from knot")
 
 	tx, err := rp.db.BeginTx(r.Context(), nil)
 	if err != nil {
@@ -1002,7 +997,7 @@ func (rp *Repo) DeleteRepo(w http.ResponseWriter, r *http.Request) {
 	// remove collaborator RBAC
 	repoCollaborators, err := rp.enforcer.E.GetImplicitUsersForResourceByDomain(f.DidSlashRepo(), f.Knot)
 	if err != nil {
-		rp.pages.Notice(w, "settings-delete", "Failed to remove collaborators")
+		rp.pages.Notice(w, noticeId, "Failed to remove collaborators")
 		return
 	}
 	for _, c := range repoCollaborators {
@@ -1014,14 +1009,14 @@ func (rp *Repo) DeleteRepo(w http.ResponseWriter, r *http.Request) {
 	// remove repo RBAC
 	err = rp.enforcer.RemoveRepo(f.OwnerDid(), f.Knot, f.DidSlashRepo())
 	if err != nil {
-		rp.pages.Notice(w, "settings-delete", "Failed to update RBAC rules")
+		rp.pages.Notice(w, noticeId, "Failed to update RBAC rules")
 		return
 	}
 
 	// remove repo from db
 	err = db.RemoveRepo(tx, f.OwnerDid(), f.Name)
 	if err != nil {
-		rp.pages.Notice(w, "settings-delete", "Failed to update appview")
+		rp.pages.Notice(w, noticeId, "Failed to update appview")
 		return
 	}
 	log.Println("removed repo from db")
@@ -1050,6 +1045,7 @@ func (rp *Repo) SetDefaultBranch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
+	noticeId := "operation-error"
 	branch := r.FormValue("branch")
 	if branch == "" {
 		http.Error(w, "malformed form", http.StatusBadRequest)
@@ -1082,7 +1078,7 @@ func (rp *Repo) SetDefaultBranch(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	w.Write(fmt.Append(nil, "default branch set to: ", branch))
+	rp.pages.HxRefresh(w)
 }
 
 func (rp *Repo) Secrets(w http.ResponseWriter, r *http.Request) {
@@ -1344,15 +1340,8 @@ func (rp *Repo) SyncRepoFork(w http.ResponseWriter, r *http.Request) {
 				Branch: ref,
 			},
 		)
-		if err != nil {
-			xe, parseErr := xrpcerr.Unmarshal(err.Error())
-			if parseErr != nil {
-				log.Printf("failed to sync repository fork: %s", err)
-				rp.pages.Notice(w, "repo", "Failed to sync repository fork.")
-			} else {
-				log.Printf("failed to sync repository fork: %s", xe.Error())
-				rp.pages.Notice(w, "repo", fmt.Sprintf("Failed to sync repository fork: %s", xe.Message))
-			}
+		if err := xrpcclient.HandleXrpcErr(err); err != nil {
+			rp.pages.Notice(w, "repo", err.Error())
 			return
 		}
 
-- 
2.51.2