diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 4dec752e1..2a02444ed 100755 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -13547,6 +13547,7 @@ const sites = [ videos: '/videos', scenePath: '/videos', modelPath: '/models', + imageType: 'photos', }, }, // TEEN CORE CLUB diff --git a/src/scrapers/aziani.js b/src/scrapers/aziani.js index 826550c6b..0d6c07318 100755 --- a/src/scrapers/aziani.js +++ b/src/scrapers/aziani.js @@ -45,7 +45,7 @@ function scrapeScene(data, channel, parameters) { .map((key) => unprint.prefixUrl(`${poster[key][0].fileuri}?${poster[key][0].signature}`, parameters.cdn)); } - release.caps = data.content + release[parameters.imageType || 'caps'] = data.content ?.filter((item) => item.content_type === 'image' && item.content?.[0]) .map((item) => [ item.content[0], @@ -187,7 +187,10 @@ function scrapeProfile(data, entity, parameters) { profile.gender = bio.gender?.toLowerCase(); profile.age = bio.age; - profile.dateOfBirth = unprint.extractDate(`${bio.born} 0`, 'MMMM Do YYYY', { match: /\w+ \d+\w{2} \d{1,4}/ }); + profile.dateOfBirth = unprint.extractDate(`${bio.born} 0`, 'MMMM Do YYYY', { match: /\w+ \d+\w{2} \d{1,4}/ }) + || unprint.extractDate(bio.date_of_birth, 'yyyy-MM-dd'); + + profile.birthPlace = bio.birthplace; profile.ethnicity = bio.ethnicity; profile.measurements = bio.measurements; @@ -210,16 +213,18 @@ function scrapeProfile(data, entity, parameters) { }; } + profile.socials = [bio.onlyfans, bio.instagram].filter(Boolean); + return profile; } async function fetchProfile({ name, url }, { entity, parameters }) { - if (!url) { - // no easy search option + if (!url && !parameters.entryIdSlug) { + // no easy search option and numeric ID is non-derivable return null; } - const actorId = new URL(url).pathname.match(/models?\/(\d+)/)?.[1]; + const actorId = url && new URL(url).pathname.match(/models?\/(\d+)/)?.[1]; if (!actorId && !parameters.entryIdSlug) { return null; diff --git a/tests/profiles.js b/tests/profiles.js index ed185effb..acd2fe55d 100644 --- a/tests/profiles.js +++ b/tests/profiles.js @@ -266,6 +266,7 @@ const actors = [ { entity: 'wakeupnfuck', name: 'Abby Lee Brazil', fields: ['avatar', 'nationality'] }, { entity: 'darkkotv', name: 'Aidra Fox', fields: ['avatar', 'description', 'dateOfBirth', 'birthPlace', 'ethnicity', 'height', 'weight', 'measurements', 'naturalBoobs', 'hasTattoos', 'hasPiercings'] }, { entity: 'jaxslayher', name: 'Eliza Ibarra', fields: ['avatar', 'description', 'eyes', 'height', 'weight', 'birthPlace', 'measurements', 'hairColor'] }, + { entity: 'cosplayground', name: 'Anna Claire Clouds', url: 'https://cosplayground.com/models/anna-claire-clouds?models=Anna%20Claire%20Clouds', fields: ['avatar', 'description', 'dateOfBirth', 'birthPlace', 'height', 'measurements', 'hairColor', 'ethnicity'] }, ]; const actorScrapers = scrapers.actors;