Compare commits

..

2 Commits

Author SHA1 Message Date
217decee06 0.46.2 2026-02-06 21:43:29 +01:00
d93baf80ab Improved affiliate URL calculation. 2026-02-06 21:43:26 +01:00
4 changed files with 13 additions and 13 deletions

4
package-lock.json generated
View File

@@ -1,11 +1,11 @@
{ {
"name": "traxxx-web", "name": "traxxx-web",
"version": "0.46.1", "version": "0.46.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"version": "0.46.1", "version": "0.46.2",
"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.46.1", "version": "0.46.2",
"imports": { "imports": {
"#/*": "./*.js" "#/*": "./*.js"
} }

View File

@@ -101,7 +101,15 @@ export function getAffiliateEntityUrl(entity, affiliate) {
return entityUrl; return entityUrl;
} }
if (entityAffiliate.parameters?.query) { // used by e.g. Bang const affiliateUrl = entityAffiliate.parameters?.replaceEntity?.hostname === new URL(entityUrl).hostname
? entityAffiliate.parameters.replaceEntity.url
: entityAffiliate.url;
if (affiliateUrl && (entity.id === entityAffiliate.entityId || entityUrl === entity.parent?.url)) {
return affiliateUrl;
}
if (entityAffiliate.parameters?.query) {
const newParams = new URLSearchParams({ const newParams = new URLSearchParams({
...Object.fromEntries(new URL(entityUrl).searchParams), ...Object.fromEntries(new URL(entityUrl).searchParams),
...Object.fromEntries(new URLSearchParams(entityAffiliate.parameters.query)), ...Object.fromEntries(new URLSearchParams(entityAffiliate.parameters.query)),
@@ -110,14 +118,6 @@ export function getAffiliateEntityUrl(entity, affiliate) {
return `${entityUrl}?${newParams.toString()}`; return `${entityUrl}?${newParams.toString()}`;
} }
const affiliateUrl = entityAffiliate.parameters?.replaceEntity?.hostname === new URL(entityUrl).hostname
? entityAffiliate.parameters.replaceEntity.url
: entityAffiliate.url;
if (entity.id === entityAffiliate.entityId || entityUrl === entity.parent?.url) {
return affiliateUrl;
}
if (entity.type === 'network' || entity.isIndependent) { if (entity.type === 'network' || entity.isIndependent) {
return entityUrl; return entityUrl;
} }

2
static

Submodule static updated: ea8019c555...8f331b46e7