From 774f171c5c7f6e07033fb7a3460fc8fac45501f9 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Tue, 4 Jun 2024 00:44:28 +0200
Subject: [PATCH] Showing teaser of trailer is not available on scene page.

---
 assets/consent.html      | 13 +++++++++++--
 pages/entities/+Page.vue |  4 ++--
 pages/scene/+Page.vue    |  4 ++--
 src/entities.js          | 14 ++++++++------
 4 files changed, 23 insertions(+), 12 deletions(-)
diff --git a/assets/consent.html b/assets/consent.html
index b0b0bb4..3523af7 100644
--- a/assets/consent.html
+++ b/assets/consent.html
@@ -3,10 +3,19 @@
 	<head>
 		<meta charset="UTF-8">
 
-		<meta name="viewport" content="width=device-width,height=device-height,initial-scale=1.0,interactive-widget=resizes-content" />
+		<link rel="apple-touch-icon" sizes="180x180" href="/img/favicon/apple-touch-icon.png">
+		<link rel="icon" type="image/png" sizes="32x32" href="/img/favicon/favicon-32x32.png">
+		<link rel="icon" type="image/png" sizes="16x16" href="/img/favicon/favicon-16x16.png">
+		<link rel="manifest" href="/img/favicon/site.webmanifest">
+		<link rel="mask-icon" href="/img/favicon/safari-pinned-tab.svg" color="#5bbad5">
+		<link rel="shortcut icon" href="/img/favicon/favicon.ico">
+		<meta name="msapplication-TileColor" content="#b91d47">
+		<meta name="msapplication-config" content="/img/favicon/browserconfig.xml">
 		<meta name="theme-color" content="#f65596">
 
-		<title>traxxx - consent</title>
+		<meta name="viewport" content="width=device-width,height=device-height,initial-scale=1.0,interactive-widget=resizes-content" />
+
+		<title>traxxx - Consent</title>
 		<style>
 			:root {
 				--primary: #f65596;
diff --git a/pages/entities/+Page.vue b/pages/entities/+Page.vue
index 74dc16f..2b277ac 100644
--- a/pages/entities/+Page.vue
+++ b/pages/entities/+Page.vue
@@ -36,7 +36,7 @@
 					>
 						<img
 							v-if="network.hasLogo"
-							:src="`/logos/${network.slug}/network.png`"
+							:src="network.type === 'network' || network.isIndependent || !network.parent ? `/logos/${network.slug}/network.png` : `/logos/${network.parent.slug}/${network.slug}.png`"
 							:alt="network.name"
 							class="logo"
 						>
@@ -44,7 +44,7 @@
 						<span v-else>{{ network.name }}</span>
 
 						<Icon
-							v-if="query && network.type === 'network'"
+							v-if="pageContext.urlParsed.search.q && network.type === 'network'"
 							icon="device_hub"
 						/>
 					</a>
diff --git a/pages/scene/+Page.vue b/pages/scene/+Page.vue
index b3691c2..eacd948 100644
--- a/pages/scene/+Page.vue
+++ b/pages/scene/+Page.vue
@@ -7,11 +7,11 @@
 			>
 				<div class="banner">
 					<div
-						v-if="scene.trailer"
+						v-if="scene.trailer || scene.teaser"
 						class="trailer"
 					>
 						<Player
-							:video="scene.trailer"
+							:video="scene.trailer || scene.teaser"
 							:poster="poster"
 							class="item"
 							:class="{ playing }"
diff --git a/src/entities.js b/src/entities.js
index 3a2b7fb..3e0847c 100644
--- a/src/entities.js
+++ b/src/entities.js
@@ -25,28 +25,30 @@ export function curateEntity(entity, context) {
 
 export async function fetchEntities(options) {
 	const entities = await knex('entities')
+		.select('entities.*', knex.raw('row_to_json(parents) as parent'))
 		.modify((builder) => {
 			if (options.query) {
 				builder.where((whereBuilder) => {
 					whereBuilder
-						.whereILike('name', `%${options.query}%`)
-						.orWhereILike('slug', `%${options.query}%`);
+						.whereILike('entities.name', `%${options.query}%`)
+						.orWhereILike('entities.slug', `%${options.query}%`);
 				});
 			}
 
 			if (options.type === 'primary') {
 				builder
-					.where('type', 'network')
-					.orWhere('independent', true)
-					.orWhereNull('parent_id');
+					.where('entities.type', 'network')
+					.orWhere('entities.independent', true)
+					.orWhereNull('entities.parent_id');
 
 				return;
 			}
 
 			if (options.type) {
-				builder.where('type', options.type);
+				builder.where('entities.type', options.type);
 			}
 		})
+		.leftJoin('entities as parents', 'parents.id', 'entities.parent_id')
 		.orderBy(...(options.order || ['name', 'asc']))
 		.limit(options.limit || 1000);
 
