Compare commits

...

2 Commits

5 changed files with 10 additions and 5 deletions

4
package-lock.json generated
View File

@@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.47.5", "version": "0.47.6",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.47.5", "version": "0.47.6",
"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

@@ -92,7 +92,7 @@
"overrides": { "overrides": {
"vite": "$vite" "vite": "$vite"
}, },
"version": "0.47.5", "version": "0.47.6",
"imports": { "imports": {
"#/*": "./*.js" "#/*": "./*.js"
} }

View File

@@ -262,6 +262,7 @@ const fields = computed(() => [
type: 'tags', type: 'tags',
value: scene.value.tags.toSorted((tagA, tagB) => tagA.name.localeCompare(tagB.name)), value: scene.value.tags.toSorted((tagA, tagB) => tagA.name.localeCompare(tagB.name)),
simplify: false, 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', key: 'movies',

View File

@@ -31,6 +31,10 @@ export function getAffiliateSceneUrl(scene) {
return watchUrl; return watchUrl;
} }
if (scene.affiliate.parameters.channelScenes === false && scene.channel && scene.affiliate.entityId !== scene.channel.id) {
return watchUrl;
}
if (scene.affiliate.parameters.dynamicScene) { if (scene.affiliate.parameters.dynamicScene) {
const scenePath = new URL(watchUrl).pathname; const scenePath = new URL(watchUrl).pathname;
@@ -65,7 +69,7 @@ export function getAffiliateSceneUrl(scene) {
&& (!scene.channel.isIndependent || scene.channel.id === scene.affiliate.entityId)) { && (!scene.channel.isIndependent || scene.channel.id === scene.affiliate.entityId)) {
const { pathname, search } = new URL(watchUrl); 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); const affiliateUrlComponents = new URL(affiliateUrl);

2
static

Submodule static updated: a91edb84a1...474685693d