diff --git a/assets/components/actors/actor.vue b/assets/components/actors/actor.vue index 473674f2..40b02c82 100644 --- a/assets/components/actors/actor.vue +++ b/assets/components/actors/actor.vue @@ -51,7 +51,7 @@ @@ -310,7 +310,7 @@ diff --git a/public/img/logos/mikeadriano/allanal.png b/public/img/logos/mikeadriano/allanal.png index 579b43bb..2ea1fa66 100644 Binary files a/public/img/logos/mikeadriano/allanal.png and b/public/img/logos/mikeadriano/allanal.png differ diff --git a/public/img/logos/mikeadriano/analonly.png b/public/img/logos/mikeadriano/analonly.png new file mode 100644 index 00000000..6cc394ce Binary files /dev/null and b/public/img/logos/mikeadriano/analonly.png differ diff --git a/public/img/logos/mikeadriano/lazy/allanal.png b/public/img/logos/mikeadriano/lazy/allanal.png index 8d61f2fc..1ae16496 100644 Binary files a/public/img/logos/mikeadriano/lazy/allanal.png and b/public/img/logos/mikeadriano/lazy/allanal.png differ diff --git a/public/img/logos/mikeadriano/lazy/analonly.png b/public/img/logos/mikeadriano/lazy/analonly.png new file mode 100644 index 00000000..8d64c079 Binary files /dev/null and b/public/img/logos/mikeadriano/lazy/analonly.png differ diff --git a/public/img/logos/mikeadriano/lazy/favicon.png b/public/img/logos/mikeadriano/lazy/favicon.png index ed95e464..349eaaa3 100644 Binary files a/public/img/logos/mikeadriano/lazy/favicon.png and b/public/img/logos/mikeadriano/lazy/favicon.png differ diff --git a/public/img/logos/mikeadriano/lazy/favicon_dark.png b/public/img/logos/mikeadriano/lazy/favicon_dark.png new file mode 100644 index 00000000..cfb2181d Binary files /dev/null and b/public/img/logos/mikeadriano/lazy/favicon_dark.png differ diff --git a/public/img/logos/mikeadriano/lazy/favicon_light.png b/public/img/logos/mikeadriano/lazy/favicon_light.png new file mode 100644 index 00000000..6d9a8f00 Binary files /dev/null and b/public/img/logos/mikeadriano/lazy/favicon_light.png differ diff --git a/public/img/logos/mikeadriano/lazy/mikeadriano.png b/public/img/logos/mikeadriano/lazy/mikeadriano.png index 87cefc6a..f9787aa6 100644 Binary files a/public/img/logos/mikeadriano/lazy/mikeadriano.png and b/public/img/logos/mikeadriano/lazy/mikeadriano.png differ diff --git a/public/img/logos/mikeadriano/lazy/network.png b/public/img/logos/mikeadriano/lazy/network.png index 3b27a102..f9787aa6 100644 Binary files a/public/img/logos/mikeadriano/lazy/network.png and b/public/img/logos/mikeadriano/lazy/network.png differ diff --git a/public/img/logos/mikeadriano/lazy/nympho.png b/public/img/logos/mikeadriano/lazy/nympho.png index db39f155..e48f5506 100644 Binary files a/public/img/logos/mikeadriano/lazy/nympho.png and b/public/img/logos/mikeadriano/lazy/nympho.png differ diff --git a/public/img/logos/mikeadriano/lazy/swallowed.png b/public/img/logos/mikeadriano/lazy/swallowed.png index 678c794d..8a0688fb 100644 Binary files a/public/img/logos/mikeadriano/lazy/swallowed.png and b/public/img/logos/mikeadriano/lazy/swallowed.png differ diff --git a/public/img/logos/mikeadriano/lazy/trueanal.png b/public/img/logos/mikeadriano/lazy/trueanal.png index b01b9764..6baf0f96 100644 Binary files a/public/img/logos/mikeadriano/lazy/trueanal.png and b/public/img/logos/mikeadriano/lazy/trueanal.png differ diff --git a/public/img/logos/mikeadriano/misc/all-anal_tld.png b/public/img/logos/mikeadriano/misc/all-anal_tld.png new file mode 100644 index 00000000..579b43bb Binary files /dev/null and b/public/img/logos/mikeadriano/misc/all-anal_tld.png differ diff --git a/public/img/logos/mikeadriano/misc/anal-only.png b/public/img/logos/mikeadriano/misc/anal-only.png new file mode 100644 index 00000000..e5a665a6 Binary files /dev/null and b/public/img/logos/mikeadriano/misc/anal-only.png differ diff --git a/public/img/logos/mikeadriano/misc/true-anal_tld.png b/public/img/logos/mikeadriano/misc/true-anal_tld.png new file mode 100644 index 00000000..378c316a Binary files /dev/null and b/public/img/logos/mikeadriano/misc/true-anal_tld.png differ diff --git a/public/img/logos/mikeadriano/thumbs/allanal.png b/public/img/logos/mikeadriano/thumbs/allanal.png index 3b669192..72da582b 100644 Binary files a/public/img/logos/mikeadriano/thumbs/allanal.png and b/public/img/logos/mikeadriano/thumbs/allanal.png differ diff --git a/public/img/logos/mikeadriano/thumbs/analonly.png b/public/img/logos/mikeadriano/thumbs/analonly.png new file mode 100644 index 00000000..ac3c5361 Binary files /dev/null and b/public/img/logos/mikeadriano/thumbs/analonly.png differ diff --git a/public/img/logos/mikeadriano/thumbs/favicon.png b/public/img/logos/mikeadriano/thumbs/favicon.png index ed95e464..c059e37d 100644 Binary files a/public/img/logos/mikeadriano/thumbs/favicon.png and b/public/img/logos/mikeadriano/thumbs/favicon.png differ diff --git a/public/img/logos/mikeadriano/thumbs/favicon_dark.png b/public/img/logos/mikeadriano/thumbs/favicon_dark.png new file mode 100644 index 00000000..e2ad50d8 Binary files /dev/null and b/public/img/logos/mikeadriano/thumbs/favicon_dark.png differ diff --git a/public/img/logos/mikeadriano/thumbs/favicon_light.png b/public/img/logos/mikeadriano/thumbs/favicon_light.png new file mode 100644 index 00000000..04d64901 Binary files /dev/null and b/public/img/logos/mikeadriano/thumbs/favicon_light.png differ diff --git a/public/img/logos/mikeadriano/thumbs/mikeadriano.png b/public/img/logos/mikeadriano/thumbs/mikeadriano.png index 5e3ab82f..93a4905f 100644 Binary files a/public/img/logos/mikeadriano/thumbs/mikeadriano.png and b/public/img/logos/mikeadriano/thumbs/mikeadriano.png differ diff --git a/public/img/logos/mikeadriano/thumbs/network.png b/public/img/logos/mikeadriano/thumbs/network.png index 09b799c1..65f90a35 100644 Binary files a/public/img/logos/mikeadriano/thumbs/network.png and b/public/img/logos/mikeadriano/thumbs/network.png differ diff --git a/public/img/logos/mikeadriano/thumbs/nympho.png b/public/img/logos/mikeadriano/thumbs/nympho.png index 8b9012ad..4db7329a 100644 Binary files a/public/img/logos/mikeadriano/thumbs/nympho.png and b/public/img/logos/mikeadriano/thumbs/nympho.png differ diff --git a/public/img/logos/mikeadriano/thumbs/swallowed.png b/public/img/logos/mikeadriano/thumbs/swallowed.png index 63489248..aab38822 100644 Binary files a/public/img/logos/mikeadriano/thumbs/swallowed.png and b/public/img/logos/mikeadriano/thumbs/swallowed.png differ diff --git a/public/img/logos/mikeadriano/thumbs/trueanal.png b/public/img/logos/mikeadriano/thumbs/trueanal.png index c005d54d..d42257a4 100644 Binary files a/public/img/logos/mikeadriano/thumbs/trueanal.png and b/public/img/logos/mikeadriano/thumbs/trueanal.png differ diff --git a/public/img/logos/mikeadriano/trueanal.png b/public/img/logos/mikeadriano/trueanal.png index 378c316a..8dd563f0 100644 Binary files a/public/img/logos/mikeadriano/trueanal.png and b/public/img/logos/mikeadriano/trueanal.png differ diff --git a/seeds/01_networks.js b/seeds/01_networks.js index d54eeec6..650dcddb 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -43,6 +43,7 @@ const parentNetworks = [ url: 'https://www.21sextury.com', description: 'Watch all the latest scenes and porn video updates on 21Sextury.com, the best European porn site with the hottest pornstars from all over the world! Watch porn videos from the large network here.', parameters: { + layout: 'api', mobile: 'https://m.dpfanatics.com/en/video', }, parent: 'gamma', @@ -56,6 +57,7 @@ const networks = [ url: 'https://www.21sextreme.com', description: 'Welcome to 21Sextreme.com, your portal to fisting porn, old and young lesbians, horny grannies & extreme BDSM featuring the best Euro & American Pornstars', parameters: { + layout: 'api', mobile: 'https://m.dpfanatics.com/en/video', }, parent: '21sextury', @@ -66,6 +68,7 @@ const networks = [ url: 'https://www.21naturals.com', description: 'Welcome to 21Naturals.com, the porn network featuring the hottest pornstars from all over the world in all natural porn and erotic sex videos. Watch thousands of girls with natural tits', parameters: { + layout: 'api', mobile: 'https://m.dpfanatics.com/en/video', }, parent: '21sextury', diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 6eddb277..c475330f 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -4710,6 +4710,13 @@ const sites = [ tags: ['anal'], parent: 'mikeadriano', }, + { + slug: 'analonly', + name: 'Anal Only', + url: 'https://analonly.com', + tags: ['anal'], + parent: 'mikeadriano', + }, { slug: 'allanal', name: 'All Anal', diff --git a/src/scrapers/21naturals.js b/src/scrapers/21naturals.js deleted file mode 100644 index 780164a7..00000000 --- a/src/scrapers/21naturals.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchProfile: fetchApiProfile, - fetchUpcoming: fetchApiUpcoming, - fetchScene, -}; diff --git a/src/scrapers/21sextreme.js b/src/scrapers/21sextreme.js deleted file mode 100644 index 780164a7..00000000 --- a/src/scrapers/21sextreme.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchProfile: fetchApiProfile, - fetchUpcoming: fetchApiUpcoming, - fetchScene, -}; diff --git a/src/scrapers/21sextury.js b/src/scrapers/21sextury.js deleted file mode 100644 index 780164a7..00000000 --- a/src/scrapers/21sextury.js +++ /dev/null @@ -1,10 +0,0 @@ -'use strict'; - -const { fetchApiLatest, fetchApiUpcoming, fetchScene, fetchApiProfile } = require('./gamma'); - -module.exports = { - fetchLatest: fetchApiLatest, - fetchProfile: fetchApiProfile, - fetchUpcoming: fetchApiUpcoming, - fetchScene, -}; diff --git a/src/scrapers/mikeadriano.js b/src/scrapers/mikeadriano.js index 07e25996..8c595969 100644 --- a/src/scrapers/mikeadriano.js +++ b/src/scrapers/mikeadriano.js @@ -67,6 +67,29 @@ async function fetchLatest(channel, page = 1) { return res.status; } +async function fetchUpcoming(channel) { + const { host } = new URL(channel.url); + const url = `https://tour.${host}`; + + const res = await qu.get(url); + + if (res.ok) { + if (res.item.query.exists('a[href*="stackpath.com"]')) { + throw new Error('URL blocked by StackPath'); + } + + const sceneItem = qu.init(res.item.el, '#upcoming-content'); + + if (sceneItem) { + return scrapeAll([sceneItem], channel); + } + + return null; + } + + return res.status; +} + async function fetchScene(url, channel) { const cookieJar = http.cookieJar(); const session = http.session({ cookieJar }); @@ -122,6 +145,7 @@ async function fetchProfile({ name: actorName }, context , site) { module.exports = { fetchLatest, + fetchUpcoming, // fetchProfile, fetchScene, }; diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index 6d02212c..551cf814 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -47,7 +47,6 @@ const mikeadriano = require('./mikeadriano'); const milehighmedia = require('./milehighmedia'); const mindgeek = require('./mindgeek'); const mofos = require('./mofos'); -const naturals = require('./21naturals'); const naughtyamerica = require('./naughtyamerica'); const newsensations = require('./newsensations'); const nubiles = require('./nubiles'); @@ -62,8 +61,6 @@ const privateNetwork = require('./private'); // reserved keyword const puretaboo = require('./puretaboo'); const realitykings = require('./realitykings'); const score = require('./score'); -const sextreme = require('./21sextreme'); -const sextury = require('./21sextury'); const teamskeet = require('./teamskeet'); const teencoreclub = require('./teencoreclub'); const topwebmodels = require('./topwebmodels'); @@ -85,9 +82,6 @@ const freeones = require('./freeones'); const scrapers = { releases: { - '21naturals': naturals, - '21sextreme': sextreme, - '21sextury': sextury, adulttime, amateurallure, americanpornstar, @@ -176,7 +170,7 @@ const scrapers = { zerotolerance, }, actors: { - '21sextury': sextury, + '21sextury': gamma, allanal: mikeadriano, amateureuro: porndoe, americanpornstar, diff --git a/src/store-releases.js b/src/store-releases.js index e76f3a82..07ab75ae 100644 --- a/src/store-releases.js +++ b/src/store-releases.js @@ -164,6 +164,7 @@ function attachReleaseIds(releases, storedReleases) { function filterInternalDuplicateReleases(releases) { const releasesByEntityIdAndEntryId = releases.reduce((acc, release) => { + console.log(release); if (!release.entity) { return acc; } diff --git a/src/updates.js b/src/updates.js index af18eaef..93d09a16 100644 --- a/src/updates.js +++ b/src/updates.js @@ -205,6 +205,8 @@ async function scrapeChannelReleases(scraper, channelEntity, preData) { } async function scrapeChannel(channelEntity, accNetworkReleases) { + console.log(channelEntity); + const scraper = scrapers.releases[channelEntity.slug] || scrapers.releases[channelEntity.parent?.slug] || scrapers.releases[channelEntity.parent?.parent?.slug];