Compare commits

..

No commits in common. "27acb09cede905a820f5f0c4cbea3ac2f803f251" and "0dd4bcc7fe8241f39b26aab3cd6bc96f6bf03e91" have entirely different histories.

9 changed files with 11 additions and 20 deletions

View File

@ -1,4 +0,0 @@
- wrap: ['[Scene details](', ')']
items:
- link
- text: 'on [traxxx](https://traxxx.me/).'

View File

@ -126,7 +126,7 @@ const changed = ref(false);
const templateName = ref(initialTemplate?.name || `custom_${Date.now()}`);
function getSummary() {
return processSummaryTemplate(template.value, props.release, pageContext.env);
return processSummaryTemplate(template.value, props.release);
}
const summary = ref(getSummary());

View File

@ -1,6 +1,5 @@
module.exports = {
title: 'traxxx',
origin: 'http://localhost:5100', // only used for absolute links
database: {
owner: {
host: '127.0.0.1',

4
package-lock.json generated
View File

@ -1,11 +1,11 @@
{
"name": "traxxx-web",
"version": "0.41.10",
"version": "0.41.9",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"version": "0.41.10",
"version": "0.41.9",
"dependencies": {
"@brillout/json-serializer": "^0.5.8",
"@dicebear/collection": "^7.0.5",

View File

@ -87,7 +87,7 @@
"overrides": {
"vite": "$vite"
},
"version": "0.41.10",
"version": "0.41.9",
"imports": {
"#/*": "./*.js"
}

View File

@ -431,7 +431,7 @@ function selectTemplate(templateId, allowFallback = true) {
const template = targetTemplate || templates[0];
summary.value = processSummaryTemplate(template.template, scene, env);
summary.value = processSummaryTemplate(template.template, scene);
selectedTemplate.value = template.id;
cookies.set('selectedTemplate', String(templateId));

View File

@ -104,9 +104,7 @@ const now = new Date();
const mockupRelease = {
id: 0,
title: 'Nut For Human Consumption',
slug: 'nut-for-human-consumption',
link: 'https://traxxx.me/scene/0/nut-for-human-consumption',
url: 'https://example.com/video/12345/nut-for-human-consumption',
url: 'https://traxxx.me/scene/0/nut-for-human-consumption',
date: now,
effectiveDate: now,
createdAt: new Date(now.getFullYear(), 0, 1),

View File

@ -39,7 +39,6 @@ export default async function mainHandler(req, res, next) {
allowSignup: config.auth.signup,
maxMatches: config.database.manticore.maxMatches,
maxAggregateSize: config.database.manticore.maxAggregateSize,
origin: config.origin,
media: config.media,
psa: config.psa,
links: config.links,

View File

@ -13,7 +13,6 @@ const genderMap = {
};
const propProcessors = {
link: (sceneInfo, _options, env) => `${env.origin}/scene/${sceneInfo.id}/${sceneInfo.slug}`,
channel: (sceneInfo) => sceneInfo.channel?.name || sceneInfo.network?.name,
network: (sceneInfo) => sceneInfo.network?.name || sceneInfo.channel?.name,
actors: (sceneInfo, options) => {
@ -67,7 +66,7 @@ function curateValue(value, item) {
.join(item.delimit || ', ');
}
function traverseTemplate(chain, release, env, { delimit = ' ' } = {}) {
function traverseTemplate(chain, release, { delimit = ' ' } = {}) {
const results = chain.reduce((result, item) => {
const keys = typeof item === 'string' ? item : item.key;
@ -85,14 +84,14 @@ function traverseTemplate(chain, release, env, { delimit = ' ' } = {}) {
if (keys) {
const value = keys.split('|').reduce((acc, key) => acc
|| propProcessors[key]?.(release, typeof item === 'string' ? { key } : item, env)
|| propProcessors[key]?.(release, typeof item === 'string' ? { key } : item)
|| release[key], null);
return result.concat(curateValue(value, item));
}
if (item.items) {
const group = traverseTemplate(item.items, release, env, {
const group = traverseTemplate(item.items, release, {
delimit: item.delimit,
});
@ -110,8 +109,8 @@ function traverseTemplate(chain, release, env, { delimit = ' ' } = {}) {
return '';
}
export default function processSummaryTemplate(template, release, env) {
export default function processSummaryTemplate(template, release) {
const chain = parse(template);
return traverseTemplate(chain, release, env);
return traverseTemplate(chain, release);
}