diff --git a/public/img/logos/naughtyamerica/americandaydreams.png b/public/img/logos/naughtyamerica/americandaydreams.png index fa1ae4c8..b41024f8 100644 Binary files a/public/img/logos/naughtyamerica/americandaydreams.png and b/public/img/logos/naughtyamerica/americandaydreams.png differ diff --git a/public/img/logos/naughtyamerica/analcollege.png b/public/img/logos/naughtyamerica/analcollege.png index 4fd24468..38a9746b 100644 Binary files a/public/img/logos/naughtyamerica/analcollege.png and b/public/img/logos/naughtyamerica/analcollege.png differ diff --git a/public/img/logos/naughtyamerica/assmasterpiece.png b/public/img/logos/naughtyamerica/assmasterpiece.png index 4a6a6f75..88744a71 100644 Binary files a/public/img/logos/naughtyamerica/assmasterpiece.png and b/public/img/logos/naughtyamerica/assmasterpiece.png differ diff --git a/public/img/logos/naughtyamerica/bigcockbully.png b/public/img/logos/naughtyamerica/bigcockbully.png index a6df3cbd..a71cb5d7 100644 Binary files a/public/img/logos/naughtyamerica/bigcockbully.png and b/public/img/logos/naughtyamerica/bigcockbully.png differ diff --git a/public/img/logos/naughtyamerica/lasluts.png b/public/img/logos/naughtyamerica/lasluts.png index eaab7aac..8929e483 100644 Binary files a/public/img/logos/naughtyamerica/lasluts.png and b/public/img/logos/naughtyamerica/lasluts.png differ diff --git a/public/img/logos/naughtyamerica/lesbiangirlongirl.png b/public/img/logos/naughtyamerica/lesbiangirlongirl.png index afc68c92..c467be3c 100644 Binary files a/public/img/logos/naughtyamerica/lesbiangirlongirl.png and b/public/img/logos/naughtyamerica/lesbiangirlongirl.png differ diff --git a/public/img/logos/naughtyamerica/livenaughtyteacher.png b/public/img/logos/naughtyamerica/livenaughtyteacher.png index c889ff96..63d01e90 100644 Binary files a/public/img/logos/naughtyamerica/livenaughtyteacher.png and b/public/img/logos/naughtyamerica/livenaughtyteacher.png differ diff --git a/public/img/logos/naughtyamerica/mydadshotgirlfriend.png b/public/img/logos/naughtyamerica/mydadshotgirlfriend.png index c56d976c..72de07bc 100644 Binary files a/public/img/logos/naughtyamerica/mydadshotgirlfriend.png and b/public/img/logos/naughtyamerica/mydadshotgirlfriend.png differ diff --git a/public/img/logos/naughtyamerica/mydaughtershotfriend.png b/public/img/logos/naughtyamerica/mydaughtershotfriend.png index 314a9ad1..10ed7e83 100644 Binary files a/public/img/logos/naughtyamerica/mydaughtershotfriend.png and b/public/img/logos/naughtyamerica/mydaughtershotfriend.png differ diff --git a/public/img/logos/naughtyamerica/myfirstsexteacher.png b/public/img/logos/naughtyamerica/myfirstsexteacher.png index e7a09f84..bb893b80 100644 Binary files a/public/img/logos/naughtyamerica/myfirstsexteacher.png and b/public/img/logos/naughtyamerica/myfirstsexteacher.png differ diff --git a/public/img/logos/naughtyamerica/myfriendshotgirl.png b/public/img/logos/naughtyamerica/myfriendshotgirl.png index d8c3b449..8724ba50 100644 Binary files a/public/img/logos/naughtyamerica/myfriendshotgirl.png and b/public/img/logos/naughtyamerica/myfriendshotgirl.png differ diff --git a/public/img/logos/naughtyamerica/myfriendshotmom.png b/public/img/logos/naughtyamerica/myfriendshotmom.png index a171fb04..b0e24d32 100644 Binary files a/public/img/logos/naughtyamerica/myfriendshotmom.png and b/public/img/logos/naughtyamerica/myfriendshotmom.png differ diff --git a/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png b/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png index 137a3209..e1b34a6b 100644 Binary files a/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png and b/public/img/logos/naughtyamerica/mygirlfriendsbustyfriend.png differ diff --git a/public/img/logos/naughtyamerica/mygirllovesanal.png b/public/img/logos/naughtyamerica/mygirllovesanal.png index b22dc2c6..eb970f22 100644 Binary files a/public/img/logos/naughtyamerica/mygirllovesanal.png and b/public/img/logos/naughtyamerica/mygirllovesanal.png differ diff --git a/public/img/logos/naughtyamerica/mynaughtylatinmaid.png b/public/img/logos/naughtyamerica/mynaughtylatinmaid.png index 521e841e..baffe66a 100644 Binary files a/public/img/logos/naughtyamerica/mynaughtylatinmaid.png and b/public/img/logos/naughtyamerica/mynaughtylatinmaid.png differ diff --git a/public/img/logos/naughtyamerica/mysistershotfriend.png b/public/img/logos/naughtyamerica/mysistershotfriend.png index 60c610cf..7632a15f 100644 Binary files a/public/img/logos/naughtyamerica/mysistershotfriend.png and b/public/img/logos/naughtyamerica/mysistershotfriend.png differ diff --git a/public/img/logos/naughtyamerica/mywifeismypornstar.png b/public/img/logos/naughtyamerica/mywifeismypornstar.png index 00c51234..4dc7fb2a 100644 Binary files a/public/img/logos/naughtyamerica/mywifeismypornstar.png and b/public/img/logos/naughtyamerica/mywifeismypornstar.png differ diff --git a/public/img/logos/naughtyamerica/mywifeshotfriend.png b/public/img/logos/naughtyamerica/mywifeshotfriend.png index c1b59fcc..0b06e554 100644 Binary files a/public/img/logos/naughtyamerica/mywifeshotfriend.png and b/public/img/logos/naughtyamerica/mywifeshotfriend.png differ diff --git a/public/img/logos/naughtyamerica/naughtybookworms.png b/public/img/logos/naughtyamerica/naughtybookworms.png index 22855ead..9a90bc9d 100644 Binary files a/public/img/logos/naughtyamerica/naughtybookworms.png and b/public/img/logos/naughtyamerica/naughtybookworms.png differ diff --git a/public/img/logos/naughtyamerica/naughtycountrygirls.png b/public/img/logos/naughtyamerica/naughtycountrygirls.png index ed972376..93ef5dff 100644 Binary files a/public/img/logos/naughtyamerica/naughtycountrygirls.png and b/public/img/logos/naughtyamerica/naughtycountrygirls.png differ diff --git a/public/img/logos/naughtyamerica/naughtyflipside.png b/public/img/logos/naughtyamerica/naughtyflipside.png index ee7061df..39f1c5cf 100644 Binary files a/public/img/logos/naughtyamerica/naughtyflipside.png and b/public/img/logos/naughtyamerica/naughtyflipside.png differ diff --git a/public/img/logos/naughtyamerica/naughtyoffice.png b/public/img/logos/naughtyamerica/naughtyoffice.png index c6a63fa6..415a70bf 100644 Binary files a/public/img/logos/naughtyamerica/naughtyoffice.png and b/public/img/logos/naughtyamerica/naughtyoffice.png differ diff --git a/public/img/logos/naughtyamerica/naughtyrichgirls.png b/public/img/logos/naughtyamerica/naughtyrichgirls.png index 43e5643f..ea7d4b2d 100644 Binary files a/public/img/logos/naughtyamerica/naughtyrichgirls.png and b/public/img/logos/naughtyamerica/naughtyrichgirls.png differ diff --git a/public/img/logos/naughtyamerica/naughtyweddings.png b/public/img/logos/naughtyamerica/naughtyweddings.png index 5f68ba35..96de467a 100644 Binary files a/public/img/logos/naughtyamerica/naughtyweddings.png and b/public/img/logos/naughtyamerica/naughtyweddings.png differ diff --git a/public/img/logos/naughtyamerica/openfamily.png b/public/img/logos/naughtyamerica/openfamily.png index a24fccac..9d42975d 100644 Binary files a/public/img/logos/naughtyamerica/openfamily.png and b/public/img/logos/naughtyamerica/openfamily.png differ diff --git a/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png b/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png index 68bedf57..6698c57c 100644 Binary files a/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png and b/public/img/logos/naughtyamerica/perfectfuckingstrangersclassic.png differ diff --git a/public/img/logos/naughtyamerica/seducedbyacougar.png b/public/img/logos/naughtyamerica/seducedbyacougar.png index c60d110f..124dbe28 100644 Binary files a/public/img/logos/naughtyamerica/seducedbyacougar.png and b/public/img/logos/naughtyamerica/seducedbyacougar.png differ diff --git a/public/img/logos/naughtyamerica/showmybf.png b/public/img/logos/naughtyamerica/showmybf.png index 5363fa35..35bcf025 100644 Binary files a/public/img/logos/naughtyamerica/showmybf.png and b/public/img/logos/naughtyamerica/showmybf.png differ diff --git a/public/img/logos/naughtyamerica/sleazystepdad.png b/public/img/logos/naughtyamerica/sleazystepdad.png index f745b0a9..eae24e6e 100644 Binary files a/public/img/logos/naughtyamerica/sleazystepdad.png and b/public/img/logos/naughtyamerica/sleazystepdad.png differ diff --git a/public/img/logos/naughtyamerica/slutstepmom.png b/public/img/logos/naughtyamerica/slutstepmom.png index f3f1b3c8..5913c660 100644 Binary files a/public/img/logos/naughtyamerica/slutstepmom.png and b/public/img/logos/naughtyamerica/slutstepmom.png differ diff --git a/public/img/logos/naughtyamerica/slutstepsister.png b/public/img/logos/naughtyamerica/slutstepsister.png index 7c76d02e..38014235 100644 Binary files a/public/img/logos/naughtyamerica/slutstepsister.png and b/public/img/logos/naughtyamerica/slutstepsister.png differ diff --git a/public/img/logos/naughtyamerica/teenslovecream.png b/public/img/logos/naughtyamerica/teenslovecream.png index c73d28a9..bd345a34 100644 Binary files a/public/img/logos/naughtyamerica/teenslovecream.png and b/public/img/logos/naughtyamerica/teenslovecream.png differ diff --git a/public/img/logos/naughtyamerica/tonightsfuck.png b/public/img/logos/naughtyamerica/tonightsfuck.png index 089134dd..208c6ed2 100644 Binary files a/public/img/logos/naughtyamerica/tonightsfuck.png and b/public/img/logos/naughtyamerica/tonightsfuck.png differ diff --git a/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png b/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png index a6488511..733e1ad2 100644 Binary files a/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png and b/public/img/logos/naughtyamerica/tonightsgirlfriendclassic.png differ diff --git a/public/img/logos/naughtyamerica/watchyourmom.png b/public/img/logos/naughtyamerica/watchyourmom.png index 70da097f..110b1ef5 100644 Binary files a/public/img/logos/naughtyamerica/watchyourmom.png and b/public/img/logos/naughtyamerica/watchyourmom.png differ diff --git a/public/img/logos/naughtyamerica/watchyourwife.png b/public/img/logos/naughtyamerica/watchyourwife.png index 12926d09..86e56efe 100644 Binary files a/public/img/logos/naughtyamerica/watchyourwife.png and b/public/img/logos/naughtyamerica/watchyourwife.png differ diff --git a/public/img/logos/naughtyamerica/wivesonvacation.png b/public/img/logos/naughtyamerica/wivesonvacation.png index a917b595..c064f542 100644 Binary files a/public/img/logos/naughtyamerica/wivesonvacation.png and b/public/img/logos/naughtyamerica/wivesonvacation.png differ diff --git a/public/img/logos/score/bigtitterrynova.png b/public/img/logos/score/bigtitterrynova.png new file mode 100644 index 00000000..9cad638c Binary files /dev/null and b/public/img/logos/score/bigtitterrynova.png differ diff --git a/public/img/logos/score/misc/score_small.png b/public/img/logos/score/misc/score_small.png new file mode 100644 index 00000000..57e7a1ad Binary files /dev/null and b/public/img/logos/score/misc/score_small.png differ diff --git a/public/img/logos/score/network.png b/public/img/logos/score/network.png index 57e7a1ad..067c5298 100644 Binary files a/public/img/logos/score/network.png and b/public/img/logos/score/network.png differ diff --git a/public/img/logos/teamskeet/familystrokes.png b/public/img/logos/teamskeet/familystrokes.png index cb6f18ac..9004580c 100644 Binary files a/public/img/logos/teamskeet/familystrokes.png and b/public/img/logos/teamskeet/familystrokes.png differ diff --git a/public/img/logos/teamskeet/misc/family-strokes_original.png b/public/img/logos/teamskeet/misc/family-strokes_original.png new file mode 100644 index 00000000..cb6f18ac Binary files /dev/null and b/public/img/logos/teamskeet/misc/family-strokes_original.png differ diff --git a/public/img/tags/facefucking/1.jpeg b/public/img/tags/facefucking/1.jpeg index e3920916..398a6c9b 100644 Binary files a/public/img/tags/facefucking/1.jpeg and b/public/img/tags/facefucking/1.jpeg differ diff --git a/public/img/tags/facefucking/1_thumb.jpeg b/public/img/tags/facefucking/1_thumb.jpeg index 30ecc6da..ea520f87 100644 Binary files a/public/img/tags/facefucking/1_thumb.jpeg and b/public/img/tags/facefucking/1_thumb.jpeg differ diff --git a/seeds/01_sites.js b/seeds/01_sites.js index 7a6aa991..7cad69b8 100644 --- a/seeds/01_sites.js +++ b/seeds/01_sites.js @@ -1905,7 +1905,7 @@ const sites = [ // NAUGHTY AMERICA { slug: 'myfriendshotmom', - name: "My Friend's Hot Mom", + name: 'My Friend\'s Hot Mom', url: 'https://www.naughtyamerica.com/site/my-friend-s-hot-mom', network: 'naughtyamerica', }, @@ -1981,6 +1981,12 @@ const sites = [ url: 'https://www.naughtyamerica.com/site/seduced-by-a-cougar', network: 'naughtyamerica', }, + { + slug: 'showmybf', + name: 'Show My BF', + url: 'https://www.naughtyamerica.com/site/show-my-bf', + network: 'naughtyamerica', + }, { slug: 'mydaughtershotfriend', name: "My Daughter's Hot Friend", diff --git a/src/actors.js b/src/actors.js index ee8dd826..12364f76 100644 --- a/src/actors.js +++ b/src/actors.js @@ -275,6 +275,10 @@ async function updateActor(actor, scraped = false, scrapeSuccess = false) { } async function mergeProfiles(profiles, actor) { + if (profiles.filter(Boolean).length === 0) { + return null; + } + const mergedProfile = profiles.reduce((prevProfile, profile) => { if (profile === null) { return prevProfile; @@ -379,8 +383,8 @@ async function scrapeActors(actorNames) { if (profile === null) { logger.warn(`Could not find profile for actor '${actorName}'`); - if (argv.save) { - await updateActor(profile, true, false); + if (argv.save && !actorEntry) { + await storeActor({ name: actorName }, false, false); } return null; diff --git a/src/scrapers/score.js b/src/scrapers/score.js index f8ab3482..a983f8ba 100644 --- a/src/scrapers/score.js +++ b/src/scrapers/score.js @@ -45,7 +45,7 @@ function scrapeAll(html, site) { release.date = qd('.i-date', 'MMM DD', /\w+ \d{1,2}$/) || qd('.dt-box', 'MMM.DD YYYY'); - release.actors = site.parameters?.actors || qa('.model, .i-model', true); + release.actors = site?.parameters?.actors || qa('.model, .i-model', true); release.duration = ql('.i-amount, .amount'); const posterEl = q('.item-img img'); @@ -71,7 +71,7 @@ async function scrapeScene(html, url, site) { [release.entryId] = new URL(url).pathname.split('/').slice(-2); release.title = q('h2.text-uppercase, h2.title, #breadcrumb-top + h1', true) - || q('h1.m-title', true)?.split('»').slice(-1)[0].trim(); + || q('h1.m-title', true)?.split(/»|\//).slice(-1)[0].trim(); release.description = qtext('.p-desc, .desc'); release.actors = qa('.value a[href*=models], .value a[href*=performer], .value a[href*=teen-babes]', true); @@ -80,17 +80,10 @@ async function scrapeScene(html, url, site) { const actorEl = qa('.stat').find(stat => /Featuring/.test(stat.textContent)); const actorString = qtext(actorEl); - console.log(actorString); - /* - ?.split(/, and|,/g) - .map(actor => actor.trim()) - || []; - */ + release.actors = actorString?.split(/, and |, /g) || []; } - console.log(release.actors); - - if (release.actors.length === 0) release.actors = site.parameters?.actors; + if (release.actors.length === 0 && site.parameters?.actors) release.actors = site.parameters.actors; release.tags = qa('a[href*=tag]', true); @@ -129,8 +122,6 @@ async function scrapeScene(html, url, site) { const stars = q('.rate-box').dataset.score; if (stars) release.rating = { stars }; - console.log(release); - return release; }