package-lock.json

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

package.json

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

src/affiliates.js

@@ -25,16 +25,12 @@ export function getAffiliateSceneUrl(scene) {
 		return watchUrl;
 	}
 
-	const affiliateUrl = scene.affiliate.parameters.replace?.hostname === new URL(watchUrl).hostname
-		? scene.affiliate.parameters.replace.url
-		: scene.affiliate.url;
-
-	if (affiliateUrl?.includes('/track')
+	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);
 
-		return `${affiliateUrl}${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.query) { // used by e.g. Bang
@@ -54,28 +50,23 @@ export function getAffiliateEntityUrl(entity) {
 		return entity.url;
 	}
 
-	const affiliateUrl = entity.affiliate.parameters.replace?.hostname === new URL(entity.url).hostname
-		? entity.affiliate.parameters.replace.url
-		: entity.affiliate.url;
-
 	if (entity.id === entity.affiliate.entityId) {
-		return affiliateUrl;
+		return entity.affiliate.url;
 	}
 
 	if (entity.type === 'network' || entity.isIndependent) {
 		return entity.url;
 	}
 
-	// channel has its own domain
-	if (new URL(entity.url).pathname === '/') {
+	if (new URL(entity.url).hostname !== new URL(entity.affiliate.url).hostname) {
 		return entity.url;
 	}
 
-	if (affiliateUrl?.includes('/track')
+	if (entity.affiliate.url?.includes('/track')
 		&& entity.affiliate.parameters.channel !== false) {
 		const { pathname, search } = new URL(entity.url);
 
-		return `${affiliateUrl}${pathname.replace(/^\/trial/, '')}${search}`; // replace needed for Jules Jordan, verify behavior on other sites
+		return `${entity.affiliate.url}${pathname.replace(/^\/trial/, '')}${search}`; // replace needed for Jules Jordan, verify behavior on other sites
 	}
 
 	if (entity.affiliate.parameters.query) { // used by e.g. Bang