Compare commits
2 Commits
bff3bc6a0b
...
ada81340ef
| Author | SHA1 | Date | |
|---|---|---|---|
| ada81340ef | |||
| 5ae3b5d91c |
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,11 +1,11 @@
|
||||
{
|
||||
"name": "traxxx-web",
|
||||
"version": "0.45.6",
|
||||
"version": "0.45.7",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"version": "0.45.6",
|
||||
"version": "0.45.7",
|
||||
"dependencies": {
|
||||
"@brillout/json-serializer": "^0.5.8",
|
||||
"@dicebear/collection": "^7.0.5",
|
||||
|
||||
@@ -89,7 +89,7 @@
|
||||
"overrides": {
|
||||
"vite": "$vite"
|
||||
},
|
||||
"version": "0.45.6",
|
||||
"version": "0.45.7",
|
||||
"imports": {
|
||||
"#/*": "./*.js"
|
||||
}
|
||||
|
||||
@@ -1,16 +1,20 @@
|
||||
import format from 'template-format';
|
||||
|
||||
function getWatchUrl(scene) {
|
||||
if (scene.url) {
|
||||
return scene.url;
|
||||
}
|
||||
try {
|
||||
if (scene.url) {
|
||||
return new URL(scene.url).href;
|
||||
}
|
||||
|
||||
if (scene.channel && (scene.channel.isIndependent || scene.channel.type === 'network')) {
|
||||
return scene.channel.url;
|
||||
}
|
||||
if (scene.channel && (scene.channel.isIndependent || scene.channel.type === 'network')) {
|
||||
return new URL(scene.channel.url).href;
|
||||
}
|
||||
|
||||
if (scene.network) {
|
||||
return scene.network.url;
|
||||
if (scene.network) {
|
||||
return new URL(scene.network.url).href;
|
||||
}
|
||||
} catch (_error) {
|
||||
// invalid URL
|
||||
}
|
||||
|
||||
return null;
|
||||
@@ -73,8 +77,16 @@ export function getAffiliateSceneUrl(scene) {
|
||||
return watchUrl;
|
||||
}
|
||||
|
||||
function getEntityUrl(entity) {
|
||||
try {
|
||||
return new URL(entity.url || entity.parent?.url).href;
|
||||
} catch (_error) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
||||
export function getAffiliateEntityUrl(entity) {
|
||||
const entityUrl = entity.url || entity.parent?.url;
|
||||
const entityUrl = getEntityUrl(entity);
|
||||
|
||||
if (!entityUrl) {
|
||||
return null;
|
||||
|
||||
@@ -39,7 +39,7 @@ export function curateEntity(entity, context) {
|
||||
},
|
||||
};
|
||||
|
||||
curatedEntity.affiliateUrl = getAffiliateEntityUrl(curatedEntity, curatedEntity);
|
||||
curatedEntity.affiliateUrl = getAffiliateEntityUrl(curatedEntity);
|
||||
|
||||
return curatedEntity;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user