From dd111a6c3bba1cbd119915936cd05479c5e14b1c Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Wed, 1 May 2024 03:57:12 +0200
Subject: [PATCH] Fixed stash heart not highlighted in search results.

---
 pages/entities/+Page.vue        | 52 +++++++++++++++++++++++++++++++--
 pages/scene/+Page.vue           |  2 +-
 pages/search/+onBeforeRender.js |  2 +-
 src/entities.js                 |  8 +++++
 src/web/server.js               |  4 +++
 5 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/pages/entities/+Page.vue b/pages/entities/+Page.vue
index b2f9548..92449a3 100644
--- a/pages/entities/+Page.vue
+++ b/pages/entities/+Page.vue
@@ -1,5 +1,22 @@
 <template>
 	<div class="page">
+		<form
+			class="search-container"
+			@submit.prevent="search"
+		>
+			<input
+				v-model="query"
+				type="search"
+				placeholder="Search channel"
+				class="search input"
+			>
+
+			<Icon
+				icon="search"
+				@click="search"
+			/>
+		</form>
+
 		<div
 			v-for="(section, index) in sections"
 			:key="`section-${index}`"
@@ -32,7 +49,10 @@
 </template>
 
 <script setup>
-import { inject } from 'vue';
+import { ref, inject } from 'vue';
+
+import { get } from '#/src/api.js';
+import navigate from '#/src/navigate.js';
 
 const pageContext = inject('pageContext');
 
@@ -84,14 +104,42 @@ const sections = [
 		networks,
 	},
 ];
+
+const query = ref(pageContext.urlParsed.search.q || null);
+
+async function search() {
+	await get('/entities', { query: query.value });
+	navigate('/channels', { q: query.value });
+}
 </script>
 
 <style scoped>
+.search-container {
+	display: flex;
+	align-items: stretch;
+	padding: 1rem 1rem 0 1rem;
+
+	.icon {
+		padding: 0 1rem;
+		height: auto;
+		fill: var(--shadow);
+
+		&:hover {
+			cursor: pointer;
+			fill: var(--primary);
+		}
+	}
+}
+
+.search {
+	font-size: 1.1rem;
+}
+
 .networks {
 	display: grid;
 	grid-template-columns: repeat(auto-fit, minmax(15rem, 1fr));
 	gap: .5rem;
-	padding: .5rem;
+	padding: .5rem 1rem;
 }
 
 .section-label {
diff --git a/pages/scene/+Page.vue b/pages/scene/+Page.vue
index 167c6ec..ff22e64 100644
--- a/pages/scene/+Page.vue
+++ b/pages/scene/+Page.vue
@@ -79,7 +79,7 @@
 					>
 						by
 						<Link
-							:href="`/${scene.network.type}/thumbs/${scene.network.slug}`"
+							:href="`/${scene.network.type}/${scene.network.slug}`"
 							class="network-link entity-link"
 						>
 							<img
diff --git a/pages/search/+onBeforeRender.js b/pages/search/+onBeforeRender.js
index 6324eb1..95120af 100644
--- a/pages/search/+onBeforeRender.js
+++ b/pages/search/+onBeforeRender.js
@@ -10,7 +10,7 @@ export async function onBeforeRender(pageContext) {
 	}), {
 		page: Number(pageContext.routeParams.page) || 1,
 		limit: Number(pageContext.urlParsed.search.limit) || 30,
-	});
+	}, pageContext.user);
 
 	const {
 		scenes,
diff --git a/src/entities.js b/src/entities.js
index 70b6d1b..bd7039b 100644
--- a/src/entities.js
+++ b/src/entities.js
@@ -26,6 +26,14 @@ export function curateEntity(entity, context) {
 export async function fetchEntities(options) {
 	const entities = await knex('entities')
 		.modify((builder) => {
+			if (options.query) {
+				builder.where((whereBuilder) => {
+					whereBuilder
+						.whereLike('name', options.query)
+						.orWhereLike('slug', options.query);
+				});
+			}
+
 			if (options.type === 'primary') {
 				builder
 					.where('type', 'network')
diff --git a/src/web/server.js b/src/web/server.js
index 8ea267e..a747509 100644
--- a/src/web/server.js
+++ b/src/web/server.js
@@ -17,6 +17,7 @@ import errorHandler from './error.js';
 import { fetchScenesApi } from './scenes.js';
 import { fetchActorsApi } from './actors.js';
 import { fetchMoviesApi } from './movies.js';
+import { fetchEntitiesApi } from './entities.js';
 
 import {
 	setUserApi,
@@ -139,6 +140,9 @@ export default async function initServer() {
 	// MOVIES
 	router.get('/api/movies', fetchMoviesApi);
 
+	// ENTITIES
+	router.get('/api/entities', fetchEntitiesApi);
+
 	router.get('*', async (req, res, next) => {
 		const pageContextInit = {
 			urlOriginal: req.originalUrl,