From 04c51f9803cfc5b87266c552911ba791ca902eb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Sun, 18 Feb 2024 01:22:11 +0100
Subject: [PATCH 01/18] feature: filter repositories by type

---
 options/locale/locale_en-US.ini               | 10 +++
 routers/web/explore/repo.go                   | 16 ++++
 routers/web/org/home.go                       | 16 ++++
 routers/web/user/notification.go              | 16 ++++
 routers/web/user/profile.go                   | 24 ++++++
 templates/admin/repo/list.tmpl                |  2 +-
 templates/explore/repo_search.tmpl            | 42 -----------
 templates/explore/repos.tmpl                  |  2 +-
 templates/org/home.tmpl                       |  2 +-
 templates/shared/repo_search.tmpl             | 73 +++++++++++++++++++
 .../notification_subscriptions.tmpl           |  2 +-
 templates/user/profile.tmpl                   |  4 +-
 web_src/js/features/repo-search.js            | 15 ++++
 web_src/js/index.js                           |  2 +
 14 files changed, 178 insertions(+), 48 deletions(-)
 delete mode 100644 templates/explore/repo_search.tmpl
 create mode 100644 templates/shared/repo_search.tmpl
 create mode 100644 web_src/js/features/repo-search.js

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 5f34bc4c1d74..1053ebdc2ead 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -1358,6 +1358,16 @@ issues.filter_milestones = Filter Milestone
 issues.filter_projects = Filter Project
 issues.filter_labels = Filter Label
 issues.filter_reviewers = Filter Reviewer
+issues.filter = Filter
+issues.filter.reset = Reset Filter
+issues.filter.is_archived = Archived
+issues.filter.not_archived = Not Archived
+issues.filter.is_fork = Forked
+issues.filter.not_fork = Not Forked
+issues.filter.is_mirror = Mirrored
+issues.filter.not_mirror = Not Mirrored
+issues.filter.public = Public
+issues.filter.private = Private
 issues.new = New Issue
 issues.new.title_empty = Title cannot be empty
 issues.new.labels = Labels
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 0446edebe691..981be7a2e6e2 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -109,6 +109,18 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	language := ctx.FormTrim("language")
 	ctx.Data["Language"] = language
 
+	archived := ctx.FormOptionalBool("archived")
+	ctx.Data["IsArchived"] = archived
+
+	fork := ctx.FormOptionalBool("fork")
+	ctx.Data["IsFork"] = fork
+
+	mirror := ctx.FormOptionalBool("mirror")
+	ctx.Data["IsMirror"] = mirror
+
+	private := ctx.FormOptionalBool("private")
+	ctx.Data["IsPrivate"] = private
+
 	repos, count, err = repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
 		ListOptions: db.ListOptions{
 			Page:     page,
@@ -125,6 +137,10 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
 		OnlyShowRelevant:   opts.OnlyShowRelevant,
+		Archived:           archived,
+		Fork:               fork,
+		Mirror:             mirror,
+		IsPrivate:          private,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 8bf02b2c42a7..049745b8e9ca 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -97,6 +97,18 @@ func Home(ctx *context.Context) {
 		page = 1
 	}
 
+	archived := ctx.FormOptionalBool("archived")
+	ctx.Data["IsArchived"] = archived
+
+	fork := ctx.FormOptionalBool("fork")
+	ctx.Data["IsFork"] = fork
+
+	mirror := ctx.FormOptionalBool("mirror")
+	ctx.Data["IsMirror"] = mirror
+
+	private := ctx.FormOptionalBool("private")
+	ctx.Data["IsPrivate"] = private
+
 	var (
 		repos []*repo_model.Repository
 		count int64
@@ -114,6 +126,10 @@ func Home(ctx *context.Context) {
 		Actor:              ctx.Doer,
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
+		Archived:           archived,
+		Fork:               fork,
+		Mirror:             mirror,
+		IsPrivate:          private,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
index 26f77cfc3a36..ee3af1d29bd7 100644
--- a/routers/web/user/notification.go
+++ b/routers/web/user/notification.go
@@ -389,6 +389,18 @@ func NotificationWatching(ctx *context.Context) {
 		orderBy = db.SearchOrderByRecentUpdated
 	}
 
+	archived := ctx.FormOptionalBool("archived")
+	ctx.Data["IsArchived"] = archived
+
+	fork := ctx.FormOptionalBool("fork")
+	ctx.Data["IsFork"] = fork
+
+	mirror := ctx.FormOptionalBool("mirror")
+	ctx.Data["IsMirror"] = mirror
+
+	private := ctx.FormOptionalBool("private")
+	ctx.Data["IsPrivate"] = private
+
 	repos, count, err := repo_model.SearchRepository(ctx, &repo_model.SearchRepoOptions{
 		ListOptions: db.ListOptions{
 			PageSize: setting.UI.User.RepoPagingNum,
@@ -402,6 +414,10 @@ func NotificationWatching(ctx *context.Context) {
 		Collaborate:        util.OptionalBoolFalse,
 		TopicOnly:          ctx.FormBool("topic"),
 		IncludeDescription: setting.UI.SearchRepoDescription,
+		Archived:           archived,
+		Fork:               fork,
+		Mirror:             mirror,
+		IsPrivate:          private,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 37ce45053045..32b158949e1c 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -161,6 +161,18 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 	}
 	ctx.Data["NumFollowing"] = numFollowing
 
+	archived := ctx.FormOptionalBool("archived")
+	ctx.Data["IsArchived"] = archived
+
+	fork := ctx.FormOptionalBool("fork")
+	ctx.Data["IsFork"] = fork
+
+	mirror := ctx.FormOptionalBool("mirror")
+	ctx.Data["IsMirror"] = mirror
+
+	private := ctx.FormOptionalBool("private")
+	ctx.Data["IsPrivate"] = private
+
 	switch tab {
 	case "followers":
 		ctx.Data["Cards"] = followers
@@ -207,6 +219,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
+			Archived:           archived,
+			Fork:               fork,
+			Mirror:             mirror,
+			IsPrivate:          private,
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
@@ -229,6 +245,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
+			Archived:           archived,
+			Fork:               fork,
+			Mirror:             mirror,
+			IsPrivate:          private,
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
@@ -274,6 +294,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
+			Archived:           archived,
+			Fork:               fork,
+			Mirror:             mirror,
+			IsPrivate:          private,
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
diff --git a/templates/admin/repo/list.tmpl b/templates/admin/repo/list.tmpl
index fdba0734a2ab..acec50b833d6 100644
--- a/templates/admin/repo/list.tmpl
+++ b/templates/admin/repo/list.tmpl
@@ -7,7 +7,7 @@
 			</div>
 		</h4>
 		<div class="ui attached segment">
-			{{template "admin/repo/search" .}}
+			{{template "shared/repo_search" .}}
 		</div>
 		<div class="ui attached table segment">
 			<table class="ui very basic striped table unstackable">
diff --git a/templates/explore/repo_search.tmpl b/templates/explore/repo_search.tmpl
deleted file mode 100644
index eaf2e7a090a6..000000000000
--- a/templates/explore/repo_search.tmpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<div class="ui secondary filter menu gt-ac gt-mx-0">
-	<form class="ui form ignore-dirty gt-f1">
-		<input type="hidden" name="sort" value="{{$.SortType}}">
-		<input type="hidden" name="language" value="{{$.Language}}">
-		<div class="ui fluid action input">
-			{{template "shared/searchinput" dict "Value" .Keyword}}
-			{{if .PageIsExploreRepositories}}
-				<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
-			{{else if .TabName}}
-				<input type="hidden" name="tab" value="{{.TabName}}">
-			{{end}}
-			<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
-		</div>
-	</form>
-	<!-- Sort -->
-	<div class="ui dropdown type jump item gt-mr-0">
-		<span class="text">
-			{{ctx.Locale.Tr "repo.issues.filter_sort"}}
-		</span>
-		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-		<div class="menu">
-			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=newest&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
-			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=oldest&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
-			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=alphabetically&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
-			<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=reversealphabetically&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
-			<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=recentupdate&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-			<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=leastupdate&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
-			{{if not .DisableStars}}
-				<a class="{{if eq .SortType "moststars"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=moststars&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</a>
-				<a class="{{if eq .SortType "feweststars"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=feweststars&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</a>
-			{{end}}
-			<a class="{{if eq .SortType "mostforks"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=mostforks&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</a>
-			<a class="{{if eq .SortType "fewestforks"}}active {{end}}item" href="{{$.Link}}?tab={{$.TabName}}&sort=fewestforks&q={{$.Keyword}}&language={{$.Language}}">{{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</a>
-		</div>
-	</div>
-</div>
-{{if and .PageIsExploreRepositories .OnlyShowRelevant}}
-	<div class="ui message explore-relevancy-note">
-		<span data-tooltip-content="{{ctx.Locale.Tr "explore.relevant_repositories_tooltip"}}">{{ctx.Locale.Tr "explore.relevant_repositories" ((printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))|Escape) | Safe}}</span>
-	</div>
-{{end}}
-<div class="divider"></div>
diff --git a/templates/explore/repos.tmpl b/templates/explore/repos.tmpl
index dfede2ffcc06..53742bf0d94d 100644
--- a/templates/explore/repos.tmpl
+++ b/templates/explore/repos.tmpl
@@ -2,7 +2,7 @@
 <div role="main" aria-label="{{.Title}}" class="page-content explore repositories">
 	{{template "explore/navbar" .}}
 	<div class="ui container">
-		{{template "explore/repo_search" .}}
+		{{template "shared/repo_search" .}}
 		{{template "explore/repo_list" .}}
 		{{template "base/paginate" .}}
 	</div>
diff --git a/templates/org/home.tmpl b/templates/org/home.tmpl
index 81a76d3b4d45..9e259d5791b8 100644
--- a/templates/org/home.tmpl
+++ b/templates/org/home.tmpl
@@ -39,7 +39,7 @@
 				{{if .ProfileReadme}}
 					<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
 				{{end}}
-				{{template "explore/repo_search" .}}
+				{{template "shared/repo_search" .}}
 				{{template "explore/repo_list" .}}
 				{{template "base/paginate" .}}
 			</div>
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
new file mode 100644
index 000000000000..2fa6ae0eb112
--- /dev/null
+++ b/templates/shared/repo_search.tmpl
@@ -0,0 +1,73 @@
+<div class="ui secondary filter menu gt-ac gt-mx-0">
+	<form class="ui form ignore-dirty gt-f1">
+		<input type="hidden" name="sort" value="{{$.SortType}}">
+		<input type="hidden" name="language" value="{{$.Language}}">
+		<div class="ui fluid action input">
+			{{template "shared/searchinput" dict "Value" .Keyword}}
+			{{if .PageIsExploreRepositories}}
+				<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
+			{{else if .TabName}}
+				<input type="hidden" name="tab" value="{{.TabName}}">
+			{{end}}
+			<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
+		</div>
+	</form>
+	{{$tabQuery := printf "tab=%s&" .TabName}}
+	{{if not .TabName}}{{$tabQuery = ""}}{{end}}
+	{{$languageQuery := printf "language=%s&" .Language}}
+	{{if not .TabName}}{{$languageQuery = ""}}{{end}}
+	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery .Keyword}}
+	<!-- Filter -->
+	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams .SortType}}
+	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
+		<div class="ui dropdown type jump item gt-mr-0">
+			<span class="text">
+				{{ctx.Locale.Tr "repo.issues.filter"}}
+			</span>
+			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+			<div class="menu">
+				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "repo.issues.filter.reset"}}</a>
+				<div class="divider"></div>
+				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.is_archived"}}</label>
+				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.not_archived"}}</label>
+				<div class="divider"></div>
+				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.is_fork"}}</label>
+				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.not_fork"}}</label>
+				<div class="divider"></div>
+				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.is_mirror"}}</label>
+				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.not_mirror"}}</label>
+				<div class="divider"></div>
+				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.public"}}</label>
+				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.private"}}</label>
+			</div>
+		</div>
+	</form>
+	<!-- Sort -->
+	<div class="ui dropdown type jump item gt-mr-0">
+		<span class="text">
+			{{ctx.Locale.Tr "repo.issues.filter_sort"}}
+		</span>
+		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+		<div class="menu">
+			{{$href := printf "%s?%s" .Link $queryParams}}
+			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$href}}&sort=newest">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
+			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$href}}&sort=oldest">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
+			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$href}}&sort=alphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
+			<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$href}}&sort=reversealphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
+			<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$href}}&sort=recentupdate">{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
+			<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$href}}&sort=leastupdate">{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
+			{{if not .DisableStars}}
+				<a class="{{if eq .SortType "moststars"}}active {{end}}item" href="{{$href}}&sort=moststars">{{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</a>
+				<a class="{{if eq .SortType "feweststars"}}active {{end}}item" href="{{$href}}&sort=feweststars">{{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</a>
+			{{end}}
+			<a class="{{if eq .SortType "mostforks"}}active {{end}}item" href="{{$href}}&sort=mostforks">{{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</a>
+			<a class="{{if eq .SortType "fewestforks"}}active {{end}}item" href="{{$href}}&sort=fewestforks">{{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</a>
+		</div>
+	</div>
+</div>
+{{if and .PageIsExploreRepositories .OnlyShowRelevant}}
+	<div class="ui message explore-relevancy-note">
+		<span data-tooltip-content="{{ctx.Locale.Tr "explore.relevant_repositories_tooltip"}}">{{ctx.Locale.Tr "explore.relevant_repositories" ((printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))|Escape) | Safe}}</span>
+	</div>
+{{end}}
+<div class="divider"></div>
diff --git a/templates/user/notification/notification_subscriptions.tmpl b/templates/user/notification/notification_subscriptions.tmpl
index ec40d3afeaff..a37f0c352e04 100644
--- a/templates/user/notification/notification_subscriptions.tmpl
+++ b/templates/user/notification/notification_subscriptions.tmpl
@@ -69,7 +69,7 @@
 					{{template "shared/issuelist" dict "." . "listType" "dashboard"}}
 				{{end}}
 			{{else}}
-				{{template "explore/repo_search" .}}
+				{{template "shared/repo_search" .}}
 				{{template "explore/repo_list" .}}
 				{{template "base/paginate" .}}
 			{{end}}
diff --git a/templates/user/profile.tmpl b/templates/user/profile.tmpl
index 426b5f042a58..a171859bef4b 100644
--- a/templates/user/profile.tmpl
+++ b/templates/user/profile.tmpl
@@ -20,7 +20,7 @@
 					{{template "user/dashboard/feeds" .}}
 				{{else if eq .TabName "stars"}}
 					<div class="stars">
-						{{template "explore/repo_search" .}}
+						{{template "shared/repo_search" .}}
 						{{template "explore/repo_list" .}}
 						{{template "base/paginate" .}}
 					</div>
@@ -31,7 +31,7 @@
 				{{else if eq .TabName "overview"}}
 					<div id="readme_profile" class="markup">{{.ProfileReadme | Str2html}}</div>
 				{{else}}
-					{{template "explore/repo_search" .}}
+					{{template "shared/repo_search" .}}
 					{{template "explore/repo_list" .}}
 					{{template "base/paginate" .}}
 				{{end}}
diff --git a/web_src/js/features/repo-search.js b/web_src/js/features/repo-search.js
new file mode 100644
index 000000000000..a5d4c7acbd29
--- /dev/null
+++ b/web_src/js/features/repo-search.js
@@ -0,0 +1,15 @@
+export function initRepositorySearch() {
+  const repositorySearchForm = document.querySelector('#repo-search-form');
+  if (!repositorySearchForm) return;
+
+  for (const radio of repositorySearchForm.querySelectorAll('input[type=radio]')) {
+    radio.addEventListener('click', (ev) => {
+      ev.preventDefault();
+
+      const formData = new FormData(repositorySearchForm);
+      const params = new URLSearchParams(formData);
+      const otherQueryParams = repositorySearchForm.getAttribute('data-query-params');
+      window.location.search = `${otherQueryParams}&${params.toString()}`;
+    });
+  }
+}
diff --git a/web_src/js/index.js b/web_src/js/index.js
index 117279c3c4a8..5426d2d21e54 100644
--- a/web_src/js/index.js
+++ b/web_src/js/index.js
@@ -86,6 +86,7 @@ import {initCommonIssueListQuickGoto} from './features/common-issue-list.js';
 import {initRepoContributors} from './features/contributors.js';
 import {initRepoDiffCommitBranchesAndTags} from './features/repo-diff-commit.js';
 import {initDirAuto} from './modules/dirauto.js';
+import {initRepositorySearch} from './features/repo-search.js';
 
 // Init Gitea's Fomantic settings
 initGiteaFomantic();
@@ -174,6 +175,7 @@ onDomReady(() => {
   initRepository();
   initRepositoryActionView();
   initRepoContributors();
+  initRepositorySearch();
 
   initCommitStatuses();
   initCaptcha();

From 3c386fd3a0b329e458e80b418b0fc72936aec47e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Sun, 18 Feb 2024 01:59:45 +0100
Subject: [PATCH 02/18] i18n: moved translations

---
 options/locale/locale_en-US.ini   | 21 +++++++++++----------
 templates/shared/repo_search.tmpl | 20 ++++++++++----------
 2 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 1053ebdc2ead..42116070c523 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -141,6 +141,17 @@ confirm_delete_selected = Confirm to delete all selected items?
 name = Name
 value = Value
 
+filter = Filter
+filter.reset = Reset Filter
+filter.is_archived = Archived
+filter.not_archived = Not Archived
+filter.is_fork = Forked
+filter.not_fork = Not Forked
+filter.is_mirror = Mirrored
+filter.not_mirror = Not Mirrored
+filter.public = Public
+filter.private = Private
+
 [aria]
 navbar = Navigation Bar
 footer = Footer
@@ -1358,16 +1369,6 @@ issues.filter_milestones = Filter Milestone
 issues.filter_projects = Filter Project
 issues.filter_labels = Filter Label
 issues.filter_reviewers = Filter Reviewer
-issues.filter = Filter
-issues.filter.reset = Reset Filter
-issues.filter.is_archived = Archived
-issues.filter.not_archived = Not Archived
-issues.filter.is_fork = Forked
-issues.filter.not_fork = Not Forked
-issues.filter.is_mirror = Mirrored
-issues.filter.not_mirror = Not Mirrored
-issues.filter.public = Public
-issues.filter.private = Private
 issues.new = New Issue
 issues.new.title_empty = Title cannot be empty
 issues.new.labels = Labels
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index 2fa6ae0eb112..c7991d163671 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -22,23 +22,23 @@
 	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
 		<div class="ui dropdown type jump item gt-mr-0">
 			<span class="text">
-				{{ctx.Locale.Tr "repo.issues.filter"}}
+				{{ctx.Locale.Tr "filter"}}
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 			<div class="menu">
-				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "repo.issues.filter.reset"}}</a>
+				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.reset"}}</a>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.is_archived"}}</label>
-				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.not_archived"}}</label>
+				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
+				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.is_fork"}}</label>
-				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.not_fork"}}</label>
+				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_fork"}}</label>
+				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_fork"}}</label>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.is_mirror"}}</label>
-				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.not_mirror"}}</label>
+				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_mirror"}}</label>
+				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_mirror"}}</label>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "repo.issues.filter.public"}}</label>
-				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "repo.issues.filter.private"}}</label>
+				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
+				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
 			</div>
 		</div>
 	</form>

From 53108435b487b6f243068ee95328f411da5f5316 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Sun, 18 Feb 2024 02:00:36 +0100
Subject: [PATCH 03/18] chore: shorten ev variable name

---
 web_src/js/features/repo-search.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/web_src/js/features/repo-search.js b/web_src/js/features/repo-search.js
index a5d4c7acbd29..db297eab13c5 100644
--- a/web_src/js/features/repo-search.js
+++ b/web_src/js/features/repo-search.js
@@ -3,8 +3,8 @@ export function initRepositorySearch() {
   if (!repositorySearchForm) return;
 
   for (const radio of repositorySearchForm.querySelectorAll('input[type=radio]')) {
-    radio.addEventListener('click', (ev) => {
-      ev.preventDefault();
+    radio.addEventListener('click', (e) => {
+      e.preventDefault();
 
       const formData = new FormData(repositorySearchForm);
       const params = new URLSearchParams(formData);

From 9d339f6e0ca471fadd52e8a825f0e377e6c40229 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Sun, 18 Feb 2024 18:08:32 +0100
Subject: [PATCH 04/18] refactor: removed unused template

---
 templates/admin/repo/search.tmpl | 29 -----------------------------
 1 file changed, 29 deletions(-)
 delete mode 100644 templates/admin/repo/search.tmpl

diff --git a/templates/admin/repo/search.tmpl b/templates/admin/repo/search.tmpl
deleted file mode 100644
index 247ec5491a87..000000000000
--- a/templates/admin/repo/search.tmpl
+++ /dev/null
@@ -1,29 +0,0 @@
-<div class="ui secondary filter menu gt-ac gt-mx-0">
-	<form class="ui form ignore-dirty gt-f1">
-		<div class="ui fluid action input">
-			{{template "shared/searchinput" dict "Value" .Keyword}}
-			<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
-		</div>
-	</form>
-	<!-- Sort -->
-	<div class="ui dropdown type jump item gt-mr-0">
-		<span class="text">
-			{{ctx.Locale.Tr "repo.issues.filter_sort"}}
-		</span>
-		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-		<div class="menu">
-			<a class="{{if or (eq .SortType "oldest") (not .SortType)}}active {{end}}item" href="{{$.Link}}?sort=oldest&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
-			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$.Link}}?sort=newest&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
-			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$.Link}}?sort=alphabetically&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
-			<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$.Link}}?sort=reversealphabetically&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
-			<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$.Link}}?sort=recentupdate&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-			<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$.Link}}?sort=leastupdate&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
-			<a class="{{if eq .SortType "moststars"}}active {{end}}item" href="{{$.Link}}?sort=moststars&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</a>
-			<a class="{{if eq .SortType "feweststars"}}active {{end}}item" href="{{$.Link}}?sort=feweststars&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</a>
-			<a class="{{if eq .SortType "mostforks"}}active {{end}}item" href="{{$.Link}}?sort=mostforks&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</a>
-			<a class="{{if eq .SortType "fewestforks"}}active {{end}}item" href="{{$.Link}}?sort=fewestforks&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</a>
-			<a class="{{if eq .SortType "size"}}active {{end}}item" href="{{$.Link}}?sort=size&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.by_size"}}</a>
-			<a class="{{if eq .SortType "reversesize"}}active {{end}}item" href="{{$.Link}}?sort=reversesize&q={{$.Keyword}}">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_by_size"}}</a>
-		</div>
-	</div>
-</div>

From 3ab87b66075b964ff05c7618119dc534447688ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Sun, 18 Feb 2024 18:11:49 +0100
Subject: [PATCH 05/18] style: remove divider

---
 templates/shared/repo_search.tmpl | 1 -
 1 file changed, 1 deletion(-)

diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index c7991d163671..211f2428e1d3 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -70,4 +70,3 @@
 		<span data-tooltip-content="{{ctx.Locale.Tr "explore.relevant_repositories_tooltip"}}">{{ctx.Locale.Tr "explore.relevant_repositories" ((printf "?only_show_relevant=0&sort=%s&q=%s&language=%s" $.SortType (QueryEscape $.Keyword) (QueryEscape $.Language))|Escape) | Safe}}</span>
 	</div>
 {{end}}
-<div class="divider"></div>

From f77def7870b199e7f62118ed8e023e523799f8be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Wed, 21 Feb 2024 20:29:57 +0100
Subject: [PATCH 06/18] i18n: clear filter

---
 options/locale/locale_en-US.ini   |  2 +-
 templates/shared/repo_search.tmpl | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 42116070c523..846aea9aafb7 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -142,7 +142,7 @@ name = Name
 value = Value
 
 filter = Filter
-filter.reset = Reset Filter
+filter.clear = Clear Filter
 filter.is_archived = Archived
 filter.not_archived = Not Archived
 filter.is_fork = Forked
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index 211f2428e1d3..950a72ff516e 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -26,19 +26,22 @@
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 			<div class="menu">
-				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.reset"}}</a>
+				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.clear"}}</a>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
-				<label class="item no-blur"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
+				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
+				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_fork"}}</label>
-				<label class="item no-blur"><input type="radio" name="fork" {{if .IsFork.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_fork"}}</label>
+				<label class="item"><input type="radio" name="fork" {{if .IsFork.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_fork"}}</label>
+				<label class="item"><input type="radio" name="fork" {{if .IsFork.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_fork"}}</label>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_mirror"}}</label>
-				<label class="item no-blur"><input type="radio" name="mirror" {{if .IsMirror.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_mirror"}}</label>
+				<label class="item"><input type="radio" name="mirror" {{if .IsMirror.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_mirror"}}</label>
+				<label class="item"><input type="radio" name="mirror" {{if .IsMirror.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_mirror"}}</label>
 				<div class="divider"></div>
-				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
-				<label class="item no-blur"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
+				<label class="item"><input type="radio" name="template" {{if .IsTemplate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_template"}}</label>
+				<label class="item"><input type="radio" name="template" {{if .IsTemplate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_template"}}</label>
+				<div class="divider"></div>
+				<label class="item"><input type="radio" name="private" {{if .IsPrivate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
+				<label class="item"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
 			</div>
 		</div>
 	</form>

From cc9971bd99d199662643eb7c7de5d42d5d1c33e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Wed, 21 Feb 2024 20:31:14 +0100
Subject: [PATCH 07/18] enhance: added template filter

---
 routers/web/explore/repo.go      | 4 ++++
 routers/web/org/home.go          | 4 ++++
 routers/web/user/notification.go | 4 ++++
 routers/web/user/profile.go      | 6 ++++++
 4 files changed, 18 insertions(+)

diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 981be7a2e6e2..58afe1caf5ce 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -118,6 +118,9 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	mirror := ctx.FormOptionalBool("mirror")
 	ctx.Data["IsMirror"] = mirror
 
+	template := ctx.FormOptionalBool("template")
+	ctx.Data["IsTemplate"] = template
+
 	private := ctx.FormOptionalBool("private")
 	ctx.Data["IsPrivate"] = private
 
@@ -140,6 +143,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		Archived:           archived,
 		Fork:               fork,
 		Mirror:             mirror,
+		Template:           template,
 		IsPrivate:          private,
 	})
 	if err != nil {
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 049745b8e9ca..92334514e995 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -106,6 +106,9 @@ func Home(ctx *context.Context) {
 	mirror := ctx.FormOptionalBool("mirror")
 	ctx.Data["IsMirror"] = mirror
 
+	template := ctx.FormOptionalBool("template")
+	ctx.Data["IsTemplate"] = template
+
 	private := ctx.FormOptionalBool("private")
 	ctx.Data["IsPrivate"] = private
 
@@ -129,6 +132,7 @@ func Home(ctx *context.Context) {
 		Archived:           archived,
 		Fork:               fork,
 		Mirror:             mirror,
+		Template:           template,
 		IsPrivate:          private,
 	})
 	if err != nil {
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
index ee3af1d29bd7..eb3b84a46de5 100644
--- a/routers/web/user/notification.go
+++ b/routers/web/user/notification.go
@@ -398,6 +398,9 @@ func NotificationWatching(ctx *context.Context) {
 	mirror := ctx.FormOptionalBool("mirror")
 	ctx.Data["IsMirror"] = mirror
 
+	template := ctx.FormOptionalBool("template")
+	ctx.Data["IsTemplate"] = template
+
 	private := ctx.FormOptionalBool("private")
 	ctx.Data["IsPrivate"] = private
 
@@ -417,6 +420,7 @@ func NotificationWatching(ctx *context.Context) {
 		Archived:           archived,
 		Fork:               fork,
 		Mirror:             mirror,
+		Template:           template,
 		IsPrivate:          private,
 	})
 	if err != nil {
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 32b158949e1c..9930d58547c6 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -170,6 +170,9 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 	mirror := ctx.FormOptionalBool("mirror")
 	ctx.Data["IsMirror"] = mirror
 
+	template := ctx.FormOptionalBool("template")
+	ctx.Data["IsTemplate"] = template
+
 	private := ctx.FormOptionalBool("private")
 	ctx.Data["IsPrivate"] = private
 
@@ -222,6 +225,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			Archived:           archived,
 			Fork:               fork,
 			Mirror:             mirror,
+			Template:           template,
 			IsPrivate:          private,
 		})
 		if err != nil {
@@ -248,6 +252,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			Archived:           archived,
 			Fork:               fork,
 			Mirror:             mirror,
+			Template:           template,
 			IsPrivate:          private,
 		})
 		if err != nil {
@@ -297,6 +302,7 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			Archived:           archived,
 			Fork:               fork,
 			Mirror:             mirror,
+			Template:           template,
 			IsPrivate:          private,
 		})
 		if err != nil {

From 21d32d4f33e5ff206647e8aa1816a9a79faa0dad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Wed, 21 Feb 2024 21:09:55 +0100
Subject: [PATCH 08/18] i18n: template filter

---
 options/locale/locale_en-US.ini | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini
index 846aea9aafb7..86ee0f535eb5 100644
--- a/options/locale/locale_en-US.ini
+++ b/options/locale/locale_en-US.ini
@@ -149,6 +149,8 @@ filter.is_fork = Forked
 filter.not_fork = Not Forked
 filter.is_mirror = Mirrored
 filter.not_mirror = Not Mirrored
+filter.is_template = Template
+filter.not_template = Not Template
 filter.public = Public
 filter.private = Private
 

From 11f8cd9ea3ee188b3243453070518b3efc11a70e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Thu, 22 Feb 2024 04:33:42 +0100
Subject: [PATCH 09/18] PathEscape

---
 templates/shared/repo_search.tmpl | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index 950a72ff516e..e7c3dd387e42 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -16,7 +16,7 @@
 	{{if not .TabName}}{{$tabQuery = ""}}{{end}}
 	{{$languageQuery := printf "language=%s&" .Language}}
 	{{if not .TabName}}{{$languageQuery = ""}}{{end}}
-	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery .Keyword}}
+	{{$queryParams := (printf "%s%sq=%s" $tabQuery $languageQuery .Keyword) | PathEscape}}
 	<!-- Filter -->
 	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams .SortType}}
 	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
@@ -26,7 +26,7 @@
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 			<div class="menu">
-				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.clear"}}</a>
+				<a class="item" href="{{printf "%s?%s" (.Link | PathEscapeSegments) $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.clear"}}</a>
 				<div class="divider"></div>
 				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
 				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
@@ -52,7 +52,7 @@
 		</span>
 		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		<div class="menu">
-			{{$href := printf "%s?%s" .Link $queryParams}}
+			{{$href := printf "%s?%s" (.Link | PathEscapeSegments) $queryParams }}
 			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$href}}&sort=newest">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
 			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$href}}&sort=oldest">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
 			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$href}}&sort=alphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>

From 30d9f02d017696b70b686c9a32e6cc67c899cd65 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Thu, 22 Feb 2024 22:57:30 +0100
Subject: [PATCH 10/18] lint: corrected

---
 templates/shared/repo_search.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index e7c3dd387e42..46e36e918683 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -52,7 +52,7 @@
 		</span>
 		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		<div class="menu">
-			{{$href := printf "%s?%s" (.Link | PathEscapeSegments) $queryParams }}
+			{{$href := printf "%s?%s" (.Link | PathEscapeSegments) $queryParams}}
 			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$href}}&sort=newest">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
 			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$href}}&sort=oldest">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
 			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$href}}&sort=alphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>

From 466ea37f3178410dd0a185e30e033daecab8ce33 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Sun, 25 Feb 2024 19:13:12 +0100
Subject: [PATCH 11/18] escaping

---
 routers/web/explore/code.go       | 7 ++++---
 routers/web/explore/repo.go       | 5 +++--
 routers/web/org/home.go           | 7 ++++---
 routers/web/repo/search.go        | 7 ++++---
 routers/web/user/code.go          | 7 ++++---
 routers/web/user/profile.go       | 5 +++--
 templates/shared/repo_search.tmpl | 6 +++---
 7 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go
index d81884ec62de..7d609bd5534b 100644
--- a/routers/web/explore/code.go
+++ b/routers/web/explore/code.go
@@ -5,6 +5,7 @@ package explore
 
 import (
 	"net/http"
+	"net/url"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/base"
@@ -37,9 +38,9 @@ func Code(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = keyword
-	ctx.Data["Language"] = language
-	ctx.Data["queryType"] = queryType
+	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["queryType"] = url.PathEscape(queryType)
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 58afe1caf5ce..0a830841b682 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -6,6 +6,7 @@ package explore
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -107,7 +108,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	ctx.Data["TopicOnly"] = topicOnly
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = language
+	ctx.Data["Language"] = url.PathEscape(language)
 
 	archived := ctx.FormOptionalBool("archived")
 	ctx.Data["IsArchived"] = archived
@@ -162,7 +163,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		return
 	}
 
-	ctx.Data["Keyword"] = keyword
+	ctx.Data["Keyword"] = url.PathEscape(keyword)
 	ctx.Data["Total"] = count
 	ctx.Data["Repos"] = repos
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 92334514e995..68e3695e7bd8 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -5,6 +5,7 @@ package org
 
 import (
 	"net/http"
+	"net/url"
 	"path"
 	"strings"
 
@@ -59,7 +60,7 @@ func Home(ctx *context.Context) {
 	}
 
 	var orderBy db.SearchOrderBy
-	ctx.Data["SortType"] = ctx.FormString("sort")
+	ctx.Data["SortType"] = url.PathEscape(ctx.FormString("sort"))
 	switch ctx.FormString("sort") {
 	case "newest":
 		orderBy = db.SearchOrderByNewest
@@ -87,10 +88,10 @@ func Home(ctx *context.Context) {
 	}
 
 	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = keyword
+	ctx.Data["Keyword"] = url.PathEscape(keyword)
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = language
+	ctx.Data["Language"] = url.PathEscape(language)
 
 	page := ctx.FormInt("page")
 	if page <= 0 {
diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go
index 3c0fa4bc00ea..e9a8520f3150 100644
--- a/routers/web/repo/search.go
+++ b/routers/web/repo/search.go
@@ -5,6 +5,7 @@ package repo
 
 import (
 	"net/http"
+	"net/url"
 
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
@@ -27,9 +28,9 @@ func Search(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = keyword
-	ctx.Data["Language"] = language
-	ctx.Data["queryType"] = queryType
+	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["queryType"] = url.PathEscape(queryType)
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {
diff --git a/routers/web/user/code.go b/routers/web/user/code.go
index ee514a7cfe53..f6b85c89cd09 100644
--- a/routers/web/user/code.go
+++ b/routers/web/user/code.go
@@ -5,6 +5,7 @@ package user
 
 import (
 	"net/http"
+	"net/url"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/base"
@@ -42,9 +43,9 @@ func CodeSearch(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = keyword
-	ctx.Data["Language"] = language
-	ctx.Data["queryType"] = queryType
+	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["queryType"] = url.PathEscape(queryType)
 	ctx.Data["IsCodePage"] = true
 
 	if keyword == "" {
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 9930d58547c6..fe1a2edbd84d 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -7,6 +7,7 @@ package user
 import (
 	"fmt"
 	"net/http"
+	"net/url"
 	"path"
 	"strings"
 
@@ -137,10 +138,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 	}
 
 	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = keyword
+	ctx.Data["Keyword"] = url.PathEscape(keyword)
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = language
+	ctx.Data["Language"] = url.PathEscape(language)
 
 	followers, numFollowers, err := user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{
 		PageSize: pagingNum,
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index 46e36e918683..950a72ff516e 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -16,7 +16,7 @@
 	{{if not .TabName}}{{$tabQuery = ""}}{{end}}
 	{{$languageQuery := printf "language=%s&" .Language}}
 	{{if not .TabName}}{{$languageQuery = ""}}{{end}}
-	{{$queryParams := (printf "%s%sq=%s" $tabQuery $languageQuery .Keyword) | PathEscape}}
+	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery .Keyword}}
 	<!-- Filter -->
 	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams .SortType}}
 	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
@@ -26,7 +26,7 @@
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 			<div class="menu">
-				<a class="item" href="{{printf "%s?%s" (.Link | PathEscapeSegments) $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.clear"}}</a>
+				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.clear"}}</a>
 				<div class="divider"></div>
 				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
 				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
@@ -52,7 +52,7 @@
 		</span>
 		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 		<div class="menu">
-			{{$href := printf "%s?%s" (.Link | PathEscapeSegments) $queryParams}}
+			{{$href := printf "%s?%s" .Link $queryParams}}
 			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$href}}&sort=newest">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
 			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$href}}&sort=oldest">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
 			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$href}}&sort=alphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>

From d4291fba75dbfbf5d501414856bc0f1e8e4efb04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Mon, 26 Feb 2024 23:00:52 +0100
Subject: [PATCH 12/18] review fix

---
 routers/web/explore/code.go | 7 +++----
 routers/web/explore/repo.go | 4 ++--
 routers/web/org/home.go     | 7 +++----
 routers/web/repo/search.go  | 7 +++----
 routers/web/user/code.go    | 7 +++----
 routers/web/user/profile.go | 5 ++---
 6 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/routers/web/explore/code.go b/routers/web/explore/code.go
index 7d609bd5534b..d81884ec62de 100644
--- a/routers/web/explore/code.go
+++ b/routers/web/explore/code.go
@@ -5,7 +5,6 @@ package explore
 
 import (
 	"net/http"
-	"net/url"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/base"
@@ -38,9 +37,9 @@ func Code(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
-	ctx.Data["Language"] = url.PathEscape(language)
-	ctx.Data["queryType"] = url.PathEscape(queryType)
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Language"] = language
+	ctx.Data["queryType"] = queryType
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {
diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 0a830841b682..a0993d78d434 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -108,7 +108,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	ctx.Data["TopicOnly"] = topicOnly
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["Language"] = url.QueryEscape(language)
 
 	archived := ctx.FormOptionalBool("archived")
 	ctx.Data["IsArchived"] = archived
@@ -163,7 +163,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		return
 	}
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Keyword"] = keyword
 	ctx.Data["Total"] = count
 	ctx.Data["Repos"] = repos
 	ctx.Data["IsRepoIndexerEnabled"] = setting.Indexer.RepoIndexerEnabled
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 95f35cd963d6..c29b5ed2b360 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -5,7 +5,6 @@ package org
 
 import (
 	"net/http"
-	"net/url"
 	"path"
 	"strings"
 
@@ -48,7 +47,7 @@ func Home(ctx *context.Context) {
 	ctx.Data["Title"] = org.DisplayName()
 
 	var orderBy db.SearchOrderBy
-	ctx.Data["SortType"] = url.PathEscape(ctx.FormString("sort"))
+	ctx.Data["SortType"] = ctx.FormString("sort")
 	switch ctx.FormString("sort") {
 	case "newest":
 		orderBy = db.SearchOrderByNewest
@@ -76,10 +75,10 @@ func Home(ctx *context.Context) {
 	}
 
 	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Keyword"] = keyword
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["Language"] = language
 
 	page := ctx.FormInt("page")
 	if page <= 0 {
diff --git a/routers/web/repo/search.go b/routers/web/repo/search.go
index e9a8520f3150..3c0fa4bc00ea 100644
--- a/routers/web/repo/search.go
+++ b/routers/web/repo/search.go
@@ -5,7 +5,6 @@ package repo
 
 import (
 	"net/http"
-	"net/url"
 
 	"code.gitea.io/gitea/modules/base"
 	"code.gitea.io/gitea/modules/context"
@@ -28,9 +27,9 @@ func Search(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
-	ctx.Data["Language"] = url.PathEscape(language)
-	ctx.Data["queryType"] = url.PathEscape(queryType)
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Language"] = language
+	ctx.Data["queryType"] = queryType
 	ctx.Data["PageIsViewCode"] = true
 
 	if keyword == "" {
diff --git a/routers/web/user/code.go b/routers/web/user/code.go
index f6b85c89cd09..ee514a7cfe53 100644
--- a/routers/web/user/code.go
+++ b/routers/web/user/code.go
@@ -5,7 +5,6 @@ package user
 
 import (
 	"net/http"
-	"net/url"
 
 	repo_model "code.gitea.io/gitea/models/repo"
 	"code.gitea.io/gitea/modules/base"
@@ -43,9 +42,9 @@ func CodeSearch(ctx *context.Context) {
 	queryType := ctx.FormTrim("t")
 	isMatch := queryType == "match"
 
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
-	ctx.Data["Language"] = url.PathEscape(language)
-	ctx.Data["queryType"] = url.PathEscape(queryType)
+	ctx.Data["Keyword"] = keyword
+	ctx.Data["Language"] = language
+	ctx.Data["queryType"] = queryType
 	ctx.Data["IsCodePage"] = true
 
 	if keyword == "" {
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 942c9aa88a12..f90d70927c58 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -7,7 +7,6 @@ package user
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 	"path"
 	"strings"
 
@@ -138,10 +137,10 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 	}
 
 	keyword := ctx.FormTrim("q")
-	ctx.Data["Keyword"] = url.PathEscape(keyword)
+	ctx.Data["Keyword"] = keyword
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.PathEscape(language)
+	ctx.Data["Language"] = language
 
 	followers, numFollowers, err := user_model.GetUserFollowers(ctx, ctx.ContextUser, ctx.Doer, db.ListOptions{
 		PageSize: pagingNum,

From ae846c1dabc47b0fd2a658aa06a44e3a1ac0b06a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Tue, 27 Feb 2024 08:03:01 +0100
Subject: [PATCH 13/18] correct escaping

---
 routers/web/explore/repo.go       |  3 +--
 templates/shared/repo_search.tmpl | 12 ++++++------
 2 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index a0993d78d434..58afe1caf5ce 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -6,7 +6,6 @@ package explore
 import (
 	"fmt"
 	"net/http"
-	"net/url"
 
 	"code.gitea.io/gitea/models/db"
 	repo_model "code.gitea.io/gitea/models/repo"
@@ -108,7 +107,7 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 	ctx.Data["TopicOnly"] = topicOnly
 
 	language := ctx.FormTrim("language")
-	ctx.Data["Language"] = url.QueryEscape(language)
+	ctx.Data["Language"] = language
 
 	archived := ctx.FormOptionalBool("archived")
 	ctx.Data["IsArchived"] = archived
diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index e2b173fa5178..088794834b63 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -12,13 +12,13 @@
 			<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
 		</div>
 	</form>
-	{{$tabQuery := printf "tab=%s&" .TabName}}
-	{{if not .TabName}}{{$tabQuery = ""}}{{end}}
-	{{$languageQuery := printf "language=%s&" .Language}}
-	{{if not .TabName}}{{$languageQuery = ""}}{{end}}
-	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery .Keyword}}
+	{{$tabQuery := ""}}
+	{{if .TabName}}{{$tabQuery = printf "tab=%s&" (QueryEscape .TabName)}}{{end}}
+	{{$languageQuery := ""}}
+	{{if .TabName}}{{$languageQuery = printf "language=%s&" (QueryEscape .Language)}}{{end}}
+	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery (QueryEscape .Keyword)}}
 	<!-- Filter -->
-	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams .SortType}}
+	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams (QueryEscape .SortType)}}
 	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
 		<div class="ui dropdown type jump item gt-mr-0">
 			<span class="text">

From 666206591ecc31d4c508cce0ebc689fa21a18c9f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tim-Niclas=20Oelschl=C3=A4ger?=
 <zokki.softwareschmiede@gmail.com>
Date: Wed, 28 Feb 2024 00:41:59 +0100
Subject: [PATCH 14/18] use form for search instead of printf

---
 templates/shared/repo_search.tmpl  | 68 +++++++++++++-----------------
 web_src/js/features/repo-search.js | 27 +++++++-----
 2 files changed, 47 insertions(+), 48 deletions(-)

diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index 088794834b63..d1c320c2da58 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -1,8 +1,7 @@
-<div class="ui secondary filter menu gt-ac gt-mx-0">
-	<form class="ui form ignore-dirty gt-f1">
-		<input type="hidden" name="sort" value="{{$.SortType}}">
-		<input type="hidden" name="language" value="{{$.Language}}">
-		<div class="ui fluid action input">
+<div class="ui secondary filter menu">
+	<form id="repo-search-form" class="ui form ignore-dirty tw-flex-1 tw-flex tw-flex-row tw-gap-x-2">
+		{{if .Language}}<input hidden name="language" value="{{.Language}}">{{end}}
+		<div class="ui fluid action input tw-flex-1">
 			{{template "shared/searchinput" dict "Value" .Keyword}}
 			{{if .PageIsExploreRepositories}}
 				<input type="hidden" name="only_show_relevant" value="{{.OnlyShowRelevant}}">
@@ -11,22 +10,14 @@
 			{{end}}
 			<button class="ui primary button">{{ctx.Locale.Tr "explore.search"}}</button>
 		</div>
-	</form>
-	{{$tabQuery := ""}}
-	{{if .TabName}}{{$tabQuery = printf "tab=%s&" (QueryEscape .TabName)}}{{end}}
-	{{$languageQuery := ""}}
-	{{if .TabName}}{{$languageQuery = printf "language=%s&" (QueryEscape .Language)}}{{end}}
-	{{$queryParams := printf "%s%sq=%s" $tabQuery $languageQuery (QueryEscape .Keyword)}}
-	<!-- Filter -->
-	{{$queryParamsWithSort := printf "%s&sort=%s" $queryParams (QueryEscape .SortType)}}
-	<form class="ui form ignore-dirty" id="repo-search-form" data-query-params="{{$queryParamsWithSort}}">
-		<div class="ui dropdown type jump item gt-mr-0">
+		<!-- Filter -->
+		<div class="ui dropdown type jump item tw-mr-0">
 			<span class="text">
 				{{ctx.Locale.Tr "filter"}}
 			</span>
 			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
 			<div class="menu">
-				<a class="item" href="{{printf "%s?%s" .Link $queryParamsWithSort}}">{{ctx.Locale.Tr "filter.clear"}}</a>
+				<label class="item"><input type="radio" name="clear-filter"> {{ctx.Locale.Tr "filter.clear"}}</label>
 				<div class="divider"></div>
 				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
 				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
@@ -44,29 +35,30 @@
 				<label class="item"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
 			</div>
 		</div>
-	</form>
-	<!-- Sort -->
-	<div class="ui dropdown type jump item gt-mr-0">
-		<span class="text">
-			{{ctx.Locale.Tr "repo.issues.filter_sort"}}
-		</span>
-		{{svg "octicon-triangle-down" 14 "dropdown icon"}}
-		<div class="menu">
-			{{$href := printf "%s?%s" .Link $queryParams}}
-			<a class="{{if eq .SortType "newest"}}active {{end}}item" href="{{$href}}&sort=newest">{{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</a>
-			<a class="{{if eq .SortType "oldest"}}active {{end}}item" href="{{$href}}&sort=oldest">{{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</a>
-			<a class="{{if eq .SortType "alphabetically"}}active {{end}}item" href="{{$href}}&sort=alphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</a>
-			<a class="{{if eq .SortType "reversealphabetically"}}active {{end}}item" href="{{$href}}&sort=reversealphabetically">{{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</a>
-			<a class="{{if eq .SortType "recentupdate"}}active {{end}}item" href="{{$href}}&sort=recentupdate">{{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</a>
-			<a class="{{if eq .SortType "leastupdate"}}active {{end}}item" href="{{$href}}&sort=leastupdate">{{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</a>
-			{{if not .DisableStars}}
-				<a class="{{if eq .SortType "moststars"}}active {{end}}item" href="{{$href}}&sort=moststars">{{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</a>
-				<a class="{{if eq .SortType "feweststars"}}active {{end}}item" href="{{$href}}&sort=feweststars">{{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</a>
-			{{end}}
-			<a class="{{if eq .SortType "mostforks"}}active {{end}}item" href="{{$href}}&sort=mostforks">{{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</a>
-			<a class="{{if eq .SortType "fewestforks"}}active {{end}}item" href="{{$href}}&sort=fewestforks">{{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</a>
+		<!-- Sort -->
+		<div class="ui dropdown type jump item gt-mr-0">
+			<span class="text">
+				{{ctx.Locale.Tr "repo.issues.filter_sort"}}
+			</span>
+			{{svg "octicon-triangle-down" 14 "dropdown icon"}}
+			<div class="menu">
+				<label class="{{if eq .SortType "newest"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "newest"}}checked{{end}} value="newest"> {{ctx.Locale.Tr "repo.issues.filter_sort.latest"}}</label>
+				<label class="{{if eq .SortType "oldest"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "oldest"}}checked{{end}} value="oldest"> {{ctx.Locale.Tr "repo.issues.filter_sort.oldest"}}</label>
+				<label class="{{if eq .SortType "alphabetically"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "alphabetically"}}checked{{end}} value="alphabetically"> {{ctx.Locale.Tr "repo.issues.label.filter_sort.alphabetically"}}</label>
+				<label class="{{if eq .SortType "reversealphabetically"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "reversealphabetically"}}checked{{end}} value="reversealphabetically"> {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_alphabetically"}}</label>
+				<label class="{{if eq .SortType "recentupdate"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "recentupdate"}}checked{{end}} value="recentupdate"> {{ctx.Locale.Tr "repo.issues.filter_sort.recentupdate"}}</label>
+				<label class="{{if eq .SortType "leastupdate"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "leastupdate"}}checked{{end}} value="leastupdate"> {{ctx.Locale.Tr "repo.issues.filter_sort.leastupdate"}}</label>
+				{{if not .DisableStars}}
+					<label class="{{if eq .SortType "moststars"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "moststars"}}checked{{end}} value="moststars"> {{ctx.Locale.Tr "repo.issues.filter_sort.moststars"}}</label>
+					<label class="{{if eq .SortType "feweststars"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "feweststars"}}checked{{end}} value="feweststars"> {{ctx.Locale.Tr "repo.issues.filter_sort.feweststars"}}</label>
+				{{end}}
+				<label class="{{if eq .SortType "mostforks"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "mostforks"}}checked{{end}} value="mostforks"> {{ctx.Locale.Tr "repo.issues.filter_sort.mostforks"}}</label>
+				<label class="{{if eq .SortType "fewestforks"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "fewestforks"}}checked{{end}} value="fewestforks"> {{ctx.Locale.Tr "repo.issues.filter_sort.fewestforks"}}</label>
+				<label class="{{if eq .SortType "size"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "size"}}checked{{end}} value="size"> {{ctx.Locale.Tr "repo.issues.label.filter_sort.by_size"}}</label>
+				<label class="{{if eq .SortType "reversesize"}}active {{end}}item"><input hidden type="radio" name="sort" {{if eq .SortType "reversesize"}}checked{{end}} value="reversesize"> {{ctx.Locale.Tr "repo.issues.label.filter_sort.reverse_by_size"}}</label>
+			</div>
 		</div>
-	</div>
+	</form>
 </div>
 {{if and .PageIsExploreRepositories .OnlyShowRelevant}}
 	<div class="ui message explore-relevancy-note">
diff --git a/web_src/js/features/repo-search.js b/web_src/js/features/repo-search.js
index db297eab13c5..185f6119d9de 100644
--- a/web_src/js/features/repo-search.js
+++ b/web_src/js/features/repo-search.js
@@ -2,14 +2,21 @@ export function initRepositorySearch() {
   const repositorySearchForm = document.querySelector('#repo-search-form');
   if (!repositorySearchForm) return;
 
-  for (const radio of repositorySearchForm.querySelectorAll('input[type=radio]')) {
-    radio.addEventListener('click', (e) => {
-      e.preventDefault();
-
-      const formData = new FormData(repositorySearchForm);
-      const params = new URLSearchParams(formData);
-      const otherQueryParams = repositorySearchForm.getAttribute('data-query-params');
-      window.location.search = `${otherQueryParams}&${params.toString()}`;
-    });
-  }
+  repositorySearchForm.addEventListener('change', (e) => {
+    e.preventDefault();
+
+    const formData = new FormData(repositorySearchForm);
+    const params = new URLSearchParams(formData);
+
+    if (e.target.name === 'clear-filter') {
+      params.delete('archived');
+      params.delete('fork');
+      params.delete('mirror');
+      params.delete('template');
+      params.delete('private');
+    }
+
+    params.delete('clear-filter');
+    window.location.search = params.toString();
+  });
 }

From 618c63f36ff00254e5cac4e557bd307976c8fb1d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 28 Feb 2024 10:04:00 +0100
Subject: [PATCH 15/18] convert as repo_model.SearchRepoOptions should be
 addressed seperatly

---
 routers/web/explore/repo.go      | 11 ++++++-----
 routers/web/org/home.go          | 10 +++++-----
 routers/web/user/notification.go | 10 +++++-----
 routers/web/user/profile.go      | 30 +++++++++++++++---------------
 4 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index cf7381512bd2..19f8cbd9a6b0 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -13,6 +13,7 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/sitemap"
+	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/context"
 )
 
@@ -140,11 +141,11 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
 		OnlyShowRelevant:   opts.OnlyShowRelevant,
-		Archived:           archived,
-		Fork:               fork,
-		Mirror:             mirror,
-		Template:           template,
-		IsPrivate:          private,
+		Archived:           util.OptionalBoolFromGeneric(archived),
+		Fork:               util.OptionalBoolFromGeneric(fork),
+		Mirror:             util.OptionalBoolFromGeneric(mirror),
+		Template:           util.OptionalBoolFromGeneric(template),
+		IsPrivate:          util.OptionalBoolFromGeneric(private),
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index 71d10f3a434e..de73ae1db79c 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -117,11 +117,11 @@ func Home(ctx *context.Context) {
 		Actor:              ctx.Doer,
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
-		Archived:           archived,
-		Fork:               fork,
-		Mirror:             mirror,
-		Template:           template,
-		IsPrivate:          private,
+		Archived:           util.OptionalBoolFromGeneric(archived),
+		Fork:               util.OptionalBoolFromGeneric(fork),
+		Mirror:             util.OptionalBoolFromGeneric(mirror),
+		Template:           util.OptionalBoolFromGeneric(template),
+		IsPrivate:          util.OptionalBoolFromGeneric(private),
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
index ca063630fa01..e8b9496b09c5 100644
--- a/routers/web/user/notification.go
+++ b/routers/web/user/notification.go
@@ -417,11 +417,11 @@ func NotificationWatching(ctx *context.Context) {
 		Collaborate:        util.OptionalBoolFalse,
 		TopicOnly:          ctx.FormBool("topic"),
 		IncludeDescription: setting.UI.SearchRepoDescription,
-		Archived:           archived,
-		Fork:               fork,
-		Mirror:             mirror,
-		Template:           template,
-		IsPrivate:          private,
+		Archived:           util.OptionalBoolFromGeneric(archived),
+		Fork:               util.OptionalBoolFromGeneric(fork),
+		Mirror:             util.OptionalBoolFromGeneric(mirror),
+		Template:           util.OptionalBoolFromGeneric(template),
+		IsPrivate:          util.OptionalBoolFromGeneric(private),
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 53a20e692375..57b477446174 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -222,11 +222,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
-			Archived:           archived,
-			Fork:               fork,
-			Mirror:             mirror,
-			Template:           template,
-			IsPrivate:          private,
+			Archived:           util.OptionalBoolFromGeneric(archived),
+			Fork:               util.OptionalBoolFromGeneric(fork),
+			Mirror:             util.OptionalBoolFromGeneric(mirror),
+			Template:           util.OptionalBoolFromGeneric(template),
+			IsPrivate:          util.OptionalBoolFromGeneric(private),
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
@@ -249,11 +249,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
-			Archived:           archived,
-			Fork:               fork,
-			Mirror:             mirror,
-			Template:           template,
-			IsPrivate:          private,
+			Archived:           util.OptionalBoolFromGeneric(archived),
+			Fork:               util.OptionalBoolFromGeneric(fork),
+			Mirror:             util.OptionalBoolFromGeneric(mirror),
+			Template:           util.OptionalBoolFromGeneric(template),
+			IsPrivate:          util.OptionalBoolFromGeneric(private),
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
@@ -299,11 +299,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
-			Archived:           archived,
-			Fork:               fork,
-			Mirror:             mirror,
-			Template:           template,
-			IsPrivate:          private,
+			Archived:           util.OptionalBoolFromGeneric(archived),
+			Fork:               util.OptionalBoolFromGeneric(fork),
+			Mirror:             util.OptionalBoolFromGeneric(mirror),
+			Template:           util.OptionalBoolFromGeneric(template),
+			IsPrivate:          util.OptionalBoolFromGeneric(private),
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)

From e0fd3981aaba462dc929916b39e0477dd4181e4b Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Wed, 28 Feb 2024 10:19:55 +0100
Subject: [PATCH 16/18] adjust template

---
 templates/shared/repo_search.tmpl | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index d1c320c2da58..7755c5892d8d 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -19,20 +19,20 @@
 			<div class="menu">
 				<label class="item"><input type="radio" name="clear-filter"> {{ctx.Locale.Tr "filter.clear"}}</label>
 				<div class="divider"></div>
-				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
-				<label class="item"><input type="radio" name="archived" {{if .IsArchived.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
+				<label class="item"><input type="radio" name="archived" {{if .IsArchived.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_archived"}}</label>
+				<label class="item"><input type="radio" name="archived" {{if (not (.IsArchived.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_archived"}}</label>
 				<div class="divider"></div>
-				<label class="item"><input type="radio" name="fork" {{if .IsFork.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_fork"}}</label>
-				<label class="item"><input type="radio" name="fork" {{if .IsFork.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_fork"}}</label>
+				<label class="item"><input type="radio" name="fork" {{if .IsFork.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_fork"}}</label>
+				<label class="item"><input type="radio" name="fork" {{if (not (.IsFork.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_fork"}}</label>
 				<div class="divider"></div>
-				<label class="item"><input type="radio" name="mirror" {{if .IsMirror.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_mirror"}}</label>
-				<label class="item"><input type="radio" name="mirror" {{if .IsMirror.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_mirror"}}</label>
+				<label class="item"><input type="radio" name="mirror" {{if .IsMirror.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_mirror"}}</label>
+				<label class="item"><input type="radio" name="mirror" {{if (not (.IsMirror.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_mirror"}}</label>
 				<div class="divider"></div>
-				<label class="item"><input type="radio" name="template" {{if .IsTemplate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_template"}}</label>
-				<label class="item"><input type="radio" name="template" {{if .IsTemplate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_template"}}</label>
+				<label class="item"><input type="radio" name="template" {{if .IsTemplate.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_template"}}</label>
+				<label class="item"><input type="radio" name="template" {{if (not (.IsTemplate.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_template"}}</label>
 				<div class="divider"></div>
-				<label class="item"><input type="radio" name="private" {{if .IsPrivate.IsFalse}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
-				<label class="item"><input type="radio" name="private" {{if .IsPrivate.IsTrue}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
+				<label class="item"><input type="radio" name="private" {{if (not (.IsPrivate.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
+				<label class="item"><input type="radio" name="private" {{if .IsPrivate.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
 			</div>
 		</div>
 		<!-- Sort -->

From 9a553c17f9a3531bc7a887a94cc13c9f106b93e1 Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 3 Mar 2024 04:52:19 +0100
Subject: [PATCH 17/18] switch to follow order above

---
 templates/shared/repo_search.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/shared/repo_search.tmpl b/templates/shared/repo_search.tmpl
index 7755c5892d8d..2ea4bfaad79e 100644
--- a/templates/shared/repo_search.tmpl
+++ b/templates/shared/repo_search.tmpl
@@ -31,8 +31,8 @@
 				<label class="item"><input type="radio" name="template" {{if .IsTemplate.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.is_template"}}</label>
 				<label class="item"><input type="radio" name="template" {{if (not (.IsTemplate.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.not_template"}}</label>
 				<div class="divider"></div>
-				<label class="item"><input type="radio" name="private" {{if (not (.IsPrivate.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
 				<label class="item"><input type="radio" name="private" {{if .IsPrivate.Value}}checked{{end}} value="1"> {{ctx.Locale.Tr "filter.private"}}</label>
+				<label class="item"><input type="radio" name="private" {{if (not (.IsPrivate.ValueOrDefault true))}}checked{{end}} value="0"> {{ctx.Locale.Tr "filter.public"}}</label>
 			</div>
 		</div>
 		<!-- Sort -->

From 6acd87dd24c38c7cb9b48bdbdb3faabc001fba1d Mon Sep 17 00:00:00 2001
From: 6543 <6543@obermui.de>
Date: Sun, 3 Mar 2024 04:55:56 +0100
Subject: [PATCH 18/18] adjust to latest refactors

---
 routers/web/explore/repo.go      | 11 +++++------
 routers/web/org/home.go          | 10 +++++-----
 routers/web/user/notification.go | 10 +++++-----
 routers/web/user/profile.go      | 30 +++++++++++++++---------------
 4 files changed, 30 insertions(+), 31 deletions(-)

diff --git a/routers/web/explore/repo.go b/routers/web/explore/repo.go
index 19f8cbd9a6b0..cf7381512bd2 100644
--- a/routers/web/explore/repo.go
+++ b/routers/web/explore/repo.go
@@ -13,7 +13,6 @@ import (
 	"code.gitea.io/gitea/modules/log"
 	"code.gitea.io/gitea/modules/setting"
 	"code.gitea.io/gitea/modules/sitemap"
-	"code.gitea.io/gitea/modules/util"
 	"code.gitea.io/gitea/services/context"
 )
 
@@ -141,11 +140,11 @@ func RenderRepoSearch(ctx *context.Context, opts *RepoSearchOptions) {
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
 		OnlyShowRelevant:   opts.OnlyShowRelevant,
-		Archived:           util.OptionalBoolFromGeneric(archived),
-		Fork:               util.OptionalBoolFromGeneric(fork),
-		Mirror:             util.OptionalBoolFromGeneric(mirror),
-		Template:           util.OptionalBoolFromGeneric(template),
-		IsPrivate:          util.OptionalBoolFromGeneric(private),
+		Archived:           archived,
+		Fork:               fork,
+		Mirror:             mirror,
+		Template:           template,
+		IsPrivate:          private,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/org/home.go b/routers/web/org/home.go
index de73ae1db79c..71d10f3a434e 100644
--- a/routers/web/org/home.go
+++ b/routers/web/org/home.go
@@ -117,11 +117,11 @@ func Home(ctx *context.Context) {
 		Actor:              ctx.Doer,
 		Language:           language,
 		IncludeDescription: setting.UI.SearchRepoDescription,
-		Archived:           util.OptionalBoolFromGeneric(archived),
-		Fork:               util.OptionalBoolFromGeneric(fork),
-		Mirror:             util.OptionalBoolFromGeneric(mirror),
-		Template:           util.OptionalBoolFromGeneric(template),
-		IsPrivate:          util.OptionalBoolFromGeneric(private),
+		Archived:           archived,
+		Fork:               fork,
+		Mirror:             mirror,
+		Template:           template,
+		IsPrivate:          private,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/user/notification.go b/routers/web/user/notification.go
index e0f078cf2f73..324205ed9102 100644
--- a/routers/web/user/notification.go
+++ b/routers/web/user/notification.go
@@ -417,11 +417,11 @@ func NotificationWatching(ctx *context.Context) {
 		Collaborate:        optional.Some(false),
 		TopicOnly:          ctx.FormBool("topic"),
 		IncludeDescription: setting.UI.SearchRepoDescription,
-		Archived:           util.OptionalBoolFromGeneric(archived),
-		Fork:               util.OptionalBoolFromGeneric(fork),
-		Mirror:             util.OptionalBoolFromGeneric(mirror),
-		Template:           util.OptionalBoolFromGeneric(template),
-		IsPrivate:          util.OptionalBoolFromGeneric(private),
+		Archived:           archived,
+		Fork:               fork,
+		Mirror:             mirror,
+		Template:           template,
+		IsPrivate:          private,
 	})
 	if err != nil {
 		ctx.ServerError("SearchRepository", err)
diff --git a/routers/web/user/profile.go b/routers/web/user/profile.go
index 2da871f2598a..833312c50102 100644
--- a/routers/web/user/profile.go
+++ b/routers/web/user/profile.go
@@ -223,11 +223,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
-			Archived:           util.OptionalBoolFromGeneric(archived),
-			Fork:               util.OptionalBoolFromGeneric(fork),
-			Mirror:             util.OptionalBoolFromGeneric(mirror),
-			Template:           util.OptionalBoolFromGeneric(template),
-			IsPrivate:          util.OptionalBoolFromGeneric(private),
+			Archived:           archived,
+			Fork:               fork,
+			Mirror:             mirror,
+			Template:           template,
+			IsPrivate:          private,
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
@@ -250,11 +250,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
-			Archived:           util.OptionalBoolFromGeneric(archived),
-			Fork:               util.OptionalBoolFromGeneric(fork),
-			Mirror:             util.OptionalBoolFromGeneric(mirror),
-			Template:           util.OptionalBoolFromGeneric(template),
-			IsPrivate:          util.OptionalBoolFromGeneric(private),
+			Archived:           archived,
+			Fork:               fork,
+			Mirror:             mirror,
+			Template:           template,
+			IsPrivate:          private,
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)
@@ -300,11 +300,11 @@ func prepareUserProfileTabData(ctx *context.Context, showPrivate bool, profileDb
 			TopicOnly:          topicOnly,
 			Language:           language,
 			IncludeDescription: setting.UI.SearchRepoDescription,
-			Archived:           util.OptionalBoolFromGeneric(archived),
-			Fork:               util.OptionalBoolFromGeneric(fork),
-			Mirror:             util.OptionalBoolFromGeneric(mirror),
-			Template:           util.OptionalBoolFromGeneric(template),
-			IsPrivate:          util.OptionalBoolFromGeneric(private),
+			Archived:           archived,
+			Fork:               fork,
+			Mirror:             mirror,
+			Template:           template,
+			IsPrivate:          private,
 		})
 		if err != nil {
 			ctx.ServerError("SearchRepository", err)