Compare commits

..

2 Commits

Author SHA1 Message Date
DebaucheryLibrarian e28904b791 0.42.18 2026-01-22 03:48:54 +01:00
DebaucheryLibrarian ad7f1ce1fa Using new object affiliate parameters. 2026-01-22 03:48:53 +01:00
4 changed files with 10 additions and 8 deletions

4
package-lock.json generated
View File

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

View File

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

View File

@ -46,16 +46,18 @@ function getAffiliateUrl(scene) {
return watchUrl; return watchUrl;
} }
if (scene.affiliate.url?.includes('/track') && (!scene.channel.isIndependent || scene.channel.id === scene.affiliate.entityId)) { // standard NATS redirect if (scene.affiliate.url?.includes('/track')
&& scene.affiliate.parameters.scene !== false
&& (!scene.channel.isIndependent || scene.channel.id === scene.affiliate.entityId)) { // standard NATS redirect
const { pathname, search } = new URL(watchUrl); const { pathname, search } = new URL(watchUrl);
return `${scene.affiliate.url}${pathname.replace(/^\/trial/, '')}${search}`; // replace needed for Jules Jordan, verify behavior on other sites return `${scene.affiliate.url}${pathname.replace(/^\/trial/, '')}${search}`; // replace needed for Jules Jordan, verify behavior on other sites
} }
if (scene.affiliate.parameters) { // used by e.g. Bang if (scene.affiliate.parameters.query) { // used by e.g. Bang
const newParams = new URLSearchParams({ const newParams = new URLSearchParams({
...Object.fromEntries(new URL(watchUrl).searchParams), ...Object.fromEntries(new URL(watchUrl).searchParams),
...Object.fromEntries(new URLSearchParams(scene.affiliate.parameters)), ...Object.fromEntries(new URLSearchParams(scene.affiliate.parameters.query)),
}); });
return `${watchUrl}?${newParams.toString()}`; return `${watchUrl}?${newParams.toString()}`;
@ -107,7 +109,7 @@ function curateScene(rawScene, assets) {
affiliate: assets.channel.affiliate ? { affiliate: assets.channel.affiliate ? {
id: assets.channel.affiliate.id, id: assets.channel.affiliate.id,
url: assets.channel.affiliate.url, url: assets.channel.affiliate.url,
parameters: assets.channel.affiliate.parameters, parameters: assets.channel.affiliate.parameters || {},
entityId: assets.channel.affiliate.entity_id, entityId: assets.channel.affiliate.entity_id,
} : null, } : null,
actors: sortActorsByGender(assets.actors.map((actor) => curateActor(actor, { actors: sortActorsByGender(assets.actors.map((actor) => curateActor(actor, {

2
static

@ -1 +1 @@
Subproject commit 2d30a16b0752c38ab5079b6c4690eaf149dde7c2 Subproject commit 323fb4c9220637d48a1f7516bbfbfafdfdb45ccc