DebaucheryLibrarian
/
traxxx-web
1
1
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:edb4be379f8f36e954ec9a9fa96f91fcd74a5cfc
Branches Tags
DebaucheryLibrarian:main
..
compare: DebaucheryLibrarian:fc5a0d209cdf6f792555bf91d245beffa4c2c895
Branches Tags
DebaucheryLibrarian:main

No commits in common. "edb4be379f8f36e954ec9a9fa96f91fcd74a5cfc" and "fc5a0d209cdf6f792555bf91d245beffa4c2c895" have entirely different histories.
edb4be379f ... fc5a0d209c

4 changed files with 7 additions and 8 deletions
Show Stats Expand all files Collapse all files

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.42.15", "version": "0.42.14",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.42.15", "version": "0.42.14",
"dependencies": { "dependencies": {
"@brillout/json-serializer": "^0.5.8", "@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5", "@dicebear/collection": "^7.0.5",

2
package.json
View File

@ -87,7 +87,7 @@
"overrides": { "overrides": {
"vite": "$vite" "vite": "$vite"
}, },
"version": "0.42.15", "version": "0.42.14",
"imports": { "imports": {
"#/*": "./*.js" "#/*": "./*.js"
} }

7
src/scenes.js
View File

@ -194,14 +194,13 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
'networks.name as network_name', 'networks.name as network_name',
'networks.type as network_type', 'networks.type as network_type',
'networks.has_logo as network_has_logo', 'networks.has_logo as network_has_logo',
knex.raw('row_to_json(coalesce(channel_affiliates, network_affiliates)) as affiliate'), knex.raw('row_to_json(affiliates) as affiliate'),
) )
.whereIn('releases.id', sceneIds) .whereIn('releases.id', sceneIds)
.leftJoin('entities as channels', 'channels.id', 'releases.entity_id') .leftJoin('entities as channels', 'channels.id', 'releases.entity_id')
.leftJoin('entities as networks', 'networks.id', 'channels.parent_id') .leftJoin('entities as networks', 'networks.id', 'channels.parent_id')
.leftJoin('affiliates as channel_affiliates', 'channel_affiliates.entity_id', 'channels.id') .leftJoin('affiliates', knex.raw('affiliates.entity_id in (channels.id, networks.id)'))
.leftJoin('affiliates as network_affiliates', 'network_affiliates.entity_id', 'networks.id') .groupBy('channels.id', 'networks.id', 'affiliates.id'),
.groupBy('channels.id', 'networks.id', 'channel_affiliates.id', 'network_affiliates.id'),
studios: knex('releases') studios: knex('releases')
.whereIn('releases.id', sceneIds) .whereIn('releases.id', sceneIds)
.leftJoin('entities as studios', 'studios.id', 'releases.studio_id'), .leftJoin('entities as studios', 'studios.id', 'releases.studio_id'),

2
static

@ -1 +1 @@
Subproject commit 069fc048b6a8a00d898d2593f9375c50b45a828a Subproject commit 3df11850ec6038c0919f6eaedb83bc8312fa8e07