package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.228.33",
+    "version": "1.228.32",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.228.33",
+            "version": "1.228.32",
             "license": "ISC",
             "dependencies": {
                 "@casl/ability": "^5.2.2",

package.json

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

seeds/02_sites.js

@@ -5681,15 +5681,6 @@ const sites = [
 		tags: ['latina'],
 		parent: 'mamacitaz',
 	},
-	// MARISKA X
-	{
-		name: 'MariskaX',
-		slug: 'mariskax',
-		url: 'https://tour.mariskax.com',
-		parameters: {
-			latest: 'https://tour.mariskax.com/scenes?page={page}',
-		},
-	},
 	// METRO HD
 	{
 		slug: 'devianthardcore',

src/scrapers/bamvisions.js

@@ -32,8 +32,6 @@ function scrapeAll(scenes, site) {
 
 		release.entryId = `${formatDate(release.date, 'YYYY-MM-DD')}-${slugify(release.title)}`;
 
-		console.log(release);
-
 		return release;
 	});
 }

src/scrapers/julesjordan.js

@@ -101,10 +101,11 @@ function scrapeUpcoming(scenes, channel) {
 		}));
 
 		release.poster = query.img('img') || query.img('img', { attribute: 'src0_1x' });
-		release.teaser = html.match(/src=['"](https:\/\/.*\.mp4)['"]/)?.[1];
 
 		release.entryId = channel.parameters?.entryIdFromTitle ? slugify(release.title) : getEntryId(html);
 
+		// TODO: teaser
+
 		return release;
 	});
 }

src/scrapers/mariskax.js

@@ -1,96 +0,0 @@
-'use strict';
-
-const unprint = require('unprint');
-
-const slugify = require('../utils/slugify');
-
-function scrapeLatest(scenes) {
-	return scenes.map(({ query }) => {
-		const release = {};
-
-		release.title = query.content('.title a');
-		release.url = query.url('.title a') || query.url('.thumb-wrap a');
-
-		release.entryId = new URL(release.url).pathname.match(/view\/(\d+)\//)[1];
-
-		release.date = query.date('time', 'Do MMM YYYY', { match: /\d+\w+ \w+ \d{4}/ });
-		release.duration = query.duration('.total-time');
-
-		release.actors = query.all('.models a').map((el) => ({
-			name: unprint.query.content(el),
-			url: unprint.query.url(el, null),
-		}));
-
-		[release.poster, ...release.photos] = query.json('.thumb-wrap a', { attribute: 'data-images' });
-
-		release.photoCount = query.number('.total-photos');
-
-		return release;
-	});
-}
-
-async function fetchLatest(channel, page) {
-	const res = await unprint.get(`https://tour.mariskax.com/scenes?page=${page}`, {
-		selectAll: '.content-item',
-		timeout: 30000, // slow site
-	});
-
-	if (res.ok) {
-		return scrapeLatest(res.context);
-	}
-
-	return res.status;
-}
-
-function scrapeScene({ query }, { url }) {
-	const release = {};
-
-	release.title = query.content('.content-meta .title');
-	release.entryId = new URL(url).pathname.match(/view\/(\d+)\//)[1];
-
-	release.date = query.date('.post-date', 'Do MMM YYYY', { match: /\d+\w+ \w+ \d{4}/ });
-
-	release.actors = query.all('.content-meta .models a').map((el) => ({
-		name: unprint.query.content(el),
-		url: unprint.query.url(el, null),
-	}));
-
-	release.poster = query.poster('.trailer-wrap video');
-	release.trailer = query.video('.trailer-wrap source') || query.video('.download-trailer-wrap a', { attribute: 'href' });
-
-	return release;
-}
-
-async function fetchProfile(actor) {
-	const res = await unprint.post('https://tour.mariskax.com/search-preview-mrx', `q=${slugify(actor.name, '+')}`, {
-		headers: {
-			'Accept-Language': 'en-US,en', // necessary for some reason
-			'Content-Type': 'application/x-www-form-urlencoded; charset=UTF-8',
-		},
-	});
-
-	if (res.ok) {
-		const model = res.data.find((result) => result.type === 'model' && slugify(result.title) === actor.slug);
-
-		if (model) {
-			const curatedModel = {
-				entryId: model.url?.match(/model\/(\d+)\//)?.[1],
-				url: model.url,
-				avatar: model.thumb,
-			};
-
-			return curatedModel;
-		}
-	}
-
-	return null;
-}
-
-module.exports = {
-	fetchLatest,
-	scrapeScene: {
-		scraper: scrapeScene,
-		unprint: true,
-	},
-	fetchProfile,
-};

src/scrapers/scrapers.js

@@ -34,7 +34,6 @@ const karups = require('./karups');
 const kellymadison = require('./kellymadison');
 const killergram = require('./killergram');
 const kink = require('./kink');
-const mariskax = require('./mariskax');
 const analvids = require('./analvids');
 const littlecapricedreams = require('./littlecapricedreams');
 const loveherfilms = require('./loveherfilms');
@@ -86,7 +85,6 @@ const scrapers = {
 		bamvisions,
 		bang,
 		bangbros,
-		bluedonkeymedia,
 		bradmontana,
 		brazzers: mindgeek,
 		cherrypimps,
@@ -124,7 +122,7 @@ const scrapers = {
 		littlecapricedreams,
 		loveherfilms,
 		mamacitaz: porndoe,
-		mariskax,
+		bluedonkeymedia,
 		mikeadriano,
 		mindgeek,
 		mylf: teamskeet,
@@ -244,7 +242,6 @@ const scrapers = {
 		littlecapricedreams,
 		mamacitaz: porndoe,
 		men: mindgeek,
-		mariskax,
 		metrohd: mindgeek,
 		milehighmedia: mindgeek,
 		milfvr: wankzvr,