diff --git a/pages/scene/edit/+Page.vue b/pages/scene/edit/+Page.vue index 605be5f..1cf3383 100644 --- a/pages/scene/edit/+Page.vue +++ b/pages/scene/edit/+Page.vue @@ -262,6 +262,7 @@ const fields = computed(() => [ type: 'tags', value: scene.value.tags.toSorted((tagA, tagB) => tagA.name.localeCompare(tagB.name)), simplify: false, + note: 'Actor-specific tags should only be used where confusion is reasonable, such as group scenes in which some perform anal, and some don\'t.', }, { key: 'movies', diff --git a/src/affiliates.js b/src/affiliates.js index df8cc26..386306a 100644 --- a/src/affiliates.js +++ b/src/affiliates.js @@ -31,6 +31,10 @@ export function getAffiliateSceneUrl(scene) { return watchUrl; } + if (scene.affiliate.parameters.channelScenes === false && scene.channel && scene.affiliate.entityId !== scene.channel.id) { + return watchUrl; + } + if (scene.affiliate.parameters.dynamicScene) { const scenePath = new URL(watchUrl).pathname; @@ -65,7 +69,7 @@ export function getAffiliateSceneUrl(scene) { && (!scene.channel.isIndependent || scene.channel.id === scene.affiliate.entityId)) { const { pathname, search } = new URL(watchUrl); - return `${affiliateUrl}${pathname.replace(/^\/trial/, '')}${search}`; // replace needed for Jules Jordan, verify behavior on other sites + return `${affiliateUrl}${pathname.replace(/^\/(trial|tour)/, '')}${search}`; // replace needed for Jules Jordan and HussiePass, verify behavior on other sites } const affiliateUrlComponents = new URL(affiliateUrl); diff --git a/static b/static index a91edb8..4746856 160000 --- a/static +++ b/static @@ -1 +1 @@ -Subproject commit a91edb84a1903cdcda8b3e0212fd5bc4f987057a +Subproject commit 474685693d31c2f37da3ffc84a11aa11038b0c20