diff --git a/assets/components/header/header.vue b/assets/components/header/header.vue index c4cf238d..f054b606 100644 --- a/assets/components/header/header.vue +++ b/assets/components/header/header.vue @@ -180,10 +180,6 @@ export default { .icon { fill: $shadow; } - - &:focus .icon { - fill: $primary; - } } .search-compact { diff --git a/public/img/logos/hussiepass/eyeontheguy.png b/public/img/logos/hussiepass/eyeontheguy.png new file mode 100644 index 00000000..74e73a31 Binary files /dev/null and b/public/img/logos/hussiepass/eyeontheguy.png differ diff --git a/public/img/logos/hussiepass/favicon.png b/public/img/logos/hussiepass/favicon.png new file mode 100644 index 00000000..c0dcfe50 Binary files /dev/null and b/public/img/logos/hussiepass/favicon.png differ diff --git a/public/img/logos/hussiepass/hushpass.png b/public/img/logos/hussiepass/hushpass.png new file mode 100644 index 00000000..27eb9122 Binary files /dev/null and b/public/img/logos/hussiepass/hushpass.png differ diff --git a/public/img/logos/hussiepass/hussiepass.png b/public/img/logos/hussiepass/hussiepass.png new file mode 100644 index 00000000..30979d88 Binary files /dev/null and b/public/img/logos/hussiepass/hussiepass.png differ diff --git a/public/img/logos/hussiepass/interracialpass.png b/public/img/logos/hussiepass/interracialpass.png new file mode 100644 index 00000000..b039b821 Binary files /dev/null and b/public/img/logos/hussiepass/interracialpass.png differ diff --git a/public/img/logos/hussiepass/interracialpovs.png b/public/img/logos/hussiepass/interracialpovs.png new file mode 100644 index 00000000..3e830bc0 Binary files /dev/null and b/public/img/logos/hussiepass/interracialpovs.png differ diff --git a/public/img/logos/hussiepass/misc/hussie-pass.png b/public/img/logos/hussiepass/misc/hussie-pass.png new file mode 100644 index 00000000..9cf17716 Binary files /dev/null and b/public/img/logos/hussiepass/misc/hussie-pass.png differ diff --git a/public/img/logos/hussiepass/misc/interracial-pass.png b/public/img/logos/hussiepass/misc/interracial-pass.png new file mode 100644 index 00000000..2f569bcf Binary files /dev/null and b/public/img/logos/hussiepass/misc/interracial-pass.png differ diff --git a/public/img/logos/hussiepass/misc/pov-pornstars.png b/public/img/logos/hussiepass/misc/pov-pornstars.png new file mode 100644 index 00000000..af0d6815 Binary files /dev/null and b/public/img/logos/hussiepass/misc/pov-pornstars.png differ diff --git a/public/img/logos/hussiepass/network.png b/public/img/logos/hussiepass/network.png new file mode 100644 index 00000000..39043461 Binary files /dev/null and b/public/img/logos/hussiepass/network.png differ diff --git a/public/img/logos/hussiepass/povpornstars.png b/public/img/logos/hussiepass/povpornstars.png new file mode 100644 index 00000000..c72d327e Binary files /dev/null and b/public/img/logos/hussiepass/povpornstars.png differ diff --git a/public/img/logos/hussiepass/seehimfuck.png b/public/img/logos/hussiepass/seehimfuck.png new file mode 100644 index 00000000..279dd5a7 Binary files /dev/null and b/public/img/logos/hussiepass/seehimfuck.png differ diff --git a/public/img/logos/hussiepass/shotherfirst.png b/public/img/logos/hussiepass/shotherfirst.png new file mode 100644 index 00000000..c53a742f Binary files /dev/null and b/public/img/logos/hussiepass/shotherfirst.png differ diff --git a/seeds/00_tags.js b/seeds/00_tags.js index bcc4573d..5788f5b5 100644 --- a/seeds/00_tags.js +++ b/seeds/00_tags.js @@ -164,6 +164,10 @@ const tags = [ slug: 'bbc', group: 'body', }, + { + name: 'behind the scenes', + slug: 'behind-the-scenes', + }, { name: 'big dick', slug: 'big-dick', @@ -511,6 +515,12 @@ const tags = [ name: 'massage', slug: 'massage', }, + { + name: 'male focus', + slug: 'male-focus', + priority: 7, + description: 'Straight porn highlighting the male talent.', + }, { name: 'masturbation', slug: 'masturbation', @@ -894,6 +904,11 @@ const aliases = [ name: 'boob fucking', for: 'titty-fuck', }, + { + name: 'bts', + for: 'behind-the-scenes', + secondary: true, + }, { name: 'mfm', for: 'mmf', diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 8b8431a3..48988594 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -166,6 +166,11 @@ const networks = [ name: 'Girl Girl', url: 'https://www.girlgirl.com', }, + { + slug: 'hussiepass', + name: 'Hussie Pass', + url: 'http://www.hussiepass.com', + }, { slug: 'insex', name: 'Insex', diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 4f2b3d56..62cfc5f6 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -2052,6 +2052,66 @@ const sites = [ scene: 'https://www.girlsway.com/en/video', }, }, + // HUSSIE PASS + { + slug: 'hussiepass', + name: 'Hussie Pass', + 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://hushpass.com/tgp/', + network: 'hussiepass', + }, + { + slug: 'hushpass', + name: 'hushpass', + url: 'https://hushpass.com', + network: 'hussiepass', + }, + { + slug: 'eyeontheguy', + name: 'Eye On The Guy', + url: 'https://eyeontheguy.com', + tags: ['male-focus'], + network: 'hussiepass', + parameters: { + t1: true, + }, + }, + { + slug: 'seehimfuck', + name: 'See Him Fuck', + url: 'https://seehimfuck.com', + tags: ['male-focus'], + network: 'hussiepass', + }, + { + slug: 'interracialpovs', + name: 'Interracial POVs', + url: 'https://www.interracialpovs.com', + tags: ['interracial', 'pov'], + network: 'hussiepass', + }, + { + slug: 'povpornstars', + name: 'POV Pornstars', + url: 'https://www.povpornstars.com', + tags: ['pov'], + network: 'hussiepass', + }, // INSEX { slug: 'sexuallybroken', diff --git a/src/releases.js b/src/releases.js index a6865f8b..3f62e660 100644 --- a/src/releases.js +++ b/src/releases.js @@ -17,6 +17,7 @@ const { } = require('./media'); const { fetchSites, findSiteByUrl } = require('./sites'); const slugify = require('./utils/slugify'); +const capitalize = require('./utils/capitalize'); function commonQuery(queryBuilder, { filter = [], @@ -308,7 +309,17 @@ function accumulateActors(releases) { if (actor.name) acc[actorSlug] = { ...acc[actorSlug], ...actor }; // actor input contains profile info if (actor.avatar) { - acc[actorSlug].avatars = acc[actorSlug].avatars.concat([actor.avatar]); // don't flatten fallbacks + const avatar = Array.isArray(actor.avatar) + ? actor.avatar.map(avatarX => ({ + src: avatarX.src || avatarX, + copyright: avatarX.copyright === undefined ? capitalize(release.site?.network?.name) : avatarX.copyright, + })) + : { + src: actor.avatar.src || actor.avatar, + copyright: actor.avatar.copyright === undefined ? capitalize(release.site?.network?.name) : actor.avatar.copyright, + }; + + acc[actorSlug].avatars = acc[actorSlug].avatars.concat([avatar]); // don't flatten fallbacks } }); diff --git a/src/scrapers/hussiepass.js b/src/scrapers/hussiepass.js new file mode 100644 index 00000000..a8b739d4 --- /dev/null +++ b/src/scrapers/hussiepass.js @@ -0,0 +1,165 @@ +'use strict'; + +// const util = require('util'); + +const { get, geta, fd } = require('../utils/q'); +const slugify = require('../utils/slugify'); + +function scrapeLatest(scenes, site) { + return scenes.map(({ q, qu, qd, ql }) => { + const release = {}; + + release.entryId = q('.modelimg img', 'id').match(/set-target-(\d+)/)[1]; + + release.title = q('h3 a', 'title') || q('h3 a', true); + release.url = qu('h3 a'); + + release.date = qd('.modeldata p', 'YYYY-MM-DD', /\d{4}-\d{2}-\d{2}/); + release.duration = ql('.modeldata p'); + + if (/bts|behind the scenes/i.test(release.title)) release.tags = ['behind-the-scenes']; + + release.poster = [ + q('.modelimg img', 'src0_3x'), + q('.modelimg img', 'src0_2x'), + q('.modelimg img', 'src0_1x'), + ].filter(Boolean).map(src => `${site.url}${src}`); + + return release; + }); +} + +function scrapeLatestT1(scenes, site) { + return scenes.map(({ q, qi, qd, ql, qu }) => { + const release = {}; + + release.title = q('h4 a', 'title') || q('h4 a', true); + release.url = qu('h4 a'); + + release.date = qd('.more-info-div', 'MMM D, YYYY'); + release.duration = ql('.more-info-div'); + + release.entryId = q('.img-div img', 'id')?.match(/set-target-(\d+)/)[1] + || `${slugify(fd(release.date, 'YYYY-MM-DD'))}-${slugify(release.title)}`; + + const posterPath = q('.img-div img', 'src0_1x') || qi('img.video_placeholder'); + + if (posterPath) { + const poster = /^http/.test(posterPath) ? posterPath : `${site.url}${posterPath}`; + + release.poster = [ + poster.replace('-1x', '-3x'), + poster.replace('-1x', '-2x'), + poster, + ]; + } + + return release; + }); +} + +function scrapeScene({ html, q, qa, qd, ql }, site, url, baseRelease) { + const release = {}; + + release.entryId = html.match(/set-target-(\d+)/)[1]; + release.title = q('.centerwrap h2', true); + release.description = q('.videocontent p', true); + + release.date = qd('.videodetails .date', 'MM/DD/YYYY'); + release.duration = ql('.videodetails .date'); + + release.actors = qa('.modelname a', true); + + const posterPath = html.match(/poster="([\w-/.]+)"/)?.[1]; + + if (posterPath && !/400.jpg/.test(posterPath)) { + const poster = `${site.url}${posterPath}`; + release.poster = [ + poster, + // upscaled + poster.replace('-1x', '-2x'), + poster.replace('-1x', '-3x'), + ]; + + if (baseRelease?.poster) release.photos = [baseRelease.poster]; + } + + const trailerPath = html.match(/\/trailers\/.*.mp4/); + if (trailerPath) release.trailer = { src: `${site.url}${trailerPath}` }; + + const stars = q('.modelrates + p', true).match(/\d.\d/)?.[0]; + if (stars) release.stars = Number(stars); + + return release; +} + +function scrapeSceneT1({ html, q, qa, qd, ql, qtx }, site, url, baseRelease) { + const release = {}; + + release.title = q('.trailer-section-head .section-title', true); + release.description = qtx('.row .update-info-block'); + + release.date = qd('.update-info-row', 'MMM D, YYYY', /\w+ \d{1,2}, \d{4}/); + release.duration = ql('.update-info-row:nth-child(2)'); + + release.entryId = q('.player-thumb img', 'id').match(/set-target-(\d+)/)[1] + || `${slugify(fd(release.date, 'YYYY-MM-DD'))}-${slugify(release.title)}`; + + release.actors = qa('.models-list-thumbs a').map(el => ({ + name: q(el, 'span', true), + avatar: [ + q(el, 'img', 'src0_3x'), + q(el, 'img', 'src0_2x'), + q(el, 'img', 'src0_1x'), + ].filter(Boolean).map(src => `${site.url}${src}`), + })); + + release.tags = qa('.tags a', true); + + const posterPath = html.match(/poster="(.*\.jpg)/)?.[1]; + + if (posterPath && !/400.jpg/.test(posterPath)) { + const poster = `${site.url}${posterPath}`; + release.poster = [ + poster, + // upscaled + poster.replace('-1x', '-2x'), + poster.replace('-1x', '-3x'), + ]; + + if (baseRelease?.poster) release.photos = [baseRelease.poster]; + } + + const trailer = html.match(/