diff --git a/public/img/logos/zerotolerance/addicted2girls.png b/public/img/logos/zerotolerance/addicted2girls.png new file mode 100644 index 00000000..d673af2c Binary files /dev/null and b/public/img/logos/zerotolerance/addicted2girls.png differ diff --git a/public/img/logos/zerotolerance/favicon.png b/public/img/logos/zerotolerance/favicon.png new file mode 100644 index 00000000..18bb3032 Binary files /dev/null and b/public/img/logos/zerotolerance/favicon.png differ diff --git a/public/img/logos/zerotolerance/genderx.png b/public/img/logos/zerotolerance/genderx.png new file mode 100644 index 00000000..d2212e65 Binary files /dev/null and b/public/img/logos/zerotolerance/genderx.png differ diff --git a/public/img/logos/zerotolerance/lazy/addicted2girls.png b/public/img/logos/zerotolerance/lazy/addicted2girls.png new file mode 100644 index 00000000..4ead4745 Binary files /dev/null and b/public/img/logos/zerotolerance/lazy/addicted2girls.png differ diff --git a/public/img/logos/zerotolerance/lazy/favicon.png b/public/img/logos/zerotolerance/lazy/favicon.png new file mode 100644 index 00000000..cd74c4e8 Binary files /dev/null and b/public/img/logos/zerotolerance/lazy/favicon.png differ diff --git a/public/img/logos/zerotolerance/lazy/genderx.png b/public/img/logos/zerotolerance/lazy/genderx.png new file mode 100644 index 00000000..8e87cf3d Binary files /dev/null and b/public/img/logos/zerotolerance/lazy/genderx.png differ diff --git a/public/img/logos/zerotolerance/lazy/network.png b/public/img/logos/zerotolerance/lazy/network.png new file mode 100644 index 00000000..a8de2aa4 Binary files /dev/null and b/public/img/logos/zerotolerance/lazy/network.png differ diff --git a/public/img/logos/zerotolerance/lazy/zerotolerance.png b/public/img/logos/zerotolerance/lazy/zerotolerance.png new file mode 100644 index 00000000..df3d68a8 Binary files /dev/null and b/public/img/logos/zerotolerance/lazy/zerotolerance.png differ diff --git a/public/img/logos/zerotolerance/misc/addicted-2-girls.svg b/public/img/logos/zerotolerance/misc/addicted-2-girls.svg new file mode 100644 index 00000000..d9bcd82d --- /dev/null +++ b/public/img/logos/zerotolerance/misc/addicted-2-girls.svg @@ -0,0 +1,134 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/public/img/logos/zerotolerance/misc/gender-x.svg b/public/img/logos/zerotolerance/misc/gender-x.svg new file mode 100644 index 00000000..c319c9f1 --- /dev/null +++ b/public/img/logos/zerotolerance/misc/gender-x.svg @@ -0,0 +1 @@ +GenderX-logo-WHITE \ No newline at end of file diff --git a/public/img/logos/zerotolerance/network.png b/public/img/logos/zerotolerance/network.png new file mode 100644 index 00000000..7594f36f Binary files /dev/null and b/public/img/logos/zerotolerance/network.png differ diff --git a/public/img/logos/zerotolerance/thumbs/addicted2girls.png b/public/img/logos/zerotolerance/thumbs/addicted2girls.png new file mode 100644 index 00000000..6179e1ed Binary files /dev/null and b/public/img/logos/zerotolerance/thumbs/addicted2girls.png differ diff --git a/public/img/logos/zerotolerance/thumbs/favicon.png b/public/img/logos/zerotolerance/thumbs/favicon.png new file mode 100644 index 00000000..cd74c4e8 Binary files /dev/null and b/public/img/logos/zerotolerance/thumbs/favicon.png differ diff --git a/public/img/logos/zerotolerance/thumbs/genderx.png b/public/img/logos/zerotolerance/thumbs/genderx.png new file mode 100644 index 00000000..c1e68b98 Binary files /dev/null and b/public/img/logos/zerotolerance/thumbs/genderx.png differ diff --git a/public/img/logos/zerotolerance/thumbs/network.png b/public/img/logos/zerotolerance/thumbs/network.png new file mode 100644 index 00000000..4dc9d3da Binary files /dev/null and b/public/img/logos/zerotolerance/thumbs/network.png differ diff --git a/public/img/logos/zerotolerance/thumbs/zerotolerance.png b/public/img/logos/zerotolerance/thumbs/zerotolerance.png new file mode 100644 index 00000000..d6fe7c15 Binary files /dev/null and b/public/img/logos/zerotolerance/thumbs/zerotolerance.png differ diff --git a/public/img/logos/zerotolerance/zerotolerance.png b/public/img/logos/zerotolerance/zerotolerance.png new file mode 100644 index 00000000..06f061e6 Binary files /dev/null and b/public/img/logos/zerotolerance/zerotolerance.png differ diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 0530914d..e358588f 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -465,6 +465,13 @@ const networks = [ description: 'XEmpire.com brings you today\'s top pornstars in beautifully shot, HD sex scenes across 4 unique porn sites of gonzo porn, interracial, lesbian & erotica!', parent: 'gamma', }, + { + slug: 'zerotolerance', + name: 'Zero Tolerance', + alias: ['ztod'], + url: 'http://www.ztod.com', + parent: 'gamma', + }, ]; exports.seed = knex => Promise.resolve() diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 7a524a99..67184153 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -8555,6 +8555,27 @@ const sites = [ tags: ['lesbian'], parent: 'xempire', }, + // ZERO TOLERANCE + { + slug: 'addicted2girls', + name: 'Addicted 2 Girls', + url: 'https://www.addicted2girls.com', + tags: ['lesbian'], + parent: 'zerotolerance', + parameters: { + scene: 'https://www.addicted2girls.com/en/video/addicted2girls', + }, + }, + { + slug: 'genderx', + name: 'GenderX', + url: 'https://www.genderx.com', + tags: ['transsexual'], + parent: 'zerotolerance', + parameters: { + scene: 'https://www.genderx.com/en/video', + }, + }, ]; /* eslint-disable max-len */ @@ -8645,7 +8666,6 @@ exports.seed = knex => Promise.resolve() 'tog' => 'TonightsGirlfriend', 'wowg' => 'WowGirls', 'wy' => 'WebYoung', - 'ztod' => 'ZeroTolerance', 'itc' => 'InTheCrack', "abbw" => "AbbyWinters", "abme" => "AbuseMe", diff --git a/src/actors.js b/src/actors.js index 55b19042..53d0b078 100644 --- a/src/actors.js +++ b/src/actors.js @@ -302,9 +302,8 @@ async function curateProfile(profile) { curatedProfile.piercings = profile.piercings?.trim() || null; curatedProfile.gender = (/female/i.test(profile.gender) && 'female') - || (/shemale/i.test(profile.gender) && 'transsexual') + || (/shemale|trans/i.test(profile.gender) && 'transsexual') || (/male/i.test(profile.gender) && 'male') - || (/trans/i.test(profile.gender) && 'transsexual') || null; const dateOfBirth = profile.dateOfBirth || profile.birthdate; @@ -725,15 +724,14 @@ async function getOrCreateActors(baseActors, batchId) { }, }), {}); - const newActorProfiles = baseActors + const newActorProfiles = await Promise.all(baseActors .filter(actor => actor.hasProfile) .map(actor => ({ ...actor, id: newActorIdsByEntityIdAndSlug[actor.entity?.id]?.[actor.slug] || newActorIdsByEntityIdAndSlug.null?.[actor.slug], })) - .filter(actor => !!actor.id); - - console.log(newActorIdsByEntityIdAndSlug, newActorProfiles); + .filter(actor => !!actor.id) + .map(actor => curateProfile(actor))); await storeProfiles(newActorProfiles); diff --git a/src/scrapers/gamma.js b/src/scrapers/gamma.js index 38eccb8e..0d6059da 100644 --- a/src/scrapers/gamma.js +++ b/src/scrapers/gamma.js @@ -9,6 +9,7 @@ const moment = require('moment'); const logger = require('../logger')(__filename); const { ex, get } = require('../utils/q'); +const http = require('../utils/http'); const slugify = require('../utils/slugify'); function getAlbumUrl(albumPath, site) { @@ -398,7 +399,7 @@ async function fetchApiCredentials(referer, site) { return getApiUrl(site.parameters.appId, site.parameters.apiKey); } - const res = await bhttp.get(referer); + const res = await http.get(referer); const body = res.body.toString(); const apiLine = body.split('\n').find(bodyLine => bodyLine.match('apiKey')); @@ -433,6 +434,8 @@ async function fetchApiLatest(site, page = 1, preData, include, upcoming = false encodeJSON: true, }); + console.log(page, res.statusCode, res.body.results); + if (res.statusCode === 200 && res.body.results?.[0]?.hits) { return scrapeApiReleases(res.body.results[0].hits, site); } @@ -530,6 +533,7 @@ async function fetchScene(url, site, baseRelease) { if (res.statusCode === 200) { const mobileBody = mobileRes?.statusCode === 200 ? mobileRes.body.toString() : null; const scene = await scrapeScene(res.body.toString(), url, site, baseRelease, mobileBody); + return { ...scene, deepUrl }; } } diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index a143e39c..0dc5f2df 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -66,6 +66,7 @@ const vixen = require('./vixen'); const vogov = require('./vogov'); const wicked = require('./wicked'); const xempire = require('./xempire'); +const zerotolerance = require('./zerotolerance'); // profiles const boobpedia = require('./boobpedia'); @@ -151,6 +152,7 @@ module.exports = { whalemember, wicked, xempire, + zerotolerance, }, actors: { '21sextury': sextury, diff --git a/src/scrapers/zerotolerance.js b/src/scrapers/zerotolerance.js new file mode 100644 index 00000000..562acaa6 --- /dev/null +++ b/src/scrapers/zerotolerance.js @@ -0,0 +1,10 @@ +'use strict'; + +const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); + +module.exports = { + fetchLatest: fetchApiLatest, + fetchProfile: fetchApiProfile, + fetchScene, + fetchUpcoming: fetchApiUpcoming, +}; diff --git a/src/updates.js b/src/updates.js index d34773c5..7e7375ca 100644 --- a/src/updates.js +++ b/src/updates.js @@ -49,7 +49,7 @@ function needNextPage(releases, uniqueReleases, totalReleases, hasDates, upcomin } if (argv.last) { - return totalReleases + releases.length < argv.last; + return releases.length > 0 && totalReleases + releases.length < argv.last; } if (!hasDates) {