Compare commits
No commits in common. "bec26ee0723d83e2d3fc1074bb9ee38fb80a4df4" and "4caf0dbe956d5715f43bb72ef48782c5f25e30ed" have entirely different histories.
bec26ee072
...
4caf0dbe95
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "traxxx",
|
"name": "traxxx",
|
||||||
"version": "1.87.1",
|
"version": "1.87.0",
|
||||||
"lockfileVersion": 1,
|
"lockfileVersion": 1,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
"name": "traxxx",
|
"name": "traxxx",
|
||||||
"version": "1.87.1",
|
"version": "1.87.0",
|
||||||
"description": "All the latest porn releases in one place",
|
"description": "All the latest porn releases in one place",
|
||||||
"main": "src/app.js",
|
"main": "src/app.js",
|
||||||
"scripts": {
|
"scripts": {
|
||||||
|
|
|
@ -4454,48 +4454,36 @@ const sites = [
|
||||||
name: 'Vivid Celeb',
|
name: 'Vivid Celeb',
|
||||||
url: 'https://www.vividceleb.com',
|
url: 'https://www.vividceleb.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
|
||||||
referer: 'https://www.thebrats.com',
|
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
|
||||||
scene: false,
|
|
||||||
lastNative: new Date('2018-03-25'),
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
slug: 'thebrats',
|
slug: 'thebrats',
|
||||||
name: 'The Brats',
|
name: 'The Brats',
|
||||||
url: 'https://www.thebrats.com',
|
url: 'https://www.thebrats.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
slug: 'wheretheboysarent',
|
slug: 'wheretheboysarent',
|
||||||
name: 'Where The Boys Aren\'t',
|
name: 'Where The Boys Aren\'t',
|
||||||
url: 'https://www.wheretheboysarent.com',
|
url: 'https://www.wheretheboysarent.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
slug: 'nineteen',
|
slug: 'nineteen',
|
||||||
name: 'Nineteen',
|
name: 'Nineteen',
|
||||||
url: 'https://www.nineteen.com',
|
url: 'https://www.nineteen.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
|
||||||
referer: 'https://www.thebrats.com',
|
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
|
||||||
scene: false,
|
|
||||||
lastNative: new Date('2019-01-23'),
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
slug: 'nastystepfamily',
|
slug: 'nastystepfamily',
|
||||||
name: 'Nasty Step Family',
|
name: 'Nasty Step Family',
|
||||||
url: 'https://www.nastystepfamily.com',
|
url: 'https://www.nastystepfamily.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
|
||||||
referer: 'https://www.thebrats.com',
|
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
|
||||||
scene: false,
|
|
||||||
lastNative: new Date('2019-01-29'),
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
slug: 'girlswhofuckgirls',
|
slug: 'girlswhofuckgirls',
|
||||||
|
@ -4503,10 +4491,10 @@ const sites = [
|
||||||
url: 'https://www.girlswhofuckgirls.com',
|
url: 'https://www.girlswhofuckgirls.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2019-05-21'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4515,10 +4503,10 @@ const sites = [
|
||||||
url: 'https://www.petited.com',
|
url: 'https://www.petited.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2019-01-28'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4527,10 +4515,10 @@ const sites = [
|
||||||
url: 'https://www.orgytrain.com',
|
url: 'https://www.orgytrain.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2019-01-09'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4539,10 +4527,10 @@ const sites = [
|
||||||
url: 'https://www.momisamilf.com',
|
url: 'https://www.momisamilf.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2019-01-25'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4551,10 +4539,10 @@ const sites = [
|
||||||
url: 'https://www.blackwhitefuckfest.com',
|
url: 'https://www.blackwhitefuckfest.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2019-01-30'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4563,10 +4551,10 @@ const sites = [
|
||||||
url: 'https://www.65inchhugeasses.com',
|
url: 'https://www.65inchhugeasses.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2019-05-18'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4575,10 +4563,10 @@ const sites = [
|
||||||
url: 'https://www.brandnewfaces.com',
|
url: 'https://www.brandnewfaces.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2018-02-28'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
|
@ -4587,10 +4575,10 @@ const sites = [
|
||||||
url: 'https://www.vividclassic.com',
|
url: 'https://www.vividclassic.com',
|
||||||
network: 'vivid',
|
network: 'vivid',
|
||||||
parameters: {
|
parameters: {
|
||||||
|
useGamma: true,
|
||||||
referer: 'https://www.thebrats.com',
|
referer: 'https://www.thebrats.com',
|
||||||
deep: 'https://www.thebrats.com/en/video',
|
deep: 'https://www.thebrats.com/en/video',
|
||||||
scene: false,
|
scene: false,
|
||||||
lastNative: new Date('2016-06-29'),
|
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
// VIXEN
|
// VIXEN
|
||||||
|
|
|
@ -5,7 +5,6 @@ const bhttp = require('bhttp');
|
||||||
|
|
||||||
const { get, date } = require('../utils/q');
|
const { get, date } = require('../utils/q');
|
||||||
const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma');
|
const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma');
|
||||||
const slugify = require('../utils/slugify');
|
|
||||||
|
|
||||||
function scrapeLatestNative(scenes, site) {
|
function scrapeLatestNative(scenes, site) {
|
||||||
return scenes.map((scene) => {
|
return scenes.map((scene) => {
|
||||||
|
@ -104,26 +103,6 @@ async function fetchSceneNative(url, site, release) {
|
||||||
async function fetchSceneWrapper(url, site, release) {
|
async function fetchSceneWrapper(url, site, release) {
|
||||||
const scene = await fetchScene(url, site, release);
|
const scene = await fetchScene(url, site, release);
|
||||||
|
|
||||||
if (scene.date - new Date(site.parameters.lastNative) <= 0) {
|
|
||||||
// scene is probably still available on Vivid site, use search API to get URL and original date
|
|
||||||
const searchUrl = `${site.url}/videos/api/?limit=10&sort=datedesc&search=${encodeURI(scene.title)}`;
|
|
||||||
const searchRes = await bhttp.get(searchUrl, {
|
|
||||||
decodeJSON: true,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (searchRes.statusCode === 200 && searchRes.body.code === 200) {
|
|
||||||
const sceneMatch = searchRes.body.responseData.find(item => slugify(item.name) === slugify(scene.title));
|
|
||||||
|
|
||||||
if (sceneMatch) {
|
|
||||||
return {
|
|
||||||
...scene,
|
|
||||||
url: `${site.url}${sceneMatch.url}`,
|
|
||||||
date: date(sceneMatch.release_date, 'YYYY-MM-DD'),
|
|
||||||
};
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return scene;
|
return scene;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue