Merge branch 'experimental' into master

This commit is contained in:
DebaucheryLibrarian 2020-08-24 18:24:16 +02:00
commit 06988073d8
2 changed files with 6 additions and 2 deletions

View File

@ -37,7 +37,9 @@ function scrapeProfile(html, actorName) {
if (bio.dateOfBirth) profile.birthdate = moment.utc(bio.dateOfBirth, 'YYYY-MM-DD').toDate(); if (bio.dateOfBirth) profile.birthdate = moment.utc(bio.dateOfBirth, 'YYYY-MM-DD').toDate();
if (profile.placeOfBirth || bio.country) profile.birthPlace = `${bio.placeOfBirth}, ${bio.country}`; if (profile.placeOfBirth && bio.country) profile.birthPlace = `${bio.placeOfBirth}, ${bio.country}`;
else if (bio.country) profile.birthPlace = bio.country;
profile.eyes = bio.eyeColor; profile.eyes = bio.eyeColor;
profile.hair = bio.hairColor; profile.hair = bio.hairColor;
profile.ethnicity = bio.ethnicity; profile.ethnicity = bio.ethnicity;

View File

@ -241,10 +241,12 @@ async function fetchUpcoming(site) {
return null; return null;
} }
async function fetchScene(url, site) { async function fetchScene(url, site, baseScene) {
const entryId = url.match(/\d+/)[0]; const entryId = url.match(/\d+/)[0];
const { session, instanceToken } = await getSession(url); const { session, instanceToken } = await getSession(url);
console.log(baseScene);
const res = await session.get(`https://site-api.project1service.com/v2/releases/${entryId}`, { const res = await session.get(`https://site-api.project1service.com/v2/releases/${entryId}`, {
headers: { headers: {
Instance: instanceToken, Instance: instanceToken,