diff --git a/config/default.js b/config/default.js index cc2ab1183..61d811602 100644 --- a/config/default.js +++ b/config/default.js @@ -302,6 +302,10 @@ module.exports = { interval: 1000, concurrency: 1, }, + 'www.mofos.com': { + interval: 1000, + concurrency: 1, + }, 'westcoastproductions.com': { interval: 100, concurrency: 1, diff --git a/public/img/logos/mofos/ebonysextapes.png b/public/img/logos/mofos/ebonysextapes.png index 43cefcf74..a5a108623 100644 Binary files a/public/img/logos/mofos/ebonysextapes.png and b/public/img/logos/mofos/ebonysextapes.png differ diff --git a/public/img/logos/mofos/lazy/dontbreakme.png b/public/img/logos/mofos/lazy/dontbreakme.png index 9b2e4f06a..10436bce6 100644 Binary files a/public/img/logos/mofos/lazy/dontbreakme.png and b/public/img/logos/mofos/lazy/dontbreakme.png differ diff --git a/public/img/logos/mofos/lazy/ebonysextapes.png b/public/img/logos/mofos/lazy/ebonysextapes.png index f50a5b8e6..381acd699 100644 Binary files a/public/img/logos/mofos/lazy/ebonysextapes.png and b/public/img/logos/mofos/lazy/ebonysextapes.png differ diff --git a/public/img/logos/mofos/lazy/favicon.png b/public/img/logos/mofos/lazy/favicon.png index 652bfa325..2c7152c39 100644 Binary files a/public/img/logos/mofos/lazy/favicon.png and b/public/img/logos/mofos/lazy/favicon.png differ diff --git a/public/img/logos/mofos/lazy/favicon_dark.png b/public/img/logos/mofos/lazy/favicon_dark.png new file mode 100644 index 000000000..d24345b2d Binary files /dev/null and b/public/img/logos/mofos/lazy/favicon_dark.png differ diff --git a/public/img/logos/mofos/lazy/favicon_light.png b/public/img/logos/mofos/lazy/favicon_light.png new file mode 100644 index 000000000..17e5943bc Binary files /dev/null and b/public/img/logos/mofos/lazy/favicon_light.png differ diff --git a/public/img/logos/mofos/lazy/girlsgonepink.png b/public/img/logos/mofos/lazy/girlsgonepink.png index 6066aeaa5..81b056d5a 100644 Binary files a/public/img/logos/mofos/lazy/girlsgonepink.png and b/public/img/logos/mofos/lazy/girlsgonepink.png differ diff --git a/public/img/logos/mofos/lazy/iknowthatgirl.png b/public/img/logos/mofos/lazy/iknowthatgirl.png index d11c597fb..71d169db0 100644 Binary files a/public/img/logos/mofos/lazy/iknowthatgirl.png and b/public/img/logos/mofos/lazy/iknowthatgirl.png differ diff --git a/public/img/logos/mofos/lazy/latinasextapes.png b/public/img/logos/mofos/lazy/latinasextapes.png index b2d02e0f0..436d27130 100644 Binary files a/public/img/logos/mofos/lazy/latinasextapes.png and b/public/img/logos/mofos/lazy/latinasextapes.png differ diff --git a/public/img/logos/mofos/lazy/letstryanal.png b/public/img/logos/mofos/lazy/letstryanal.png index 2c15e7b2d..e8c881465 100644 Binary files a/public/img/logos/mofos/lazy/letstryanal.png and b/public/img/logos/mofos/lazy/letstryanal.png differ diff --git a/public/img/logos/mofos/lazy/mofosbsides.png b/public/img/logos/mofos/lazy/mofosbsides.png index cb572c698..7d45b56a1 100644 Binary files a/public/img/logos/mofos/lazy/mofosbsides.png and b/public/img/logos/mofos/lazy/mofosbsides.png differ diff --git a/public/img/logos/mofos/lazy/mofoslab.png b/public/img/logos/mofos/lazy/mofoslab.png index 93ce00ce6..98d1b942d 100644 Binary files a/public/img/logos/mofos/lazy/mofoslab.png and b/public/img/logos/mofos/lazy/mofoslab.png differ diff --git a/public/img/logos/mofos/lazy/network.png b/public/img/logos/mofos/lazy/network.png index bd8bd2f3f..c8fb9946e 100644 Binary files a/public/img/logos/mofos/lazy/network.png and b/public/img/logos/mofos/lazy/network.png differ diff --git a/public/img/logos/mofos/lazy/pervsonpatrol.png b/public/img/logos/mofos/lazy/pervsonpatrol.png index 3384a0f95..ceaf1f8f1 100644 Binary files a/public/img/logos/mofos/lazy/pervsonpatrol.png and b/public/img/logos/mofos/lazy/pervsonpatrol.png differ diff --git a/public/img/logos/mofos/lazy/publicpickups.png b/public/img/logos/mofos/lazy/publicpickups.png index efea21f0a..59c1c74f1 100644 Binary files a/public/img/logos/mofos/lazy/publicpickups.png and b/public/img/logos/mofos/lazy/publicpickups.png differ diff --git a/public/img/logos/mofos/lazy/realslutparty.png b/public/img/logos/mofos/lazy/realslutparty.png index 612f91438..04c8974d9 100644 Binary files a/public/img/logos/mofos/lazy/realslutparty.png and b/public/img/logos/mofos/lazy/realslutparty.png differ diff --git a/public/img/logos/mofos/lazy/sharemybf.png b/public/img/logos/mofos/lazy/sharemybf.png index 3be2a31b8..2e1034cd8 100644 Binary files a/public/img/logos/mofos/lazy/sharemybf.png and b/public/img/logos/mofos/lazy/sharemybf.png differ diff --git a/public/img/logos/mofos/lazy/shesafreak.png b/public/img/logos/mofos/lazy/shesafreak.png index bb70ec834..7ab35b540 100644 Binary files a/public/img/logos/mofos/lazy/shesafreak.png and b/public/img/logos/mofos/lazy/shesafreak.png differ diff --git a/public/img/logos/mofos/lazy/strandedteens.png b/public/img/logos/mofos/lazy/strandedteens.png index 86276532d..3ffaff8fd 100644 Binary files a/public/img/logos/mofos/lazy/strandedteens.png and b/public/img/logos/mofos/lazy/strandedteens.png differ diff --git a/public/img/logos/mofos/misc/ebony-sex-tapes_dark.png b/public/img/logos/mofos/misc/ebony-sex-tapes_dark.png new file mode 100644 index 000000000..a03466d2e Binary files /dev/null and b/public/img/logos/mofos/misc/ebony-sex-tapes_dark.png differ diff --git a/public/img/logos/mofos/misc/mofos-lab_dark.png b/public/img/logos/mofos/misc/mofos-lab_dark.png new file mode 100644 index 000000000..e344813ea Binary files /dev/null and b/public/img/logos/mofos/misc/mofos-lab_dark.png differ diff --git a/public/img/logos/mofos/mofoslab.png b/public/img/logos/mofos/mofoslab.png index e344813ea..9e9a6b0e7 100644 Binary files a/public/img/logos/mofos/mofoslab.png and b/public/img/logos/mofos/mofoslab.png differ diff --git a/public/img/logos/mofos/thumbs/dontbreakme.png b/public/img/logos/mofos/thumbs/dontbreakme.png index e74e07303..53c936798 100644 Binary files a/public/img/logos/mofos/thumbs/dontbreakme.png and b/public/img/logos/mofos/thumbs/dontbreakme.png differ diff --git a/public/img/logos/mofos/thumbs/ebonysextapes.png b/public/img/logos/mofos/thumbs/ebonysextapes.png index 075862d18..cafb4b852 100644 Binary files a/public/img/logos/mofos/thumbs/ebonysextapes.png and b/public/img/logos/mofos/thumbs/ebonysextapes.png differ diff --git a/public/img/logos/mofos/thumbs/favicon.png b/public/img/logos/mofos/thumbs/favicon.png index 8df8f6369..2c7152c39 100644 Binary files a/public/img/logos/mofos/thumbs/favicon.png and b/public/img/logos/mofos/thumbs/favicon.png differ diff --git a/public/img/logos/mofos/thumbs/favicon_dark.png b/public/img/logos/mofos/thumbs/favicon_dark.png new file mode 100644 index 000000000..d24345b2d Binary files /dev/null and b/public/img/logos/mofos/thumbs/favicon_dark.png differ diff --git a/public/img/logos/mofos/thumbs/favicon_light.png b/public/img/logos/mofos/thumbs/favicon_light.png new file mode 100644 index 000000000..17e5943bc Binary files /dev/null and b/public/img/logos/mofos/thumbs/favicon_light.png differ diff --git a/public/img/logos/mofos/thumbs/girlsgonepink.png b/public/img/logos/mofos/thumbs/girlsgonepink.png index 2a7d27e34..9ce445b1d 100644 Binary files a/public/img/logos/mofos/thumbs/girlsgonepink.png and b/public/img/logos/mofos/thumbs/girlsgonepink.png differ diff --git a/public/img/logos/mofos/thumbs/iknowthatgirl.png b/public/img/logos/mofos/thumbs/iknowthatgirl.png index afbbdfed8..59e5a145e 100644 Binary files a/public/img/logos/mofos/thumbs/iknowthatgirl.png and b/public/img/logos/mofos/thumbs/iknowthatgirl.png differ diff --git a/public/img/logos/mofos/thumbs/latinasextapes.png b/public/img/logos/mofos/thumbs/latinasextapes.png index 8052a5bd2..0ddcd35e4 100644 Binary files a/public/img/logos/mofos/thumbs/latinasextapes.png and b/public/img/logos/mofos/thumbs/latinasextapes.png differ diff --git a/public/img/logos/mofos/thumbs/letstryanal.png b/public/img/logos/mofos/thumbs/letstryanal.png index 71079ab53..843b9ae9d 100644 Binary files a/public/img/logos/mofos/thumbs/letstryanal.png and b/public/img/logos/mofos/thumbs/letstryanal.png differ diff --git a/public/img/logos/mofos/thumbs/mofosbsides.png b/public/img/logos/mofos/thumbs/mofosbsides.png index 214c204e7..a23d27fe3 100644 Binary files a/public/img/logos/mofos/thumbs/mofosbsides.png and b/public/img/logos/mofos/thumbs/mofosbsides.png differ diff --git a/public/img/logos/mofos/thumbs/mofoslab.png b/public/img/logos/mofos/thumbs/mofoslab.png index 638ee9928..efc27ad4b 100644 Binary files a/public/img/logos/mofos/thumbs/mofoslab.png and b/public/img/logos/mofos/thumbs/mofoslab.png differ diff --git a/public/img/logos/mofos/thumbs/network.png b/public/img/logos/mofos/thumbs/network.png index cd8a5e361..442453f86 100644 Binary files a/public/img/logos/mofos/thumbs/network.png and b/public/img/logos/mofos/thumbs/network.png differ diff --git a/public/img/logos/mofos/thumbs/pervsonpatrol.png b/public/img/logos/mofos/thumbs/pervsonpatrol.png index a18273369..7808719b9 100644 Binary files a/public/img/logos/mofos/thumbs/pervsonpatrol.png and b/public/img/logos/mofos/thumbs/pervsonpatrol.png differ diff --git a/public/img/logos/mofos/thumbs/publicpickups.png b/public/img/logos/mofos/thumbs/publicpickups.png index c9064f0f6..915980145 100644 Binary files a/public/img/logos/mofos/thumbs/publicpickups.png and b/public/img/logos/mofos/thumbs/publicpickups.png differ diff --git a/public/img/logos/mofos/thumbs/realslutparty.png b/public/img/logos/mofos/thumbs/realslutparty.png index db9054313..0704f879e 100644 Binary files a/public/img/logos/mofos/thumbs/realslutparty.png and b/public/img/logos/mofos/thumbs/realslutparty.png differ diff --git a/public/img/logos/mofos/thumbs/sharemybf.png b/public/img/logos/mofos/thumbs/sharemybf.png index cec9484cb..f75bab204 100644 Binary files a/public/img/logos/mofos/thumbs/sharemybf.png and b/public/img/logos/mofos/thumbs/sharemybf.png differ diff --git a/public/img/logos/mofos/thumbs/shesafreak.png b/public/img/logos/mofos/thumbs/shesafreak.png index b94e6d3ff..16f1108ed 100644 Binary files a/public/img/logos/mofos/thumbs/shesafreak.png and b/public/img/logos/mofos/thumbs/shesafreak.png differ diff --git a/public/img/logos/mofos/thumbs/strandedteens.png b/public/img/logos/mofos/thumbs/strandedteens.png index c155505c9..48bdb3fc0 100644 Binary files a/public/img/logos/mofos/thumbs/strandedteens.png and b/public/img/logos/mofos/thumbs/strandedteens.png differ diff --git a/seeds/02_sites.js b/seeds/02_sites.js index fe8babe7d..51e164319 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -4702,7 +4702,7 @@ const sites = [ slug: 'boundgangbangs', name: 'Bound Gangbangs', alias: ['bgb', 'bgbs'], - url: 'https://www.kink.com/channel/boundgangbangs', + url: 'https://www.kink.com/channel/bound-gangbangs', description: 'Powerless whores tied in bondage and stuffed with a cock in every hole. At BoundGangbangs women get surprise extreme gangbangs, blindfolds, deepthroat blowjobs, sex punishment, bondage, double penetration and interracial sex.', parent: 'kink', }, @@ -4807,7 +4807,7 @@ const sites = [ { slug: 'hardcoregangbang', name: 'Hardcore Gangbang', - url: 'https://www.kink.com/channel/hardcoregangbang', + url: 'https://www.kink.com/channel/hardcore-gangbang', description: "Where all women's hardcore gangbang fantasies come true. Watch extreme, brutal gangbangs with pornstars, models, & MILFs that crave cock in every hole. HardcoreGangbang.com has the best creampie gang bangs online.", parent: 'kink', }, diff --git a/src/scrapers/vixen.js b/src/scrapers/vixen.js index 0f3ef35eb..c945a52f2 100644 --- a/src/scrapers/vixen.js +++ b/src/scrapers/vixen.js @@ -4,6 +4,7 @@ const Promise = require('bluebird'); const moment = require('moment'); +const logger = require('../logger')(__filename); const http = require('../utils/http'); const slugify = require('../utils/slugify'); @@ -141,24 +142,67 @@ async function getTrailer(scene, channel, url) { return null; } -async function getPhotos(url) { +async function getPhotosLegacy(url) { const htmlRes = await http.get(url, { extract: { runScripts: 'dangerously', }, }); - const state = htmlRes?.window.__APOLLO_STATE__; - const key = Object.values(state.ROOT_QUERY).find((query) => query?.__ref)?.__ref; - const data = state[key]; + try { + const state = htmlRes?.window?.__APOLLO_STATE__; - console.log(data); + if (!state) { + return []; + } - if (!data) { + const key = Object.values(state?.ROOT_QUERY).find((query) => query?.__ref)?.__ref; + const data = state[key]; + + if (!data) { + return []; + } + + return data.carousel.slice(1).map((photo) => photo.main?.[0].src).filter(Boolean); + } catch (error) { + logger.warn(`Failed to retrieve Vixen images: ${error.message}`); return []; } +} - return data.carousel.slice(1).map((photo) => photo.main?.[0].src).filter(Boolean); +async function getPhotos(url) { + const htmlRes = await http.get(url, { + parse: true, + extract: { + runScripts: 'dangerously', + }, + }); + + try { + const state = htmlRes?.window?.__APOLLO_STATE__; + + console.log('state', state); + + if (!state) { + return []; + } + + const key = Object.values(state?.ROOT_QUERY).find((query) => query?.__ref)?.__ref; + const data = state[key]; + + console.log('data', data); + + if (!data) { + return []; + } + + console.log(data.carousel); + + return data.carousel.slice(1).map((photo) => photo.main?.[0].src).filter(Boolean); + } catch (error) { + logger.warn(`Failed to retrieve Vixen images: ${error.message}`); + return []; + } } function scrapeAll(scenes, site, origin) {