package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "traxxx",
-  "version": "1.80.3",
+  "version": "1.80.2",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.80.3",
+    "version": "1.80.2",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {

seeds/01_sites.js

@@ -683,10 +683,6 @@ const sites = [
         url: 'https://www.1000facials.com',
         description: 'Welcome to 1000Facials.com, your source for the best facial porn with huge cumshots on your favorite teen and MILF pornstars. Watch all the blowjob action inside!',
         network: 'blowpass',
-        parameters: {
-            latest: '/en/videos/latest/All-Categories/0/All-Pornstars/0/',
-            upcoming: '/en/videos/upcoming',
-        },
     },
     {
         slug: 'immorallive',
@@ -694,10 +690,6 @@ const sites = [
         url: 'https://www.immorallive.com',
         description: 'Watch live sex shows and videos on ImmoralLive.com, featuring wild and crazy sex orgies, group sex, blowjob competitions and toy play from the famous Porno Dan. The hottest pornstars and amateur girls cum hard inside',
         network: 'blowpass',
-        parameters: {
-            latest: '/en/videos/latest/All-Categories/0/All-Pornstars/0/',
-            upcoming: '/en/videos/upcoming',
-        },
     },
     {
         slug: 'mommyblowsbest',
@@ -705,10 +697,6 @@ const sites = [
         url: 'https://www.mommyblowsbest.com',
         description: 'Welcome to MommyBlowsBest.com. Home to thousands of MILF blowjobs and hot mom porn! Come see why experience counts, right here at MommyBlowsBest.com!',
         network: 'blowpass',
-        parameters: {
-            latest: '/en/videos/latest/All-Categories/0/All-Pornstars/0/',
-            upcoming: '/en/videos/upcoming',
-        },
     },
     {
         slug: 'onlyteenblowjobs',
@@ -716,10 +704,6 @@ const sites = [
         url: 'https://www.onlyteenblowjobs.com',
         description: 'OnlyTeenBlowjobs.com brings you the best teen blowjob porn featuring today\'s hottest young pornstars and amateurs. Watch as teens use their little mouths to suck and deepthroat the biggest of cocks!',
         network: 'blowpass',
-        parameters: {
-            latest: '/en/videos/latest/All-Categories/0/All-Pornstars/0/',
-            upcoming: '/en/videos/upcoming',
-        },
     },
     {
         slug: 'throated',
@@ -727,10 +711,6 @@ const sites = [
         url: 'https://www.throated.com',
         description: 'Throated.com is your portal for extreme throat fuck porn, face fucking videos and deepthroat gagging pornstars. Watch teens and MILFs go balls deep, swallowing cock in HD!',
         network: 'blowpass',
-        parameters: {
-            latest: '/en/videos/latest/All-Categories/0/All-Pornstars/0/',
-            upcoming: '/en/videos/upcoming',
-        },
     },
     // BRAZZERS
     {

src/scrapers/bangbros.js

@@ -78,36 +78,48 @@ function scrapeUpcoming(html, site) {
 }
 */
 
-function scrapeScene(html, url, _site) {
-    const { q, qa, qu, qi, qt } = ex(html, '.playerSection');
-    const release = {};
+function scrapeScene(html, url, site) {
+    const $ = cheerio.load(html, { normalizeWhitespace: true });
+    const sceneElement = $('.playerSection');
 
-    [release.shootId] = q('.vdoTags + .vdoCast', true).match(/\w+$/);
-    [release.entryId] = url.split('/')[3].match(/\d+$/);
-    release.title = q('.ps-vdoHdd h1', true);
-    release.description = q('.vdoDesc', true);
+    const shootId = sceneElement.find('.vdoCast:contains("Release")').text().replace('Release: ', '');
+    const entryId = url.split('/')[3].slice(5);
+    const title = sceneElement.find('.ps-vdoHdd h1').text();
+    const description = sceneElement.find('.vdoDesc').text().trim();
 
-    release.actors = qa('a[href*="/model"]', true);
-    release.tags = qa('.vdoTags a', true);
+    const [siteName, ...actors] = sceneElement.find('.vdoCast a').map((actorIndex, actorElement) => $(actorElement).text()).toArray();
+    const siteSlug = siteName.replace(/[\s']+/g, '').toLowerCase();
 
-    release.stars = Number(q('div[class*="like"]', true).match(/^\d+/)[0]) / 20;
-
-    const poster = qi('img#player-overlay-image');
-    release.poster = [
-        poster,
-        poster.replace('/big_trailer', '/members/450x340'), // load error fallback
-    ];
-
-    release.trailer = { src: qt() };
+    const poster = `https:${$('img#player-overlay-image').attr('src')}`;
+    const trailer = `https:${$('source[type="video/mp4"]').attr('src')}`;
 
+    const firstPhotoUrl = `https:${$('img[data-slider-index="1"]').attr('src')}`;
     // all scenes seem to have 12 album photos available, not always included on the page
-    const firstPhotoUrl = ex(html).qi('img[data-slider-index="1"]');
-    release.photos = Array.from({ length: 12 }, (val, index) => firstPhotoUrl.replace(/big\d+/, `big${index + 1}`));
+    const photos = Array.from({ length: 12 }, (val, index) => firstPhotoUrl.replace(/big\d+/, `big${index + 1}`));
 
-    const [channel] = qu('a[href*="/websites"]').match(/\w+$/);
-    release.channel = channel === 'bangcasting' ? 'bangbroscasting' : channel;
+    const tags = $('.vdoTags a').map((tagIndex, tagElement) => $(tagElement).text()).toArray();
 
-    return release;
+    const stars = Number(sceneElement.find('.bVdPl_it_like .bVdPl_txt').text().replace('% like', '')) / 20;
+
+    return {
+        url,
+        shootId,
+        entryId,
+        title,
+        description,
+        actors,
+        tags,
+        poster,
+        photos,
+        trailer: {
+            src: trailer,
+        },
+        rating: {
+            stars,
+        },
+        site,
+        channel: siteSlug === 'bangcasting' ? 'bangbroscasting' : siteSlug,
+    };
 }
 
 function scrapeProfile(html) {

src/scrapers/blowpass.js

@@ -2,7 +2,7 @@
 
 const bhttp = require('bhttp');
 
-const { fetchLatest, fetchUpcoming, scrapeScene, fetchProfile } = require('./gamma');
+const { scrapeAll, scrapeScene, fetchProfile } = require('./gamma');
 
 async function fetchScene(url, site) {
     // const res = await bhttp.get(url);
@@ -21,6 +21,18 @@ async function fetchScene(url, site) {
     return release;
 }
 
+async function fetchLatest(site, page = 1) {
+    const res = await bhttp.get(`https://www.blowpass.com/en/videos/${site.slug}/latest/All-Categories/0/All-Pornstars/0/${page}`);
+
+    return scrapeAll(res.body.toString(), site);
+}
+
+async function fetchUpcoming(site) {
+    const res = await bhttp.get(`https://www.blowpass.com/en/videos/${site.slug}/upcoming`);
+
+    return scrapeAll(res.body.toString(), site);
+}
+
 module.exports = {
     fetchLatest,
     fetchProfile,

src/scrapers/gamma.js

@@ -365,14 +365,11 @@ async function fetchLatest(site, page = 1) {
     const url = `${site.url}${site.parameters?.latest || '/en/videos/AllCategories/0/'}${page}`;
     const res = await bhttp.get(url);
 
-    console.log(url);
-
     return scrapeAll(res.body.toString(), site);
 }
 
 async function fetchUpcoming(site) {
-    const url = `${site.url}${site.parameters?.upcoming || '/en/videos/AllCategories/0/1/upcoming'}`;
-    const res = await bhttp.get(url);
+    const res = await bhttp.get(`${site.url}${site.parameters?.upcoming || '/en/videos/AllCategories/0/1/upcoming'}`);
 
     return scrapeAll(res.body.toString(), site);
 }
@@ -453,10 +450,10 @@ async function fetchApiProfile(actorName, siteSlug) {
     });
 
     if (res.statusCode === 200 && res.body.results[0].hits.length > 0) {
-        const actorData = res.body.results[0].hits.find(actor => slugify(actor.name) === slugify(actorName));
+        const actorData = res.body.results[0].hits.find(actor => actor.name === actorName);
 
         if (actorData) {
-            const actorScenes = await fetchActorScenes(actorData.name, apiUrl, siteSlug);
+            const actorScenes = await fetchActorScenes(actorName, apiUrl, siteSlug);
 
             return scrapeApiProfile(actorData, actorScenes, siteSlug);
         }