From 9c76a52facc7a2b7752d8025be0907699ec8d936 Mon Sep 17 00:00:00 2001
From: Lewis <lewis@tangled.org>
Date: Tue, 9 Jun 2026 11:30:58 +0300
Subject: [PATCH] appview/acl: gate collaborator removal on knot version for
 now

Lewis: May this revision serve well! <lewis@tangled.org>
---
 appview/pages/pages.go                            | 11 ++++++-----
 appview/pages/templates/repo/settings/access.html |  2 +-
 appview/repo/settings.go                          |  9 ++++++---
 3 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/appview/pages/pages.go b/appview/pages/pages.go
index 5f81540e..afc62229 100644
--- a/appview/pages/pages.go
+++ b/appview/pages/pages.go
@@ -1140,11 +1140,12 @@ func (p *Pages) RepoGeneralSettings(w io.Writer, params RepoGeneralSettingsParam
 }
 
 type RepoAccessSettingsParams struct {
-	LoggedInUser  *oauth.MultiAccountUser
-	RepoInfo      repoinfo.RepoInfo
-	Active        string
-	Tab           string
-	Collaborators []Collaborator
+	LoggedInUser          *oauth.MultiAccountUser
+	RepoInfo              repoinfo.RepoInfo
+	Active                string
+	Tab                   string
+	Collaborators         []Collaborator
+	CanRemoveCollaborator bool
 }
 
 func (p *Pages) RepoAccessSettings(w io.Writer, params RepoAccessSettingsParams) error {
diff --git a/appview/pages/templates/repo/settings/access.html b/appview/pages/templates/repo/settings/access.html
index 060c4ec2..611bc6aa 100644
--- a/appview/pages/templates/repo/settings/access.html
+++ b/appview/pages/templates/repo/settings/access.html
@@ -42,7 +42,7 @@
             <p class="text-sm text-gray-500 dark:text-gray-400">{{ .Role }}</p>
           </div>
 
-          {{ if and (eq .Role "collaborator") $.RepoInfo.Roles.CollaboratorInviteAllowed }}
+          {{ if and (eq .Role "collaborator") $.RepoInfo.Roles.CollaboratorInviteAllowed $.CanRemoveCollaborator }}
             <button
               hx-delete="/{{ $.RepoInfo.FullName }}/settings/collaborator"
               hx-vals='{"collaborator": "{{ .Did }}"}'
diff --git a/appview/repo/settings.go b/appview/repo/settings.go
index 11532df9..7e6f68ae 100644
--- a/appview/repo/settings.go
+++ b/appview/repo/settings.go
@@ -13,11 +13,13 @@ import (
 	"tangled.org/core/api/tangled"
 
 	"tangled.org/core/appview/db"
+	"tangled.org/core/appview/knotcompat"
 	"tangled.org/core/appview/models"
 	"tangled.org/core/appview/oauth"
 	"tangled.org/core/appview/pages"
 	"tangled.org/core/appview/sites"
 	xrpcclient "tangled.org/core/appview/xrpcclient"
+	"tangled.org/core/consts"
 	"tangled.org/core/orm"
 	"tangled.org/core/types"
 
@@ -457,9 +459,10 @@ func (rp *Repo) accessSettings(w http.ResponseWriter, r *http.Request) {
 	collaborators := rp.acl.Collaborators(r.Context(), f)
 
 	rp.pages.RepoAccessSettings(w, pages.RepoAccessSettingsParams{
-		LoggedInUser:  user,
-		RepoInfo:      rp.repoResolver.GetRepoInfo(r, user),
-		Collaborators: collaborators,
+		LoggedInUser:          user,
+		RepoInfo:              rp.repoResolver.GetRepoInfo(r, user),
+		Collaborators:         collaborators,
+		CanRemoveCollaborator: knotcompat.KnotHasCapability(r.Context(), f.Knot, rp.config.Core.Dev, consts.CapKnotACL),
 	})
 }
 
-- 
2.51.2