From 1be0880a5410cdaf9e0221749d217477e8d09947 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Wed, 31 Jan 2024 17:50:49 +0000
Subject: [PATCH 1/5] Don't do a full page load when clicking `Watch` or `Star`

- The watch/unwatch button and star/unstar get their own template
- The backend returns HTML instead of redirect

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
---
 routers/web/repo/repo.go          | 29 ++++++++++++++++++++++++++++
 templates/repo/header.tmpl        | 32 ++-----------------------------
 templates/repo/star_unstar.tmpl   | 14 ++++++++++++++
 templates/repo/watch_unwatch.tmpl | 14 ++++++++++++++
 4 files changed, 59 insertions(+), 30 deletions(-)
 create mode 100644 templates/repo/star_unstar.tmpl
 create mode 100644 templates/repo/watch_unwatch.tmpl

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index b64db914060f4..0620a58318bbf 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -302,6 +302,11 @@ func CreatePost(ctx *context.Context) {
 	handleCreateError(ctx, ctxUser, err, "CreatePost", tplCreate, &form)
 }
 
+const (
+	tplWatchUnwatch base.TplName = "repo/watch_unwatch"
+	tplStarUnstar   base.TplName = "repo/star_unstar"
+)
+
 // Action response for actions to a repository
 func Action(ctx *context.Context) {
 	var err error
@@ -334,6 +339,30 @@ func Action(ctx *context.Context) {
 		return
 	}
 
+	switch ctx.Params(":action") {
+	case "watch", "unwatch":
+		ctx.Data["IsWatchingRepo"] = repo_model.IsWatching(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
+	case "star", "unstar":
+		ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
+	}
+
+	switch ctx.Params(":action") {
+	case "watch", "unwatch", "star", "unstar":
+		ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.Name)
+		if err != nil {
+			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)
+			return
+		}
+	}
+
+	switch ctx.Params(":action") {
+	case "watch", "unwatch":
+		ctx.HTML(http.StatusOK, tplWatchUnwatch)
+		return
+	case "star", "unstar":
+		ctx.HTML(http.StatusOK, tplStarUnstar)
+	}
+
 	ctx.RedirectToFirst(ctx.FormString("redirect_to"), ctx.Repo.RepoLink)
 }
 
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index dac30af600c3a..93102467ccb3f 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -58,37 +58,9 @@
 						{{svg "octicon-rss" 16}}
 					</a>
 					{{end}}
-					<form method="post" action="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch?redirect_to={{$.Link}}">
-						{{$.CsrfTokenHtml}}
-						<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
-							<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
-								{{if $.IsWatchingRepo}}
-									{{svg "octicon-eye-closed" 16}}<span class="text">{{ctx.Locale.Tr "repo.unwatch"}}</span>
-								{{else}}
-									{{svg "octicon-eye"}}<span class="text">{{ctx.Locale.Tr "repo.watch"}}</span>
-								{{end}}
-							</button>
-							<a class="ui basic label" href="{{.Link}}/watchers">
-								{{CountFmt .NumWatches}}
-							</a>
-						</div>
-					</form>
+					{{template "repo/watch_unwatch" $}}
 					{{if not $.DisableStars}}
-						<form method="post" action="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star?redirect_to={{$.Link}}">
-							{{$.CsrfTokenHtml}}
-							<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
-								<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
-									{{if $.IsStaringRepo}}
-										{{svg "octicon-star-fill"}}<span class="text">{{ctx.Locale.Tr "repo.unstar"}}</span>
-									{{else}}
-										{{svg "octicon-star"}}<span class="text">{{ctx.Locale.Tr "repo.star"}}</span>
-									{{end}}
-								</button>
-								<a class="ui basic label" href="{{.Link}}/stars">
-									{{CountFmt .NumStars}}
-								</a>
-							</div>
-						</form>
+					{{template "repo/star_unstar" $}}
 					{{end}}
 					{{if and (not .IsEmpty) ($.Permission.CanRead $.UnitTypeCode)}}
 						<div class="ui labeled button
diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
new file mode 100644
index 0000000000000..9c342f4065944
--- /dev/null
+++ b/templates/repo/star_unstar.tmpl
@@ -0,0 +1,14 @@
+<form hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star">
+	<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
+		<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
+			{{if $.IsStaringRepo}}
+				{{svg "octicon-star-fill"}}<span class="text">{{ctx.Locale.Tr "repo.unstar"}}</span>
+			{{else}}
+				{{svg "octicon-star"}}<span class="text">{{ctx.Locale.Tr "repo.star"}}</span>
+			{{end}}
+		</button>
+		<a hx-boost="false" class="ui basic label" href="{{$.RepoLink}}/stars">
+			{{CountFmt .Repository.NumStars}}
+		</a>
+	</div>
+</form>
diff --git a/templates/repo/watch_unwatch.tmpl b/templates/repo/watch_unwatch.tmpl
new file mode 100644
index 0000000000000..c42bc5a9e77d9
--- /dev/null
+++ b/templates/repo/watch_unwatch.tmpl
@@ -0,0 +1,14 @@
+<form hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsWatchingRepo}}un{{end}}watch">
+	<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.watch_guest_user"}}"{{end}}>
+		<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
+			{{if $.IsWatchingRepo}}
+				{{svg "octicon-eye-closed" 16}}<span class="text">{{ctx.Locale.Tr "repo.unwatch"}}</span>
+			{{else}}
+				{{svg "octicon-eye"}}<span class="text">{{ctx.Locale.Tr "repo.watch"}}</span>
+			{{end}}
+		</button>
+		<a hx-boost="false" class="ui basic label" href="{{.RepoLink}}/watchers">
+			{{CountFmt .Repository.NumWatches}}
+		</a>
+	</div>
+</form>

From 2c5aaa55826c992e3f113577dae16dac3667e6a6 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Thu, 1 Feb 2024 09:08:37 +0200
Subject: [PATCH 2/5] Apply suggestions from code review

Co-authored-by: John Olheiser <john.olheiser@gmail.com>
---
 routers/web/repo/repo.go        | 2 +-
 templates/repo/star_unstar.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 0620a58318bbf..918d2ee2370da 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -343,7 +343,7 @@ func Action(ctx *context.Context) {
 	case "watch", "unwatch":
 		ctx.Data["IsWatchingRepo"] = repo_model.IsWatching(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
 	case "star", "unstar":
-		ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
+		ctx.Data["IsStarringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
 	}
 
 	switch ctx.Params(":action") {
diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
index 9c342f4065944..d574e015134b8 100644
--- a/templates/repo/star_unstar.tmpl
+++ b/templates/repo/star_unstar.tmpl
@@ -1,7 +1,7 @@
-<form hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star">
+<form hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsStarringRepo}}un{{end}}star">
 	<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 		<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
-			{{if $.IsStaringRepo}}
+			{{if $.IsStarringRepo}}
 				{{svg "octicon-star-fill"}}<span class="text">{{ctx.Locale.Tr "repo.unstar"}}</span>
 			{{else}}
 				{{svg "octicon-star"}}<span class="text">{{ctx.Locale.Tr "repo.star"}}</span>

From fccd75a5228af82c911084eed70db14813ffb946 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Thu, 1 Feb 2024 07:32:49 +0000
Subject: [PATCH 3/5] Revert "Apply suggestions from code review"

This reverts commit 2c5aaa55826c992e3f113577dae16dac3667e6a6.

It broke the initial page load
---
 routers/web/repo/repo.go        | 2 +-
 templates/repo/star_unstar.tmpl | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 918d2ee2370da..0620a58318bbf 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -343,7 +343,7 @@ func Action(ctx *context.Context) {
 	case "watch", "unwatch":
 		ctx.Data["IsWatchingRepo"] = repo_model.IsWatching(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
 	case "star", "unstar":
-		ctx.Data["IsStarringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
+		ctx.Data["IsStaringRepo"] = repo_model.IsStaring(ctx, ctx.Doer.ID, ctx.Repo.Repository.ID)
 	}
 
 	switch ctx.Params(":action") {
diff --git a/templates/repo/star_unstar.tmpl b/templates/repo/star_unstar.tmpl
index d574e015134b8..9c342f4065944 100644
--- a/templates/repo/star_unstar.tmpl
+++ b/templates/repo/star_unstar.tmpl
@@ -1,7 +1,7 @@
-<form hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsStarringRepo}}un{{end}}star">
+<form hx-boost="true" hx-target="this" method="post" action="{{$.RepoLink}}/action/{{if $.IsStaringRepo}}un{{end}}star">
 	<div class="ui labeled button" {{if not $.IsSigned}}data-tooltip-content="{{ctx.Locale.Tr "repo.star_guest_user"}}"{{end}}>
 		<button type="submit" class="ui compact small basic button"{{if not $.IsSigned}} disabled{{end}}>
-			{{if $.IsStarringRepo}}
+			{{if $.IsStaringRepo}}
 				{{svg "octicon-star-fill"}}<span class="text">{{ctx.Locale.Tr "repo.unstar"}}</span>
 			{{else}}
 				{{svg "octicon-star"}}<span class="text">{{ctx.Locale.Tr "repo.star"}}</span>

From 888553695784e537c8f4435c83280f0c28fe7472 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 5 Feb 2024 08:34:24 +0000
Subject: [PATCH 4/5] Add comment

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
---
 routers/web/repo/repo.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index f11d4f4e31dc7..8ce55381675c3 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -348,6 +348,7 @@ func Action(ctx *context.Context) {
 
 	switch ctx.Params(":action") {
 	case "watch", "unwatch", "star", "unstar":
+		// we have to reload the repository because NumStars or NumWatching (used in the templates) has just changed
 		ctx.Data["Repository"], err = repo_model.GetRepositoryByName(ctx, ctx.Repo.Repository.OwnerID, ctx.Repo.Repository.Name)
 		if err != nil {
 			ctx.ServerError(fmt.Sprintf("Action (%s)", ctx.Params(":action")), err)

From 07cc1db126b76f07ecaea282b521730b33310501 Mon Sep 17 00:00:00 2001
From: Yarden Shoham <git@yardenshoham.com>
Date: Mon, 5 Feb 2024 09:31:16 +0000
Subject: [PATCH 5/5] Add missing return

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
---
 routers/web/repo/repo.go | 1 +
 1 file changed, 1 insertion(+)

diff --git a/routers/web/repo/repo.go b/routers/web/repo/repo.go
index 8ce55381675c3..bede21be1763e 100644
--- a/routers/web/repo/repo.go
+++ b/routers/web/repo/repo.go
@@ -362,6 +362,7 @@ func Action(ctx *context.Context) {
 		return
 	case "star", "unstar":
 		ctx.HTML(http.StatusOK, tplStarUnstar)
+		return
 	}
 
 	ctx.RedirectToFirst(ctx.FormString("redirect_to"), ctx.Repo.RepoLink)