0.42.17

package-lock.json

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

package.json

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

src/entities.js

@@ -113,7 +113,10 @@ export async function fetchEntitiesById(entityIds, options = {}, reqUser) {
 		options.includeChildren ? knex('entities')
 			.whereIn('entities.parent_id', entityIds)
 			.whereNot('type', 'info')
-			.orderBy('slug') : [],
+			.orderBy([
+				{ column: 'independent', order: 'desc' },
+				{ column: 'slug', order: 'asc' },
+			]) : [],
 		knex('entities_tags')
 			.select('entity_id', 'tags.*')
 			.leftJoin('tags', 'tags.id', 'tag_id')

src/scenes.js

@@ -46,7 +46,7 @@ function getAffiliateUrl(scene) {
 		return watchUrl;
 	}
 
-	if (scene.affiliate.url?.includes('/track')) { // standard NATS redirect
+	if (scene.affiliate.url?.includes('/track') && (!scene.channel.isIndependent || scene.channel.id === scene.affiliate.entityId)) { // standard NATS redirect
 		const { pathname, search } = new URL(watchUrl);
 
 		return `${scene.affiliate.url}${pathname.replace(/^\/trial/, '')}${search}`; // replace needed for Jules Jordan, verify behavior on other sites
@@ -108,6 +108,7 @@ function curateScene(rawScene, assets) {
 			id: assets.channel.affiliate.id,
 			url: assets.channel.affiliate.url,
 			parameters: assets.channel.affiliate.parameters,
+			entityId: assets.channel.affiliate.entity_id,
 		} : null,
 		actors: sortActorsByGender(assets.actors.map((actor) => curateActor(actor, {
 			sceneDate: rawScene.effective_date,