Passing matching site to profile scrapers. Allowing scrapers to pass avatar metadata. Added scraper and copyright properties to media. Auto-adding copyright from site or scraper to avatars. Separated Porn Pros from Whale Member.

src/scrapers/boobpedia.js

@@ -67,7 +67,10 @@ function scrapeProfile(html) {
     if (avatarThumbPath && !/NoImageAvailable/.test(avatarThumbPath)) {
         const avatarPath = avatarThumbPath.slice(0, avatarThumbPath.lastIndexOf('/')).replace('thumb/', '');
 
-        profile.avatar = `http://www.boobpedia.com${avatarPath}`;
+        profile.avatar = {
+            src: `http://www.boobpedia.com${avatarPath}`,
+            copyright: null,
+        };
     }
 
     profile.social = qus('.infobox a.external');

src/scrapers/freeones.js

@@ -52,7 +52,7 @@ function scrapeProfile(html, actorName) {
     profile.social = Array.from(document.querySelectorAll('.profile-meta-item a.social-icons'), el => el.href);
 
     const avatar = document.querySelector('.profile-image-large img').src;
-    if (!avatar.match('placeholder')) profile.avatar = document.querySelector('.profile-image-large img').src;
+    if (!avatar.match('placeholder')) profile.avatar = { src: avatar, copyright: null };
 
     return profile;
 }

src/scrapers/julesjordan.js

@@ -8,6 +8,7 @@ const moment = require('moment');
 
 const logger = require('../logger');
 const { heightToCm } = require('../utils/convert');
+const slugify = require('../utils/slugify');
 
 async function fetchPhotos(url) {
     const res = await bhttp.get(url);
@@ -302,15 +303,15 @@ function scrapeProfile(html, url, actorName) {
     if (measurementsString) [profile.bust, profile.waist, profile.hip] = measurementsString[0].split('-');
 
     if (avatarEl) {
-        const src = avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src') + 5, avatarEl.innerHTML.indexOf('set.jpg') + 7).trim();
-        const src0 = avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0') + 6, avatarEl.innerHTML.indexOf('set.jpg') + 7).trim();
-        const src1 = avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0_1x') + 9, avatarEl.innerHTML.indexOf('1x.jpg') + 6).trim();
-        const src2 = avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0_2x') + 9, avatarEl.innerHTML.indexOf('2x.jpg') + 6).trim();
-        const src3 = avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0_3x') + 9, avatarEl.innerHTML.indexOf('3x.jpg') + 6).trim();
+        const avatarSources = [
+            avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0_3x') + 9, avatarEl.innerHTML.indexOf('3x.jpg') + 6).trim(),
+            avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0_2x') + 9, avatarEl.innerHTML.indexOf('2x.jpg') + 6).trim(),
+            avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0_1x') + 9, avatarEl.innerHTML.indexOf('1x.jpg') + 6).trim(),
+            avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src0') + 6, avatarEl.innerHTML.indexOf('set.jpg') + 7).trim(),
+            avatarEl.innerHTML.slice(avatarEl.innerHTML.indexOf('src') + 5, avatarEl.innerHTML.indexOf('set.jpg') + 7).trim(),
+        ].filter(Boolean);
 
-        const avatar = src3 || src2 || src1 || src0 || src;
-
-        if (avatar) profile.avatar = avatar;
+        if (avatarSources.length) profile.avatar = avatarSources;
     }
 
     profile.releases = Array.from(document.querySelectorAll('.category_listing_block .update_details > a:first-child'), el => el.href);
@@ -343,8 +344,8 @@ async function fetchMovie(url, site) {
 }
 
 async function fetchProfile(actorName) {
-    const actorSlugA = actorName.toLowerCase().replace(/\s+/g, '-');
-    const actorSlugB = actorName.toLowerCase().replace(/\s+/g, '');
+    const actorSlugA = slugify(actorName, { delimiter: '-' });
+    const actorSlugB = slugify(actorName, { delimiter: '' });
 
     const urlA = `https://julesjordan.com/trial/models/${actorSlugA}.html`;
     const urlB = `https://julesjordan.com/trial/models/${actorSlugB}.html`;

src/scrapers/scrapers.js

@@ -6,7 +6,6 @@ const babes = require('./babes');
 const bang = require('./bang');
 const bangbros = require('./bangbros');
 const blowpass = require('./blowpass');
-const boobpedia = require('./boobpedia');
 const brazzers = require('./brazzers');
 const burningangel = require('./burningangel');
 const cherrypimps = require('./cherrypimps');
@@ -17,8 +16,6 @@ const evilangel = require('./evilangel');
 const fakehub = require('./fakehub');
 const famedigital = require('./famedigital');
 const fantasymassage = require('./fantasymassage');
-const freeones = require('./freeones');
-const freeonesLegacy = require('./freeones_legacy');
 const fullpornnetwork = require('./fullpornnetwork');
 const girlsway = require('./girlsway');
 const iconmale = require('./iconmale');
@@ -41,7 +38,7 @@ const nubiles = require('./nubiles');
 const perfectgonzo = require('./perfectgonzo');
 const pervcity = require('./pervcity');
 const pornhub = require('./pornhub');
-const pornpros = require('./pornpros');
+const whalemember = require('./whalemember');
 const privateNetwork = require('./private'); // reserved keyword
 const puretaboo = require('./puretaboo');
 const realitykings = require('./realitykings');
@@ -57,6 +54,11 @@ const vogov = require('./vogov');
 const wicked = require('./wicked');
 const xempire = require('./xempire');
 
+// profiles
+const boobpedia = require('./boobpedia');
+const freeones = require('./freeones');
+const freeonesLegacy = require('./freeones_legacy');
+
 module.exports = {
     releases: {
         '21naturals': naturals,
@@ -99,7 +101,7 @@ module.exports = {
         perfectgonzo,
         pervcity,
         pimpxxx: cherrypimps,
-        pornpros,
+        pornpros: whalemember,
         private: privateNetwork,
         puretaboo,
         realitykings,
@@ -109,6 +111,7 @@ module.exports = {
         vivid,
         vixen,
         vogov,
+        whalemember,
         wicked,
         xempire,
     },

src/scrapers/vixen.js

@@ -214,7 +214,7 @@ async function fetchScene(url, site, baseRelease) {
     return res.code;
 }
 
-async function fetchProfile(actorName, scraperSlug, withReleases) {
+async function fetchProfile(actorName, scraperSlug, site, withReleases) {
     const origin = `https://www.${scraperSlug}.com`;
     const actorSlug = slugify(actorName);
     const url = `${origin}/api/${actorSlug}`;