diff --git a/public/img/logos/hush/network.png b/public/img/logos/hush/network.png new file mode 100644 index 00000000..5a065345 Binary files /dev/null and b/public/img/logos/hush/network.png differ diff --git a/public/img/logos/hushpass/milfinvaders.png b/public/img/logos/hushpass/milfinvaders.png new file mode 100644 index 00000000..da7674ec Binary files /dev/null and b/public/img/logos/hushpass/milfinvaders.png differ diff --git a/public/img/logos/hussiepass/hushpass.png b/public/img/logos/hushpass/network.png similarity index 100% rename from public/img/logos/hussiepass/hushpass.png rename to public/img/logos/hushpass/network.png diff --git a/public/img/logos/hussiepass/shotherfirst.png b/public/img/logos/hushpass/shotherfirst.png similarity index 100% rename from public/img/logos/hussiepass/shotherfirst.png rename to public/img/logos/hushpass/shotherfirst.png diff --git a/public/img/logos/hussiepass/hussiepass.png b/public/img/logos/hussiepass/hussiepass.png index 30979d88..490d2d03 100644 Binary files a/public/img/logos/hussiepass/hussiepass.png and b/public/img/logos/hussiepass/hussiepass.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_25d.png b/public/img/logos/hussiepass/misc/hussie-pass_25d.png new file mode 100644 index 00000000..2ea61b27 Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_25d.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_25d_notld.png b/public/img/logos/hussiepass/misc/hussie-pass_25d_notld.png new file mode 100644 index 00000000..7dbae9a3 Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_25d_notld.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_3d.png b/public/img/logos/hussiepass/misc/hussie-pass_3d.png new file mode 100644 index 00000000..19dfa2d1 Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_3d.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_3d_notld.png b/public/img/logos/hussiepass/misc/hussie-pass_3d_notld.png new file mode 100644 index 00000000..a7828a1b Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_3d_notld.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_flat.png b/public/img/logos/hussiepass/misc/hussie-pass_flat.png new file mode 100644 index 00000000..490d2d03 Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_flat.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_flat_notld.png b/public/img/logos/hussiepass/misc/hussie-pass_flat_notld.png new file mode 100644 index 00000000..358105ec Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_flat_notld.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass_light.png b/public/img/logos/hussiepass/misc/hussie-pass_light.png new file mode 100644 index 00000000..30979d88 Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass_light.png differ diff --git a/public/img/logos/hussiepass/network.png b/public/img/logos/hussiepass/network.png index 39043461..a2eb8821 100644 Binary files a/public/img/logos/hussiepass/network.png and b/public/img/logos/hussiepass/network.png differ diff --git a/public/img/logos/hussiepass/misc/interracial-pass.png b/public/img/logos/interracialpass/misc/interracial-pass.png similarity index 100% rename from public/img/logos/hussiepass/misc/interracial-pass.png rename to public/img/logos/interracialpass/misc/interracial-pass.png diff --git a/public/img/logos/hussiepass/interracialpass.png b/public/img/logos/interracialpass/network.png similarity index 96% rename from public/img/logos/hussiepass/interracialpass.png rename to public/img/logos/interracialpass/network.png index b039b821..6debea99 100644 Binary files a/public/img/logos/hussiepass/interracialpass.png and b/public/img/logos/interracialpass/network.png differ diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 48988594..76a87a5c 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -7,6 +7,10 @@ const parentNetworks = [ name: 'Gamma Entertainment', url: 'https://www.gammaentertainment.com', }, + { + slug: 'hush', + name: 'Hush', + }, { slug: 'mindgeek', name: 'Mind Geek', @@ -170,6 +174,19 @@ const networks = [ slug: 'hussiepass', name: 'Hussie Pass', url: 'http://www.hussiepass.com', + parent: 'hush', + }, + { + slug: 'hushpass', + name: 'Hush Pass', + url: 'http://www.hushpass.com', + parent: 'hush', + }, + { + slug: 'interracialpass', + name: 'Interracial Pass', + url: 'http://www.interracialpass.com', + parent: 'hush', }, { slug: 'insex', diff --git a/seeds/02_sites.js b/seeds/02_sites.js index fc0ce0ad..ea6e6140 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -2059,36 +2059,6 @@ const sites = [ url: 'https://www.hussiepass.com', network: 'hussiepass', }, - { - slug: 'interracialpass', - name: 'Interracial Pass', - url: 'https://www.interracialpass.com', - tags: ['interracial'], - network: 'hussiepass', - parameters: { - t1: true, - }, - }, - { - slug: 'shotherfirst', - name: 'Shot Her First', - url: 'https://shotherfirst.com', - network: 'hussiepass', - parameters: { - latest: 'https://hushpass.com/t1/categories/shot-her-first_%d_d.html', - media: 'https://hushpass.com', - t1: true, - }, - }, - { - slug: 'hushpass', - name: 'Hush Pass', - url: 'https://hushpass.com', - network: 'hussiepass', - parameters: { - t1: true, - }, - }, { slug: 'eyeontheguy', name: 'Eye On The Guy', @@ -2120,6 +2090,180 @@ const sites = [ tags: ['pov'], network: 'hussiepass', }, + // HUSH PASS + { + slug: 'hushpass', + name: 'Hush Pass', + url: 'https://hushpass.com', + network: 'hushpass', + parameters: { + t1: true, + }, + }, + { + slug: 'shotherfirst', + name: 'Shot Her First', + url: 'https://shotherfirst.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/shot-her-first_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'whitezilla', + name: 'WhiteZilla', + url: 'https://whitezilla.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/whitezilla_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'frathousefuckfest', + name: 'Frat House Fuck Fest', + url: 'https://frathousefuckfest.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/frat-house-fuck-fest_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'freakyfirsttimers', + name: 'Freaky First Timers', + url: 'https://freakyfirsttimers.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/freaky-first-timers_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'milfinvaders', + name: 'MILF Invaders', + url: 'https://milfinvaders.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/milf-invaders_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'housewivesneedcash', + name: 'Housewives Need Cash', + url: 'https://housewivesneedcash.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/housewives-need-cash_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'bubblebuttbonanza', + name: 'Bubble Butt Bonanza', + url: 'https://bubblebuttbonanza.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/bubble-butt-bonanza_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'suburbansexparty', + name: 'Suburban Sex Party', + url: 'https://suburbansexparty.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/suburban-sex-party_%_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'buttnakedinstreets', + name: 'Butt Naked In The Streets', + url: 'https://buttnakedinthestreets.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/ButtNakedInStreets_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'muffbumperpatrol', + name: 'Muff Bumper Patrol', + url: 'https://muffbumperpatrol.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/muff-bumper-patrol_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'biggathananigga', + name: 'Bigga Than A Nigga', + url: 'https://biggathananigga.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/bigga-than-a-nigga_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'bachelorpartyfuckfest', + name: 'Bachelor Party Fuck Fest', + url: 'https://bachelorpartyfuckfest.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/bachelor-party-fuck-fest_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'teencumdumpsters', + name: 'Teen Cum Dumpsters', + url: 'https://teencumdumpsters.com', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/teen-cum-dumpsters_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + { + slug: 'povhunnies', + name: 'POV Hunnies', + network: 'hushpass', + parameters: { + latest: 'https://hushpass.com/t1/categories/POVHunnies_%d_d.html', + media: 'https://hushpass.com', + t1: true, + }, + }, + // INTERRACIAL PASS + { + slug: 'interracialpass', + name: 'Interracial Pass', + url: 'https://www.interracialpass.com', + tags: ['interracial'], + network: 'interracialpass', + parameters: { + t1: true, + }, + }, // INSEX { slug: 'sexuallybroken', diff --git a/src/scrapers/hussiepass.js b/src/scrapers/hush.js similarity index 92% rename from src/scrapers/hussiepass.js rename to src/scrapers/hush.js index e547f0fa..cbbd6a17 100644 --- a/src/scrapers/hussiepass.js +++ b/src/scrapers/hush.js @@ -136,12 +136,15 @@ function scrapeSceneT1({ html, q, qa, qd, ql, qtx }, site, url, baseRelease) { const stars = q('.update-rating', true).match(/\d.\d/)?.[0]; if (stars) release.stars = Number(stars); - const channel = release.tags.find(tag => /Shot Her First/.test(tag)); - if (channel) { - release.channel = { - force: true, - slug: slugify(channel, { delimiter: '' }), - }; + if (site.slug === 'hushpass') { + const channel = release.tags.find(tag => /Shot Her First|WhiteZilla|Frat House Fuck Fest|Freaky First Timers|MILF Invaders|Housewives Need Cash|Bubble Butt Bonanza|Suburban Sex Party|Butt Naked In Streets/i.test(tag)); + + if (channel) { + release.channel = { + force: true, + slug: slugify(channel, { delimiter: '' }), + }; + } } return release; @@ -168,6 +171,7 @@ async function fetchScene(url, site, baseRelease) { } module.exports = { + // preflight, fetchLatest, fetchScene, }; diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index d5d36685..b91ff8f4 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -19,7 +19,7 @@ const famedigital = require('./famedigital'); const fantasymassage = require('./fantasymassage'); const fullpornnetwork = require('./fullpornnetwork'); const girlsway = require('./girlsway'); -const hussiepass = require('./hussiepass'); +const hush = require('./hush'); const iconmale = require('./iconmale'); const insex = require('./insex'); const jayrock = require('./jayrock'); @@ -87,8 +87,10 @@ module.exports = { fullpornnetwork, girlsway, girlgirl: julesjordan, - hussiepass, + hussiepass: hush, + hushpass: hush, insex, + interracialpass: hush, jayrock, julesjordan, kellymadison,