From 363a6b4084077183fed35373239bf3612c449666 Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <DebaucheryLibrarian@unknown.name>
Date: Tue, 20 Jan 2026 02:43:28 +0100
Subject: [PATCH] Changed affiliate query to ensure channel priority.

---
 src/scenes.js | 7 ++++---
 static        | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/scenes.js b/src/scenes.js
index 2bf3177..8fe31ed 100644
--- a/src/scenes.js
+++ b/src/scenes.js
@@ -194,13 +194,14 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
 				'networks.name as network_name',
 				'networks.type as network_type',
 				'networks.has_logo as network_has_logo',
-				knex.raw('row_to_json(affiliates) as affiliate'),
+				knex.raw('row_to_json(coalesce(channel_affiliates, network_affiliates)) as affiliate'),
 			)
 			.whereIn('releases.id', sceneIds)
 			.leftJoin('entities as channels', 'channels.id', 'releases.entity_id')
 			.leftJoin('entities as networks', 'networks.id', 'channels.parent_id')
-			.leftJoin('affiliates', knex.raw('affiliates.entity_id in (channels.id, networks.id)'))
-			.groupBy('channels.id', 'networks.id', 'affiliates.id'),
+			.leftJoin('affiliates as channel_affiliates', 'channel_affiliates.entity_id', 'channels.id')
+			.leftJoin('affiliates as network_affiliates', 'network_affiliates.entity_id', 'networks.id')
+			.groupBy('channels.id', 'networks.id', 'channel_affiliates.id', 'network_affiliates.id'),
 		studios: knex('releases')
 			.whereIn('releases.id', sceneIds)
 			.leftJoin('entities as studios', 'studios.id', 'releases.studio_id'),
diff --git a/static b/static
index 3df1185..069fc04 160000
--- a/static
+++ b/static
@@ -1 +1 @@
-Subproject commit 3df11850ec6038c0919f6eaedb83bc8312fa8e07
+Subproject commit 069fc048b6a8a00d898d2593f9375c50b45a828a