diff --git a/src/affiliates.js b/src/affiliates.js index 386306a..757e09d 100644 --- a/src/affiliates.js +++ b/src/affiliates.js @@ -6,7 +6,7 @@ function getWatchUrl(scene) { return new URL(scene.url).href; } - if (scene.channel && (scene.channel.isIndependent || scene.channel.type === 'network')) { + if (scene.channel && (scene.channel.isIndependent || scene.channel.type === 'network' || !scene.network)) { return new URL(scene.channel.url).href; } diff --git a/src/scenes.js b/src/scenes.js index 5b67967..a483f81 100644 --- a/src/scenes.js +++ b/src/scenes.js @@ -45,6 +45,7 @@ function curateScene(rawScene, assets, reqUser, context) { slug: assets.channel.slug, name: censor(assets.channel.name, context.restriction), type: assets.channel.type, + url: assets.channel.url, isIndependent: assets.channel.independent, hasLogo: assets.channel.has_logo, }, @@ -52,6 +53,7 @@ function curateScene(rawScene, assets, reqUser, context) { id: assets.channel.network_id, slug: assets.channel.network_slug, name: censor(assets.channel.network_name, context.restriction), + url: assets.network_url, type: assets.channel.network_type, hasLogo: assets.channel.network_has_logo, } : null, @@ -179,6 +181,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) { 'networks.slug as network_slug', 'networks.name as network_name', 'networks.type as network_type', + 'networks.url as network_url', 'networks.has_logo as network_has_logo', knex.raw('row_to_json(affiliates) as affiliate'), ) diff --git a/static b/static index d9fd99c..cc66e52 160000 --- a/static +++ b/static @@ -1 +1 @@ -Subproject commit d9fd99c5040e19058351f51e3ace3895c66666f6 +Subproject commit cc66e52e24735014c502ff5bccb3c173c7e69cb8