package-lock.json

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

package.json

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

seeds/01_sites.js

@@ -2,31 +2,6 @@ const upsert = require('../src/utils/upsert');
 
 /* eslint-disable max-len */
 const sites = [
-    // 21NATURALS
-    {
-        slug: '21naturals',
-        name: '21Naturals',
-        url: 'https://www.21naturals.com',
-        network: '21naturals',
-        parameters: {
-            extract: '21naturals',
-        },
-    },
-    {
-        slug: '21footart',
-        name: '21 Foot Art',
-        url: 'https://21footart.21naturals.com',
-        network: '21naturals',
-    },
-    {
-        slug: '21eroticanal',
-        name: '21 Erotic Anal',
-        url: 'https://21eroticanal.21naturals.com',
-        network: '21naturals',
-        parameters: {
-            scene: 'https://21naturals.com/en/video',
-        },
-    },
     // 21SEXTREME
     {
         slug: 'grandpasfuckteens',
@@ -75,7 +50,6 @@ const sites = [
         parameters: {
             scene: 'https://21sextreme.com/en/video',
         },
-        scrape: false,
     },
     {
         slug: 'dominatedgirls',
@@ -85,7 +59,6 @@ const sites = [
         parameters: {
             scene: 'https://21sextreme.com/en/video',
         },
-        scrape: false,
     },
     {
         slug: 'homepornreality',
@@ -95,57 +68,6 @@ const sites = [
         parameters: {
             scene: 'https://21sextreme.com/en/video',
         },
-        scrape: false,
-    },
-    {
-        slug: 'peeandblow',
-        name: 'Pee and Blow',
-        url: 'https://peeandblow.21sextreme.com',
-        network: '21sextreme',
-        parameters: {
-            scene: 'https://21sextreme.com/en/video',
-        },
-        scrape: false,
-    },
-    {
-        slug: 'cummingmatures',
-        name: 'Cumming Matures',
-        url: 'https://cummingmatures.21sextreme.com',
-        network: '21sextreme',
-        parameters: {
-            scene: 'https://21sextreme.com/en/video',
-        },
-        scrape: false,
-    },
-    {
-        slug: 'mandyiskinky',
-        name: 'Mandy Is Kinky',
-        url: 'https://mandyiskinky.21sextreme.com',
-        network: '21sextreme',
-        parameters: {
-            scene: 'https://21sextreme.com/en/video',
-        },
-        scrape: false,
-    },
-    {
-        slug: 'speculumplays',
-        name: 'Speculum Plays',
-        url: 'https://speculumplays.21sextreme.com',
-        network: '21sextreme',
-        parameters: {
-            scene: 'https://21sextreme.com/en/video',
-        },
-        scrape: false,
-    },
-    {
-        slug: 'creampiereality',
-        name: 'Creampie Reality',
-        url: 'https://creampiereality.21sextreme.com',
-        network: '21sextreme',
-        parameters: {
-            scene: 'https://21sextreme.com/en/video',
-        },
-        scrape: false,
     },
     // 21SEXTURY
     {

src/scrapers/gamma.js

@@ -91,10 +91,6 @@ async function getPhotos(albumPath, site) {
 
 async function scrapeApiReleases(json, site) {
     return json.map((scene) => {
-        if (site.parameters?.extract && scene.sitename !== site.parameters.extract) {
-            return null;
-        }
-
         const release = {
             entryId: scene.clip_id,
             title: scene.title,
@@ -129,7 +125,7 @@ async function scrapeApiReleases(json, site) {
         release.movie = `${site.url}/en/movie/${scene.url_movie_title}/${scene.movie_id}`;
 
         return release;
-    }).filter(Boolean);
+    });
 }
 
 function scrapeAll(html, site, networkUrl, hasTeaser = true) {

src/scrapers/teamskeet.js

@@ -51,7 +51,7 @@ function scrapeLatest(html, site) {
     });
 }
 
-function scrapeScene(html, site, url) {
+function scrapeScene(html, site) {
     const { document } = new JSDOM(html).window;
     const release = { site };
 
@@ -59,7 +59,6 @@ function scrapeScene(html, site, url) {
     release.description = document.querySelector('#story-and-tags td:nth-child(2) div').textContent;
     const [actors, title, channel] = document.querySelector('title').textContent.split('|').map(item => item.trim());
 
-    release.url = url;
     release.title = title;
     release.actors = extractActors(actors);
     release.channel = channel.toLowerCase();
@@ -167,11 +166,11 @@ async function fetchScene(url, site) {
     const session = bhttp.session(); // resolve redirects
     const res = await session.get(url);
 
-    if (site.parameters?.scraper === 'A') {
+    if (site.parameters.scraper === 'A') {
         return scrapeSceneA(res.body.toString(), site, null, url);
     }
 
-    return scrapeScene(res.body.toString(), site, url);
+    return scrapeScene(res.body.toString(), site);
 }
 
 module.exports = {

src/sites.js

@@ -111,9 +111,9 @@ async function fetchSitesFromArgv() {
             'sites.*',
             'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters',
         )
+        .where('sites.scrape', true)
         .whereIn('sites.slug', argv.sites || [])
         .orWhereIn('networks.slug', argv.networks || [])
-        .where('sites.scrape', true)
         .leftJoin('networks', 'sites.network_id', 'networks.id');
 
     const curatedSites = await curateSites(rawSites, true);
@@ -132,6 +132,7 @@ async function fetchSitesFromConfig() {
             'networks.name as network_name', 'networks.slug as network_slug', 'networks.url as network_url', 'networks.description as network_description', 'networks.parameters as network_parameters',
         )
         .leftJoin('networks', 'sites.network_id', 'networks.id')
+        .where('sites.scrape', true)
         .where((builder) => {
             if (config.include) {
                 builder