assets/components/campaigns/campaign.vue

@@ -50,9 +50,9 @@ function ratioFilter(banner) {
 
 function entityCampaign() {
 	const bannerCampaigns = this.entity.campaigns
-		.concat(this.entity.children?.flatMap((child) => child.campaigns))
+		.concat(this.entity.children?.flatMap(child => child.campaigns))
 		.concat(this.entity.parent?.campaigns)
-		.filter((campaignX) => campaignX && this.ratioFilter(campaignX.banner));
+		.filter(campaignX => campaignX && this.ratioFilter(campaignX.banner));
 
 	if (bannerCampaigns.length > 0) {
 		const randomCampaign = bannerCampaigns[Math.floor(Math.random() * bannerCampaigns.length)];
@@ -66,7 +66,7 @@ function entityCampaign() {
 }
 
 function tagCampaign() {
-	const campaignBanners = this.tag.banners.filter((banner) => banner.campaigns.length > 0 && this.ratioFilter(banner));
+	const campaignBanners = this.tag.banners.filter(banner => banner.campaigns.length > 0 && this.ratioFilter(banner));
 	const banner = campaignBanners[Math.floor(Math.random() * campaignBanners.length)];
 
 	if (banner?.campaigns.length > 0) {
@@ -83,25 +83,17 @@ function tagCampaign() {
 	return null;
 }
 
-async function genericCampaign() {
+function campaign() {
-	const randomCampaign = await this.$store.dispatch('fetchRandomCampaign', { minRatio: this.minRatio, maxRatio: this.maxRatio });
-
-	this.campaign = randomCampaign;
-	this.$emit('campaign', randomCampaign);
-
-	return randomCampaign;
-}
-
-async function mounted() {
 	if (this.entity) {
-		await this.entityCampaign();
+		return this.entityCampaign();
 	}
 
 	if (this.tag) {
-		await this.tagCampaign();
+		return this.tagCampaign();
 	}
 
-	await this.genericCampaign();
+	this.$emit('campaign', null); // allow parent to toggle campaigns depending on availability
+	return null;
 }
 
 export default {
@@ -132,15 +124,11 @@ export default {
 		},
 	},
 	emits: ['campaign'],
-	data() {
+	computed: {
-		return {
+		campaign,
-			campaign: null,
-		};
 	},
-	mounted,
 	methods: {
 		entityCampaign,
-		genericCampaign,
 		ratioFilter,
 		tagCampaign,
 	},
@@ -151,6 +139,7 @@ export default {
 .campaign {
 	height: 100%;
 	display: inline-flex;
+	flex-grow: 1;
 	align-items: center;
 	justify-content: center;
 }

assets/components/home/home.vue

@@ -1,12 +1,6 @@
 <template>
 	<div class="home">
 		<div class="content-inner">
-			<div class="campaign-container">
-				<Campaign
-					:min-ratio="6"
-				/>
-			</div>
-
 			<FilterBar
 				ref="filter"
 				:fetch-releases="fetchReleases"
@@ -38,7 +32,6 @@
 import FilterBar from '../filters/filter-bar.vue';
 import Releases from '../releases/releases.vue';
 import Pagination from '../pagination/pagination.vue';
-import Campaign from '../campaigns/campaign.vue';
 
 async function fetchReleases(scroll = true) {
 	this.done = false;
@@ -66,7 +59,6 @@ async function mounted() {
 
 export default {
 	components: {
-		Campaign,
 		FilterBar,
 		Releases,
 		Pagination,
@@ -99,12 +91,4 @@ export default {
 	flex-direction: column;
 	flex-grow: 1;
 }
-
-.campaign-container {
-	display: flex;
-	align-items: center;
-	justify-content: center;
-	padding: .75rem 1rem .25rem 1rem;
-	background: var(--background-dim);
-}
 </style>

assets/js/ui/actions.js

@@ -227,46 +227,6 @@ function initUiActions(store, _router) {
 		};
 	}
 
-	async function fetchRandomCampaign(context, { minRatio, maxRatio }) {
-		const { randomCampaign } = await graphql(`
-			query Campaign(
-				$minRatio: BigFloat
-				$maxRatio: BigFloat
-			) {
-			  randomCampaign: getRandomCampaign(minRatio: $minRatio, maxRatio: $maxRatio) {
-				url
-				affiliate {
-				  url
-				}
-				banner {
-				  id
-				  type
-				  ratio
-				  entity {
-					type
-					slug
-					parent {
-					  type
-					  slug
-					}
-				  }
-				}
-				entity {
-				  slug
-				}
-				parent {
-				  slug
-				}
-			  }
-			}
-		`, {
-			minRatio,
-			maxRatio,
-		});
-
-		return randomCampaign;
-	}
-
 	async function fetchStats() {
 		const {
 			scenes,
@@ -313,7 +273,6 @@ function initUiActions(store, _router) {
 		setBatch,
 		setSfw,
 		setTheme,
-		fetchRandomCampaign,
 		fetchNotifications,
 		fetchStats,
 	};

package-lock.json

@@ -1,12 +1,12 @@
 {
     "name": "traxxx",
-    "version": "1.217.3",
+    "version": "1.217.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "traxxx",
-            "version": "1.217.3",
+            "version": "1.217.2",
             "license": "ISC",
             "dependencies": {
                 "@casl/ability": "^5.2.2",

package.json

@@ -1,6 +1,6 @@
 {
     "name": "traxxx",
-    "version": "1.217.3",
+    "version": "1.217.2",
     "description": "All the latest porn releases in one place",
     "main": "src/app.js",
     "scripts": {

seeds/06_affiliates.js

@@ -1,5 +1,3 @@
-const fs = require('fs').promises;
-const path = require('path');
 const bulkInsert = require('../src/utils/bulk-insert');
 
 const affiliates = [
@@ -17,190 +15,452 @@ const affiliates = [
 	},
 ];
 
-const bannerTags = {
+const banners = [
-	// 21sextury
+	{
-	'21sextury_300_250_anal': ['anal', 'blonde'],
+		id: '21sextury_300_250_anal',
-	'21sextury_770_76_gina_gerson_dp': ['dp', 'anal', 'mfm', 'blonde'],
+		width: 300,
-	'21sextury_770_76_veronica_leal_dp': ['dp', 'anal', 'mfm', 'blowjob', 'blonde'],
+		height: 250,
-	'21sextreme_300_250_cum': ['facial', 'cum-in-mouth'],
+		network: '21sextury',
-	'21naturals_315_300': ['brunette', 'natural-boobs'],
+		tags: ['anal', 'blonde'],
-	'21naturals_315_300_1': ['blonde', 'natural-boobs'],
+	},
-	'21naturals_315_300_gina_gerson': ['sex', 'blonde', 'natural-boobs'],
+	{
-	'21naturals_315_300_ginebra_bellucci': ['sex', 'brunette', 'natural-boobs'],
+		id: '21sextury_770_76_gina_gerson_dp',
-	'21naturals_315_300_lana_roy_anal': ['anal', 'brunette', 'natural-boobs'],
+		width: 770,
-	'21naturals_770_76_alexis_crystal': ['blowjob', 'blonde'],
+		height: 76,
-	'21naturals_970_90': ['sex', 'brunette'],
+		network: '21sextury',
-	// archangel
+		tags: ['dp', 'anal', 'mfm', 'blonde'],
-	archangel_970_90_kendra_lust: ['dp', 'anal', 'sex', 'interracial', 'black'],
+	},
-	// dogfart
+	{
-	wefuckblackgirls_728_90_loss: ['mfm', 'threesome', 'anal', 'black', 'interracial'],
+		id: '21sextury_770_76_veronica_leal_dp',
-	// evilangel
+		width: 770,
-	evilangel_728_90_adriana_chechik_gangbang: ['gangbang', 'airtight', 'dp', 'dvp', 'facial', 'brunette'],
+		height: 76,
-	evilangel_728_90_kenzie_reeves_lexi_lore: ['anal', 'mff', 'blowjob', 'blonde'],
+		network: '21sextury',
-	evilangel_970_90_one_dollar: ['sex', 'mff'],
+		tags: ['dp', 'anal', 'mfm', 'blowjob', 'blonde'],
-	// julesjordan
+	},
-	julesjordan_728_90_jill_kassidy: ['sex', 'blowjob', 'black-cock', 'brunette'],
+	{
-	julesjordan_728_90_angela_white: ['sex', 'black-cock', 'brunette'],
+		id: '21sextreme_300_250_cum',
-	julesjordan_728_90_adriana_chechik: ['anal', 'black-cock', 'brunette'],
+		width: 300,
-	julesjordan_728_90_autumn_falls: ['sex', 'big-boobs', 'brunette'],
+		height: 250,
-	julesjordan_728_90_gabbie_carter: ['sex', 'blowjob', 'facefucking', 'big-boobs', 'brunette'],
+		network: '21sextreme',
-	manuelferrara_728_90_asses: ['big-butt'],
+		tags: ['facial', 'cum-in-mouth'],
-	// kink
+	},
-	boundgangbangs_305_99_moretta_11975_animated: ['gangbang', 'mfm', 'bdsm', 'blonde'],
+	{
-	boundgangbangs_305_99_moretta_11975: ['blowbang', 'blowjob', 'bdsm', 'blonde'],
+		id: '21naturals_315_300',
-	boundgangbangs_315_300_lou_charmelle_12402_animated: ['gangbang', 'airtight', 'dp', 'bdsm', 'bondage'],
+		width: 315,
-	boundgangbangs_315_300_lou_charmelle_12402: ['gangbang', 'mfm', 'bdsm', 'bondage'],
+		height: 300,
-	boundgangbangs_770_76_amy_brooke_11965_animated: ['gangbang', 'airtight', 'mfm', 'bdsm', 'bondage'],
+		network: '21naturals',
-	boundgangbangs_770_76_anissa_kate_19662: ['gangbang', 'airtight', 'bdsm', 'bondage'],
+		tags: ['brunette', 'natural-boobs'],
-	boundgangbangs_970_90_sasha_swift_18815: ['gangbang', 'blowbang', 'dp', 'blowjob', 'facefucking', 'facial', 'bdsm'],
+	},
-	boundgangbangs_970_90_skylar_price_12403_animated: ['gangbang', 'mfm', 'blowbang', 'blowjob', 'blonde', 'bdsm'],
+	{
-	hardcoregangbang_300_250_kira_noir_44157: ['blowbang', 'black', 'bdsm'],
+		id: '21naturals_315_300_1',
-	hardcoregangbang_305_99_kira_noir: ['blowbang', 'black', 'bdsm'],
+		width: 315,
-	hardcoregangbang_900_250_gloves_blonde: ['blowbang', 'blonde', 'bdsm'],
+		height: 300,
-	hardcoregangbang_1000_100: ['gangbang', 'mfm', 'bdsm'],
+		network: '21naturals',
-	// teenmegaworld
+		tags: ['blonde', 'natural-boobs'],
-	analangels_468_80_animated: ['anal'],
+	},
-	analangels_300_250_animated: ['anal'],
+	{
-	analbeauty_468_80_animated: ['anal'],
+		id: '21naturals_315_300_gina_gerson',
-	analbeauty_300_250_animated: ['anal'],
+		width: 315,
-	analbeauty_300_250_tail_animated: ['anal', 'bondage', 'bdsm'],
+		height: 300,
-	beautyangels_468_80_animated: ['solo'],
+		network: '21naturals',
-	beautyangels_300_250_69_animated: ['lesbian', '69'],
+		tags: ['sex', 'blonde', 'natural-boobs'],
-	beautyangels_300_250_lesbian_animated: ['lesbian'],
+	},
-	teenmegaworld_300_250_animated: ['solo'],
+	{
-	tmwvrnet_468_80_animated: ['vr'],
+		id: '21naturals_315_300_ginebra_bellucci',
-	// legalporno/analvids/pornworld
+		width: 315,
-	pornworld_600_120_1: ['anal', 'brunette'],
+		height: 300,
-	pornworld_600_120_2: ['mfm', 'sex', 'brunette'],
+		network: '21naturals',
-	// xempire
+		tags: ['sex', 'brunette', 'natural-boobs'],
-	hardx_770_76_anal: ['anal', 'blonde'],
+	},
-	hardx_770_76_esperanza_anal: ['anal', 'brunette'],
+	{
-	hardx_770_76_zoey_monroe_mff: ['sex', 'mff', 'blonde'],
+		id: '21naturals_315_300_lana_roy_anal',
-	xempire_315_300: ['blowbang', 'sex', 'black-cock', 'brunette'],
+		width: 315,
-	xempire_970_90_mff: ['mff', '69', 'brunette'],
+		height: 300,
-	// vixen
+		network: '21naturals',
-	blacked_300_250_cherry_kiss_dp: ['dp', 'anal', 'black-cock'],
+		tags: ['anal', 'brunette', 'natural-boobs'],
-	blacked_300_250_cherry_kiss_anal_mfm: ['anal', 'black-cock'],
+	},
-	tushy_970_70_alexa_flexy_dp: ['dp', 'anal'],
+	{
-	tushy_776_70_gianna_dior_anal: ['anal'],
+		id: '21naturals_770_76_alexis_crystal',
-};
+		width: 770,
-
+		height: 76,
-/*
+		network: '21naturals',
-const bannerActors = {
+		tags: ['blowjob', 'blonde'],
-	// 21sextury
+	},
-	'21sextury_770_76_gina_gerson_dp': ['gina-gerson'],
+	{
-	'21sextury_770_76_veronica_leal_dp': ['veronica-leal'],
+		id: '21naturals_970_90',
-	'21naturals_315_300_gina_gerson': ['gina-gerson'],
+		width: 970,
-	'21naturals_315_300_ginebra_bellucci': ['ginebra-bellucci'],
+		height: 90,
-	'21naturals_315_300_lana_roy_anal': ['lana-roy'],
+		network: '21naturals',
-	'21naturals_770_76_alexis_crystal': ['alexis-crystal'],
+		tags: ['sex', 'brunette'],
-	// archangel
+	},
-	archangel_970_90_kendra_lust: ['kendra-lust'],
+	{
-	// evilangel
+		id: 'archangel_970_90_kendra_lust',
-	evilangel_728_90_adriana_chechik_gangbang: ['adriana-chechik'],
+		width: 970,
-	evilangel_728_90_kenzie_reeves_lexi_lore: ['kenzie-reeves', 'lexi-lore'],
+		height: 90,
-	// julesjordan
+		channel: 'archangel',
-	julesjordan_728_90_jill_kassidy: ['jill-kassidy'],
+		tags: ['dp', 'anal', 'sex', 'interracial', 'black'],
-	julesjordan_728_90_angela_white: ['angela-white'],
+	},
-	julesjordan_728_90_adriana_chechik: ['adriana-chechik'],
+	{
-	julesjordan_728_90_autumn_falls: ['autumn-falls'],
+		id: 'wefuckblackgirls_728_90_loss',
-	julesjordan_728_90_gabbie_carter: ['gabbie-carter'],
+		width: 728,
-	// kink
+		height: 90,
-	boundgangbangs_305_99_moretta_11975_animated: ['moretta'],
+		network: 'dogfartnetwork',
-	boundgangbangs_305_99_moretta_11975: ['moretta'],
+		tags: ['mfm', 'threesome', 'anal', 'black', 'interracial'],
-	boundgangbangs_315_300_lou_charmelle_12402_animated: ['lou-charmelle'],
+	},
-	boundgangbangs_315_300_lou_charmelle_12402: ['lou-charmelle'],
+	{
-	boundgangbangs_770_76_amy_brooke_11965_animated: ['amy-brooke'],
+		id: 'evilangel_728_90_adriana_chechik_gangbang',
-	boundgangbangs_770_76_anissa_kate_19662: ['anissa-kate'],
+		width: 728,
-	boundgangbangs_970_90_sasha_swift_18815: ['sasha-swift'],
+		height: 90,
-	boundgangbangs_970_90_skylar_price_12403_animated: ['skylar-price'],
+		network: 'evilangel',
-	hardcoregangbang_300_250_kira_noir_44157: ['kira-noir'],
+		tags: ['gangbang', 'airtight', 'dp', 'dvp', 'facial', 'brunette'],
-	hardcoregangbang_305_99_kira_noir: ['kira-noir'],
+	},
-	// xempire
+	{
-	hardx_770_76_esperanza_anal: ['esperanza-del-horno'],
+		id: 'evilangel_728_90_kenzie_reeves_lexi_lore',
-	hardx_770_76_zoey_monroe_mff: ['zoey-monroe'],
+		width: 728,
-	// vixen
+		height: 90,
-	blacked_300_250_cherry_kiss_dp: ['cherry-kiss'],
+		network: 'evilangel',
-	blacked_300_250_cherry_kiss_anal_mfm: ['cherry-kiss'],
+		tags: ['anal', 'mff', 'blowjob', 'blonde'],
-	tushy_970_70_alexa_flexy_dp: ['alexa-flexy'],
+	},
-	tushy_776_70_gianna_dior_anal: ['gianna-dior'],
+	{
-};
+		id: 'evilangel_970_90_one_dollar',
-*/
+		width: 970,
+		height: 90,
+		network: 'evilangel',
+		tags: ['sex', 'mff'],
+	},
+	{
+		id: 'hardx_770_76_anal',
+		width: 770,
+		height: 76,
+		channel: 'hardx',
+		tags: ['anal', 'blonde'],
+	},
+	{
+		id: 'hardx_770_76_esperanza_anal',
+		width: 770,
+		height: 76,
+		channel: 'hardx',
+		tags: ['anal', 'brunette'],
+	},
+	{
+		id: 'hardx_770_76_zoey_monroe_mff',
+		width: 770,
+		height: 76,
+		channel: 'hardx',
+		tags: ['sex', 'mff', 'blonde'],
+	},
+	{
+		id: 'julesjordan_728_90_jill_kassidy',
+		width: 728,
+		height: 90,
+		network: 'julesjordan',
+		tags: ['sex', 'blowjob', 'black-cock', 'brunette'],
+	},
+	{
+		id: 'julesjordan_728_90_angela_white',
+		width: 728,
+		height: 90,
+		network: 'julesjordan',
+		tags: ['sex', 'black-cock', 'brunette'],
+	},
+	{
+		id: 'julesjordan_728_90_adriana_chechik',
+		width: 728,
+		height: 90,
+		network: 'julesjordan',
+		tags: ['anal', 'black-cock', 'brunette'],
+	},
+	{
+		id: 'julesjordan_728_90_autumn_falls',
+		width: 728,
+		height: 90,
+		network: 'julesjordan',
+		tags: ['sex', 'big-boobs', 'brunette'],
+	},
+	{
+		id: 'julesjordan_728_90_gabbie_carter',
+		width: 728,
+		height: 90,
+		network: 'julesjordan',
+		tags: ['sex', 'blowjob', 'facefucking', 'big-boobs', 'brunette'],
+	},
+	{
+		id: 'boundgangbangs_305_99_moretta_11975_animated',
+		width: 305,
+		height: 99,
+		type: 'gif',
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'mfm', 'bdsm', 'blonde'],
+	},
+	{
+		id: 'boundgangbangs_305_99_moretta_11975',
+		width: 305,
+		height: 99,
+		channel: 'boundgangbangs',
+		tags: ['blowbang', 'blowjob', 'bdsm', 'blonde'],
+	},
+	{
+		id: 'boundgangbangs_315_300_lou_charmelle_12402_animated',
+		width: 315,
+		height: 300,
+		type: 'gif',
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'airtight', 'dp', 'bdsm', 'bondage'],
+	},
+	{
+		id: 'boundgangbangs_315_300_lou_charmelle_12402',
+		width: 315,
+		height: 300,
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'mfm', 'bdsm', 'bondage'],
+	},
+	{
+		id: 'boundgangbangs_770_76_amy_brooke_11965',
+		width: 770,
+		height: 76,
+		type: 'gif',
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'airtight', 'mfm', 'bdsm', 'bondage'],
+	},
+	{
+		id: 'boundgangbangs_770_76_anissa_kate_19662',
+		width: 770,
+		height: 76,
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'airtight', 'bdsm', 'bondage'],
+	},
+	{
+		id: 'boundgangbangs_970_90_sasha_swift_18815',
+		width: 970,
+		height: 90,
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'blowbang', 'dp', 'blowjob', 'facefucking', 'facial', 'bdsm'],
+	},
+	{
+		id: 'boundgangbangs_970_90_skylar_price_12403',
+		width: 970,
+		height: 90,
+		type: 'gif',
+		channel: 'boundgangbangs',
+		tags: ['gangbang', 'mfm', 'blowbang', 'blowjob', 'blonde', 'bdsm'],
+	},
+	{
+		id: 'hardcoregangbang_300_250_kira_noir_44157',
+		width: 300,
+		height: 250,
+		channel: 'hardcoregangbang',
+		tags: ['blowbang', 'black', 'bdsm'],
+	},
+	{
+		id: 'hardcoregangbang_305_99_kira_noir',
+		width: 305,
+		height: 99,
+		channel: 'hardcoregangbang',
+		tags: ['blowbang', 'black', 'bdsm'],
+	},
+	{
+		id: 'hardcoregangbang_900_250_gloves_blonde',
+		width: 900,
+		height: 250,
+		channel: 'hardcoregangbang',
+		tags: ['blowbang', 'blonde', 'bdsm'],
+	},
+	{
+		id: 'hardcoregangbang_1000_100',
+		width: 1000,
+		height: 100,
+		channel: 'hardcoregangbang',
+		tags: ['gangbang', 'mfm', 'bdsm'],
+	},
+	{
+		id: 'manuelferrara_728_90_asses',
+		width: 728,
+		height: 90,
+		channel: 'manuelferrara',
+		tags: ['big-butt'],
+	},
+	{
+		id: 'analangels_468_80_animated',
+		width: 468,
+		height: 80,
+		type: 'gif',
+		channel: 'analangels',
+		tags: ['anal'],
+	},
+	{
+		id: 'analangels_300_250_animated',
+		width: 300,
+		height: 250,
+		type: 'gif',
+		channel: 'analangels',
+		tags: ['anal'],
+	},
+	{
+		id: 'analbeauty_468_80_animated',
+		width: 468,
+		height: 80,
+		type: 'gif',
+		channel: 'analbeauty',
+		tags: ['anal'],
+	},
+	{
+		id: 'analbeauty_300_250_animated',
+		width: 300,
+		height: 250,
+		type: 'gif',
+		channel: 'analbeauty',
+		tags: ['anal'],
+	},
+	{
+		id: 'analbeauty_300_250_tail_animated',
+		width: 300,
+		height: 250,
+		type: 'gif',
+		channel: 'analbeauty',
+		tags: ['anal', 'bondage', 'bdsm'],
+	},
+	{
+		id: 'beautyangels_468_80_animated',
+		width: 468,
+		height: 80,
+		type: 'gif',
+		channel: 'beautyangels',
+		tags: ['solo'],
+	},
+	{
+		id: 'beautyangels_300_250_69_animated',
+		width: 300,
+		height: 250,
+		type: 'gif',
+		channel: 'beautyangels',
+		tags: ['lesbian', '69'],
+	},
+	{
+		id: 'beautyangels_300_250_lesbian_animated',
+		width: 300,
+		height: 250,
+		type: 'gif',
+		channel: 'beautyangels',
+		tags: ['lesbian'],
+	},
+	{
+		id: 'teenmegaworld_300_250_animated',
+		width: 300,
+		height: 250,
+		type: 'gif',
+		network: 'teenmegaworld',
+		tags: ['solo'],
+	},
+	{
+		id: 'tmwvrnet_468_80_animated',
+		width: 468,
+		height: 80,
+		type: 'gif',
+		channel: 'tmwvrnet',
+		tags: ['vr'],
+	},
+	{
+		id: 'pornworld_600_120_1',
+		width: 600,
+		height: 120,
+		network: 'pornworld',
+		tags: ['anal', 'brunette'],
+	},
+	{
+		id: 'pornworld_600_120_2',
+		width: 600,
+		height: 120,
+		network: 'pornworld',
+		tags: ['mfm', 'sex', 'brunette'],
+	},
+	{
+		id: 'xempire_315_300',
+		width: 315,
+		height: 300,
+		network: 'xempire',
+		tags: ['blowbang', 'sex', 'black-cock', 'brunette'],
+	},
+	{
+		id: 'xempire_970_90_mff',
+		width: 970,
+		height: 90,
+		network: 'xempire',
+		tags: ['mff', '69', 'brunette'],
+	},
+];
 
 const campaigns = [
-	// 21sextury
 	{
 		network: '21sextury',
 		url: 'https://www.iyalc.com/21sextury/go.php?pr=8&su=1&si=207&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21sextury',
 		banner: '21sextury_300_250_anal',
-		network: '21sextury',
 		url: 'https://www.iyalc.com/21sextury/go.php?pr=8&su=1&si=207&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21sextury',
 		banner: '21sextury_770_76_gina_gerson_dp',
-		network: '21sextury',
 		url: 'https://www.iyalc.com/21sextury/go.php?pr=8&su=1&si=207&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21sextury',
 		banner: '21sextury_770_76_veronica_leal_dp',
-		network: '21sextury',
 		url: 'https://www.iyalc.com/21sextury/go.php?pr=8&su=1&si=207&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
-		banner: '21sextreme_300_250_cum',
 		network: '21sextreme',
+		banner: '21sextreme_300_250_cum',
 		url: 'https://www.iyalc.com/21sextreme/go.php?pr=8&su=1&si=208&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21naturals',
 		banner: '21naturals_315_300',
-		network: '21naturals',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21naturals',
 		banner: '21naturals_315_300_1',
-		network: '21naturals',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21naturals',
 		banner: '21naturals_315_300_gina_gerson',
-		network: '21naturals',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21naturals',
 		banner: '21naturals_315_300_ginebra_bellucci',
-		network: '21naturals',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21naturals',
 		banner: '21naturals_315_300_lana_roy_anal',
-		network: '21naturals',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: '21naturals',
 		banner: '21naturals_770_76_alexis_crystal',
-		network: '21naturals',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
-		banner: '21naturals_970_90',
 		network: '21naturals',
+		banner: '21naturals_970_90',
 		url: 'https://www.iyalc.com/21naturals/go.php?pr=8&su=1&si=209&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
-	// archangel
 	{
 		channel: 'archangel',
 		affiliate: 'archangel_share',
@@ -221,94 +481,94 @@ const campaigns = [
 		comment: 'per signup',
 	},
 	{
+		network: 'evilangel',
 		banner: 'evilangel_728_90_adriana_chechik_gangbang',
-		network: 'evilangel',
 		url: 'https://www.iyalc.com/evilangel/go.php?pr=8&su=2&si=128&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: 'evilangel',
 		banner: 'evilangel_728_90_kenzie_reeves_lexi_lore',
-		network: 'evilangel',
 		url: 'https://www.iyalc.com/evilangel/go.php?pr=8&su=2&si=128&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
 	{
+		network: 'evilangel',
 		banner: 'evilangel_970_90_one_dollar',
-		network: 'evilangel',
 		url: 'https://www.iyalc.com/evilangel/go.php?pr=8&su=2&si=128&ad=277470&pa=index&ar=&buffer=',
 		comment: 'per signup',
 	},
-	// julesjordan
+	{
+		channel: 'hardx',
+		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
+		comment: '$30 per signup',
+	},
+	{
+		channel: 'hardx',
+		banner: 'hardx_770_76_anal',
+		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
+		comment: '$30 per signup',
+	},
+	{
+		channel: 'hardx',
+		banner: 'hardx_770_76_esperanza_anal',
+		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
+		comment: '$30 per signup',
+	},
+	{
+		channel: 'hardx',
+		banner: 'hardx_770_76_zoey_monroe_mff',
+		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
+		comment: '$30 per signup',
+	},
 	{
 		network: 'julesjordan',
 		url: 'https://enter.julesjordan.com/track/Mzk3MS4yLjMuNi4wLjAuMC4wLjA',
 		comment: '$30 per signup',
 	},
 	{
+		network: 'julesjordan',
 		banner: 'julesjordan_728_90_jill_kassidy',
-		network: 'julesjordan',
 		url: 'https://enter.julesjordan.com/track/Mzk3MS4yLjMuNi4wLjAuMC4wLjA',
 		comment: '$30 per signup',
 	},
 	{
+		network: 'julesjordan',
 		banner: 'julesjordan_728_90_angela_white',
-		network: 'julesjordan',
 		url: 'https://enter.julesjordan.com/track/Mzk3MS4yLjMuNi4wLjAuMC4wLjA',
 		comment: '$30 per signup',
 	},
 	{
+		network: 'julesjordan',
 		banner: 'julesjordan_728_90_adriana_chechik',
-		network: 'julesjordan',
 		url: 'https://enter.julesjordan.com/track/Mzk3MS4yLjMuNi4wLjAuMC4wLjA',
 		comment: '$30 per signup',
 	},
 	{
+		network: 'julesjordan',
 		banner: 'julesjordan_728_90_autumn_falls',
-		network: 'julesjordan',
 		url: 'https://enter.julesjordan.com/track/Mzk3MS4yLjMuNi4wLjAuMC4wLjA',
 		comment: '$30 per signup',
 	},
 	{
+		network: 'julesjordan',
 		banner: 'julesjordan_728_90_gabbie_carter',
-		network: 'julesjordan',
 		url: 'https://enter.julesjordan.com/track/Mzk3MS4yLjMuNi4wLjAuMC4wLjA',
 		comment: '$30 per signup',
 	},
-	{
-		channel: 'manuelferrara',
-		url: 'https://enter.manuelferrara.com/track/Mzk3MS4yLjcuMTYuMC4wLjAuMC4w',
-		comment: '$30 per signup',
-	},
-	{
-		banner: 'manuelferrara_728_90_asses',
-		channel: 'manuelferrara',
-		url: 'https://enter.manuelferrara.com/track/Mzk3MS4yLjcuMTYuMC4wLjAuMC4w',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'theassfactory',
-		url: 'https://enter.theassfactory.com/track/Mzk3MS4yLjEuMS4wLjAuMC4wLjA',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'spermswallowers',
-		url: 'https://enter.spermswallowers.com/track/Mzk3MS4yLjUuMTMuMC4wLjAuMC4w',
-		comment: '$30 per signup',
-	},
-	// kink
 	{
 		network: 'kink',
 		affiliate: 'kink_params',
 		comment: '50%',
 	},
 	{
-		channel: 'boundgangbangs',
 		url: 'https://www.kink.com/channel/bound-gang-bangs?t=eyJhZmZpbGlhdGUiOiJEZWJhdWNoZXJ5TGliIiwiY2FtcGFpZ24iOiJkZWZhdWx0IiwiYWdldmVyaWZpZWQiOiJ5In0',
+		channel: 'boundgangbangs',
 		comment: '50%',
 	},
 	{
-		channel: 'hardcoregangbang',
 		url: 'https://www.kink.com/channel/hardcore-gangbang?t=eyJhZmZpbGlhdGUiOiJEZWJhdWNoZXJ5TGliIiwiY2FtcGFpZ24iOiJkZWZhdWx0IiwiYWdldmVyaWZpZWQiOiJ5In0',
+		channel: 'hardcoregangbang',
 		comment: '50%',
 	},
 	{
@@ -336,7 +596,7 @@ const campaigns = [
 		comment: '50%',
 	},
 	{
-		banner: 'boundgangbangs_770_76_amy_brooke_11965_animated',
+		banner: 'boundgangbangs_770_76_amy_brooke_11965',
 		url: 'https://www.kink.com/channel/bound-gang-bangs?t=eyJhZmZpbGlhdGUiOiJEZWJhdWNoZXJ5TGliIiwiY2FtcGFpZ24iOiJkZWZhdWx0IiwiYWdldmVyaWZpZWQiOiJ5In0',
 		channel: 'boundgangbangs',
 		comment: '50%',
@@ -354,7 +614,7 @@ const campaigns = [
 		comment: '50%',
 	},
 	{
-		banner: 'boundgangbangs_970_90_skylar_price_12403_animated',
+		banner: 'boundgangbangs_970_90_skylar_price_12403',
 		url: 'https://www.kink.com/channel/bound-gang-bangs?t=eyJhZmZpbGlhdGUiOiJEZWJhdWNoZXJ5TGliIiwiY2FtcGFpZ24iOiJkZWZhdWx0IiwiYWdldmVyaWZpZWQiOiJ5In0',
 		channel: 'boundgangbangs',
 		comment: '50%',
@@ -383,7 +643,6 @@ const campaigns = [
 		channel: 'hardcoregangbang',
 		comment: '50%',
 	},
-	// kellymadison/teenfidelity
 	{
 		network: 'kellymadison',
 		url: 'https://www2.kellymadison.com/track/MTAxOTE0LjYuMS4xLjAuMC4wLjAuMA',
@@ -404,7 +663,22 @@ const campaigns = [
 		url: 'https://www2.teenfidelity.com/track/MTAxOTE0LjYuNS42LjAuMC4wLjAuMA',
 		comment: '$25 per signup',
 	},
-	// teenmegaworld
+	{
+		channel: 'manuelferrara',
+		url: 'https://enter.manuelferrara.com/track/Mzk3MS4yLjcuMTYuMC4wLjAuMC4w',
+		comment: '$30 per signup',
+	},
+	{
+		channel: 'manuelferrara',
+		banner: 'manuelferrara_728_90_asses',
+		url: 'https://enter.manuelferrara.com/track/Mzk3MS4yLjcuMTYuMC4wLjAuMC4w',
+		comment: '$30 per signup',
+	},
+	{
+		channel: 'spermswallowers',
+		url: 'https://enter.spermswallowers.com/track/Mzk3MS4yLjUuMTMuMC4wLjAuMC4w',
+		comment: '$30 per signup',
+	},
 	{
 		network: 'teenmegaworld',
 		url: 'https://secure.teenmegaworld.net/track/MzAxNjcxLjUuMS4xLjAuMC4wLjAuMA',
@@ -470,7 +744,11 @@ const campaigns = [
 		url: 'https://secure.tmwvrnet.com/track/MzAxNjcxLjUuNDQuNDQuMC4wLjAuMC4w',
 		comment: 'recurring',
 	},
-	// legalporno/analvids/pornworld
+	{
+		channel: 'theassfactory',
+		url: 'https://enter.theassfactory.com/track/Mzk3MS4yLjEuMS4wLjAuMC4wLjA',
+		comment: '$30 per signup',
+	},
 	{
 		network: 'analvids',
 		url: 'https://www.analvids.com/new-videos?aff=BW90MHT1DP____',
@@ -505,7 +783,6 @@ const campaigns = [
 		url: 'https://pornworld.com/new-videos?aff=BW90MHT1DP____',
 		comment: 'default offer',
 	},
-	// xempire
 	{
 		network: 'xempire',
 		url: 'https://www.blazinglink.com/xempire/go.php?pr=12&su=2&si=81&pa=index&ar=&ad=277470',
@@ -523,109 +800,10 @@ const campaigns = [
 		url: 'https://www.blazinglink.com/xempire/go.php?pr=12&su=2&si=81&pa=index&ar=&ad=277470',
 		comment: '$30 per signup',
 	},
-	{
-		channel: 'hardx',
-		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'hardx',
-		banner: 'hardx_770_76_anal',
-		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'hardx',
-		banner: 'hardx_770_76_esperanza_anal',
-		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'hardx',
-		banner: 'hardx_770_76_zoey_monroe_mff',
-		url: 'https://www.blazinglink.com/hardx/go.php?pr=12&su=2&si=68&pa=index&ar=&ad=277470',
-		comment: '$30 per signup',
-	},
-	// vixen
-	{
-		channel: 'blacked',
-		url: 'https://join.blacked.com/track/MTA0MS43OC4zLjMuMC4wLjAuMC4w',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'blacked',
-		banner: 'blacked_300_250_cherry_kiss_dp',
-		url: 'https://join.blacked.com/track/MTA0MS43OC4zLjMuMC4wLjAuMC4w',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'blacked',
-		banner: 'blacked_300_250_cherry_kiss_anal_mfm',
-		url: 'https://join.blacked.com/track/MTA0MS43OC4zLjMuMC4wLjAuMC4w',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'tushy',
-		url: 'https://join.tushy.com/track/MTA0MS43OC43LjIwLjAuMC4wLjAuMA',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'tushy',
-		banner: 'tushy_970_70_alexa_flexy_dp',
-		url: 'https://join.tushy.com/track/MTA0MS43OC43LjIwLjAuMC4wLjAuMA',
-		comment: '$30 per signup',
-	},
-	{
-		channel: 'tushy',
-		banner: 'tushy_776_70_gianna_dior_anal',
-		url: 'https://join.tushy.com/track/MTA0MS43OC43LjIwLjAuMC4wLjAuMA',
-		comment: '$30 per signup',
-	},
 ];
 
 exports.seed = async (knex) => Promise.resolve()
 	.then(async () => {
-		const bannerNetworks = await fs.readdir('./public/img/banners');
-
-		// derive entity, width and height from filepath to minimize redundant work
-		const rawBanners = await Promise.all(bannerNetworks.map(async (network) => {
-			const networkPaths = await fs.readdir(`./public/img/banners/${network}`);
-
-			return Promise.all(networkPaths.map(async (file) => {
-				if (file.charAt(0) === '_') {
-					return null;
-				}
-
-				if (await fs.stat(`./public/img/banners/${network}/${file}`).then(async (stats) => stats.isDirectory())) {
-					const channelPaths = await fs.readdir(`./public/img/banners/${network}/${file}`);
-
-					return channelPaths.map((filepath) => ({
-						id: path.parse(filepath).name,
-						channel: file,
-					}));
-				}
-
-				return {
-					id: path.parse(file).name,
-					network,
-				};
-			}));
-		}));
-
-		const banners = rawBanners
-			.flat(2)
-			.filter(Boolean)
-			.map((banner) => {
-				const [, width, height] = banner.id.match(/[a-z0-9]+_(\d+)_(\d+)/);
-
-				return {
-					...banner,
-					width: Number(width),
-					height: Number(height),
-					tags: bannerTags[banner.id] || [],
-				};
-			});
-
 		await Promise.all([
 			knex('campaigns').delete(),
 			knex('banners_tags').delete(),
@@ -645,10 +823,6 @@ exports.seed = async (knex) => Promise.resolve()
 				.whereIn('slug', campaigns.concat(banners).map((link) => link.channel).filter(Boolean)),
 			knex('tags')
 				.whereIn('slug', banners.flatMap((banner) => banner.tags || [])),
-			/*
-			knex('actors')
-				.whereIn('slug', banners.flatMap((banner) => banner.tags || [])),
-			*/
 		]);
 
 		const networksBySlug = networks.reduce((acc, network) => ({ ...acc, [network.slug]: network }), {});
@@ -667,11 +841,11 @@ exports.seed = async (knex) => Promise.resolve()
 			id: banner.id,
 			width: banner.width,
 			height: banner.height,
-			type: banner.type === 'gif' || banner.id.includes('animated') ? 'gif' : 'jpg',
+			type: banner.type,
-			entity_id: networksBySlug[banner.network]?.id || channelsBySlug[banner.channel]?.id || channelsBySlug[banner.network]?.id || null,
+			entity_id: networksBySlug[banner.network]?.id || channelsBySlug[banner.channel]?.id || null,
 		}));
 
-		const bannerTagEntries = banners.flatMap((banner) => banner.tags?.map((tag) => ({
+		const bannerTags = banners.flatMap((banner) => banner.tags?.map((tag) => ({
 			banner_id: banner.id,
 			tag_id: tagsBySlug[tag].id,
 		})) || []);
@@ -685,6 +859,6 @@ exports.seed = async (knex) => Promise.resolve()
 
 		await knex('affiliates').insert(affiliatesWithEntityId);
 		await bulkInsert('banners', bannersWithEntityId, false);
-		await bulkInsert('banners_tags', bannerTagEntries, false);
+		await bulkInsert('banners_tags', bannerTags, false);
 		await bulkInsert('campaigns', campaignsWithEntityIdAndAffiliateId, false);
 	});

src/scrapers/pervcity.js

@@ -120,9 +120,10 @@ async function fetchLatest(channel, page = 1) {
 }
 
 async function fetchUpcoming(channel) {
-	const res = await qu.getAll(channel.url, '.upcoming .videoBlock');
+	const url = 'https://pervcity.com';
+	const res = await qu.getAll(url, '.upcoming .videoBlock');
 
-	return res.ok ? scrapeAll(res.items, channel.parameters?.native ? channel : channel.parent) : res.status;
+	return res.ok ? scrapeAll(res.items, channel.parent) : res.status;
 }
 
 async function fetchScene(url, entity) {