Compare commits
3 Commits
a2d5828fda
...
9e20af925f
| Author | SHA1 | Date | |
|---|---|---|---|
| 9e20af925f | |||
| 457afa5043 | |||
| c536a75f3d |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "traxxx-web",
|
||||
"version": "0.45.2",
|
||||
"version": "0.45.3",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"version": "0.45.2",
|
||||
"version": "0.45.3",
|
||||
"dependencies": {
|
||||
"@brillout/json-serializer": "^0.5.8",
|
||||
"@dicebear/collection": "^7.0.5",
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
"overrides": {
|
||||
"vite": "$vite"
|
||||
},
|
||||
"version": "0.45.2",
|
||||
"version": "0.45.3",
|
||||
"imports": {
|
||||
"#/*": "./*.js"
|
||||
}
|
||||
|
||||
@@ -38,6 +38,7 @@ export function getAffiliateSceneUrl(scene) {
|
||||
scenePath: scene.affiliate.parameters.prefixSlash
|
||||
? scenePath
|
||||
: scenePath.replace(/^\//, ''),
|
||||
entryId: scene.entryId,
|
||||
});
|
||||
}
|
||||
|
||||
@@ -70,7 +71,7 @@ export function getAffiliateEntityUrl(entity) {
|
||||
? entity.affiliate.parameters.replaceEntity.url
|
||||
: entity.affiliate.url;
|
||||
|
||||
if (entity.id === entity.affiliate.entityId) {
|
||||
if (entity.id === entity.affiliate.entityId || entity.url === entity.parent?.url) {
|
||||
return affiliateUrl;
|
||||
}
|
||||
|
||||
@@ -79,7 +80,7 @@ export function getAffiliateEntityUrl(entity) {
|
||||
}
|
||||
|
||||
// channel has its own domain
|
||||
if (new URL(entity.url).pathname === '/') {
|
||||
if (new URL(entity.url).pathname === '/' && entity.url !== entity.parent?.url) {
|
||||
return entity.url;
|
||||
}
|
||||
|
||||
|
||||
@@ -29,6 +29,7 @@ function curateScene(rawScene, assets, reqUser) {
|
||||
title: rawScene.title,
|
||||
slug: rawScene.slug,
|
||||
url: rawScene.url,
|
||||
entryId: rawScene.entry_id,
|
||||
date: rawScene.date,
|
||||
datePrecision: rawScene.date_precision,
|
||||
createdAt: rawScene.created_at,
|
||||
|
||||
Reference in New Issue
Block a user