Updated Jules Jordan scraper.

assets/components/campaigns/campaign.vue

@@ -1,21 +1,23 @@
 <template>
+	<iframe
+		v-if="campaign?.banner?.type === 'html'"
+		:width="campaign.banner.width"
+		:height="campaign.banner.height"
+		:src="getSource(campaign)"
+		scrolling="none"
+		marginwidth="0"
+		marginheight="0"
+		class="campaign frame"
+	/>
+
 	<a
-		v-if="campaign"
+		v-else-if="campaign"
 		:href="campaign.url || campaign.affiliate?.url"
 		target="_blank"
 		class="campaign"
 	>
 		<img
-			v-if="campaign.banner.entity.type === 'network' || !campaign.banner.entity.parent"
-			:src="`/img/banners/${campaign.banner.entity.slug}/${campaign.banner.id}.${campaign.banner.type || 'jpg'}`"
-			:width="campaign.banner.width"
-			:height="campaign.banner.height"
-			class="campaign-banner"
-		>
-
-		<img
-			v-if="campaign.banner.entity.type === 'channel' && campaign.banner.entity.parent?.type === 'network'"
-			:src="`/img/banners/${campaign.banner.entity.parent.slug}/${campaign.banner.entity.slug}/${campaign.banner.id}.${campaign.banner.type || 'jpg'}`"
+			:src="getSource(campaign)"
 			:width="campaign.banner.width"
 			:height="campaign.banner.height"
 			class="campaign-banner"
@@ -37,6 +39,12 @@ function ratioFilter(banner) {
 		return false;
 	}
 
+	if (banner.type === 'html' && banner.width > window.innerWidth) {
+		// usually non-scalable iframes
+		console.log('TOO WIDE');
+		return false;
+	}
+
 	if (this.minRatio && banner.ratio < this.minRatio) {
 		return false;
 	}
@@ -48,6 +56,18 @@ function ratioFilter(banner) {
 	return true;
 }
 
+function getSource(campaign) {
+	if (campaign.banner.entity.type === 'network' || !campaign.banner.entity.parent) {
+		return `/banners/${campaign.banner.entity.slug}/${campaign.banner.id}.${campaign.banner.type || 'jpg'}`;
+	}
+
+	if (campaign.banner.entity.type === 'channel' && campaign.banner.entity.parent?.type === 'network') {
+		return `/banners/${campaign.banner.entity.parent.slug}/${campaign.banner.entity.slug}/${campaign.banner.id}.${campaign.banner.type || 'jpg'}`;
+	}
+
+	return null;
+}
+
 function entityCampaign() {
 	const bannerCampaigns = this.entity.campaigns
 		.concat(this.entity.children?.flatMap((child) => child.campaigns))
@@ -106,7 +126,21 @@ async function genericCampaign() {
 	return randomCampaign;
 }
 
+async function specificCampaign(campaignId) {
+	const campaign = await this.$store.dispatch('fetchCampaign', campaignId);
+
+	this.campaign = campaign;
+	this.$emit('campaign', campaign);
+
+	return campaign;
+}
+
 async function mounted() {
+	if (this.$route.query.campaign) {
+		await this.specificCampaign(this.$route.query.campaign);
+		return;
+	}
+
 	if (this.entity) {
 		await this.entityCampaign();
 		return;
@@ -161,7 +195,9 @@ export default {
 	methods: {
 		entityCampaign,
 		genericCampaign,
+		getSource,
 		ratioFilter,
+		specificCampaign,
 		tagCampaign,
 	},
 };
@@ -169,10 +205,10 @@ export default {
 
 <style lang="scss" scoped>
 .campaign {
-	height: 100%;
 	display: inline-flex;
 	align-items: center;
 	justify-content: center;
+	border: none;
 }
 
 .campaign-banner {

assets/components/tags/photos.vue

@@ -49,11 +49,11 @@ import Campaign from '../campaigns/campaign.vue';
 
 function photos() {
 	if (this.tag.poster && this.$store.state.ui.sfw) {
-		return [this.tag.poster].concat(this.tag.photos).map(photo => photo.sfw);
+		return [this.tag.poster].concat(this.tag.photos).map((photo) => photo.sfw);
 	}
 
 	if (this.$store.state.ui.sfw) {
-		return this.tag.photos.map(photo => photo.sfw);
+		return this.tag.photos.map((photo) => photo.sfw);
 	}
 
 	if (this.tag.poster) {

assets/js/fragments.js

@@ -166,27 +166,7 @@ const movieFields = `
 	}
 `;
 
-const campaignsFragment = `
-	campaigns(filter: {
-		or: [
-			{
-				banner: {
-					bannersTagsConnection: {
-						none: {
-							tag: {
-								slug: {
-									in: $exclude
-								}
-							}
-						}
-					}
-				}
-			}
-			{
-				bannerExists: false
-			}
-		]
-	}) {
+const campaignFields = `
 	id
 	url
 	affiliate {
@@ -225,6 +205,30 @@ const campaignsFragment = `
 			slug
 		}
 	}
+`;
+
+const campaignsFragment = `
+	campaigns(filter: {
+		or: [
+			{
+				banner: {
+					bannersTagsConnection: {
+						none: {
+							tag: {
+								slug: {
+									in: $exclude
+								}
+							}
+						}
+					}
+				}
+			}
+			{
+				bannerExists: false
+			}
+		]
+	}) {
+		${campaignFields}
 	}
 `;
 
@@ -670,6 +674,7 @@ export {
 	actorFields,
 	actorStashesFields,
 	batchFragment,
+	campaignFields,
 	campaignsFragment,
 	mediaFields,
 	mediaFragment,

assets/js/ui/actions.js

@@ -1,5 +1,12 @@
 import { graphql, patch } from '../api';
-import { releaseFields, batchFragment, actorStashesFields } from '../fragments';
+
+import {
+	releaseFields,
+	batchFragment,
+	campaignFields,
+	actorStashesFields,
+} from '../fragments';
+
 import { curateRelease, curateActor, curateNotification } from '../curate';
 
 function initUiActions(store, _router) {
@@ -240,29 +247,7 @@ function initUiActions(store, _router) {
 				$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
-				}
+				  ${campaignFields}
 			  }
 			}
 		`, {
@@ -273,6 +258,23 @@ function initUiActions(store, _router) {
 		return randomCampaign;
 	}
 
+	async function fetchCampaign(context, campaignId) {
+		console.log(campaignId);
+		const { campaign } = await graphql(`
+			query Campaign(
+				$campaignId: Int!
+			) {
+			  campaign(id: $campaignId) {
+				  ${campaignFields}
+			  }
+			}
+		`, {
+			campaignId: Number(campaignId),
+		});
+
+		return campaign;
+	}
+
 	async function fetchStats() {
 		const {
 			scenes,
@@ -312,6 +314,7 @@ function initUiActions(store, _router) {
 		setBatch,
 		setSfw,
 		setTheme,
+		fetchCampaign,
 		fetchRandomCampaign,
 		fetchNotifications,
 		fetchStats,

migrations/20190325001339_releases.js

@@ -1552,6 +1552,11 @@ exports.up = (knex) => Promise.resolve()
 			.defaultTo(knex.fn.now());
 	}))
 	.then(() => knex.schema.createTable('random_campaign', (table) => {
+		table.integer('id')
+			.notNullable()
+			.references('id')
+			.inTable('campaigns');
+
 		table.text('banner_id')
 			.references('id')
 			.inTable('banners');
@@ -1903,7 +1908,7 @@ exports.up = (knex) => Promise.resolve()
 			CREATE FUNCTION get_random_campaign(min_ratio decimal default 0, max_ratio decimal default 1000.0) RETURNS random_campaign AS $$
 				SELECT * FROM (
 					SELECT DISTINCT ON (CASE WHEN parent_id IS NOT NULL THEN parent_id ELSE entity_id END)
-						banner_id, url, entity_id, affiliate_id, parent_id
+						id, banner_id, url, entity_id, affiliate_id, parent_id
 					FROM (
 						SELECT
 							campaigns.*, entities.parent_id as parent_id

migrations/20230703013413_random_campaign.js

@@ -0,0 +1,58 @@
+exports.up = async (knex) => {
+	await knex.schema.alterTable('random_campaign', (table) => {
+		table.integer('id')
+			.notNullable()
+			.references('id')
+			.inTable('campaigns');
+	});
+
+	await knex.raw(`
+		CREATE OR REPLACE FUNCTION get_random_campaign(min_ratio decimal default 0, max_ratio decimal default 1000.0) RETURNS random_campaign AS $$
+			SELECT * FROM (
+				SELECT DISTINCT ON (CASE WHEN parent_id IS NOT NULL THEN parent_id ELSE entity_id END)
+					banner_id, url, entity_id, affiliate_id, parent_id, id
+				FROM (
+					SELECT
+						campaigns.*, entities.parent_id as parent_id
+					FROM campaigns
+					LEFT JOIN entities ON entities.id = campaigns.entity_id
+					LEFT JOIN banners ON banners.id = campaigns.banner_id
+					WHERE banner_id IS NOT NULL
+					AND ratio >= min_ratio
+					AND ratio <= max_ratio
+					ORDER BY RANDOM()
+				) random_campaigns
+			) random_banners
+			ORDER BY RANDOM()
+			LIMIT 1;
+		$$ LANGUAGE SQL STABLE;
+	`);
+};
+
+exports.down = async (knex) => {
+	await knex.schema.alterTable('random_campaign', (table) => {
+		table.dropColumn('campaign_id');
+	});
+
+	await knex.raw(`
+		CREATE OR REPLACE FUNCTION get_random_campaign(min_ratio decimal default 0, max_ratio decimal default 1000.0) RETURNS random_campaign AS $$
+			SELECT * FROM (
+				SELECT DISTINCT ON (CASE WHEN parent_id IS NOT NULL THEN parent_id ELSE entity_id END)
+					banner_id, url, entity_id, affiliate_id, parent_id
+				FROM (
+					SELECT
+						campaigns.*, entities.parent_id as parent_id
+					FROM campaigns
+					LEFT JOIN entities ON entities.id = campaigns.entity_id
+					LEFT JOIN banners ON banners.id = campaigns.banner_id
+					WHERE banner_id IS NOT NULL
+					AND ratio >= min_ratio
+					AND ratio <= max_ratio
+					ORDER BY RANDOM()
+				) random_campaigns
+			) random_banners
+			ORDER BY RANDOM()
+			LIMIT 1;
+		$$ LANGUAGE SQL STABLE;
+	`);
+};

migrations/_20230703000556_campaign_html.js

@@ -0,0 +1,11 @@
+exports.up = async (knex) => {
+	await knex.schema.alterTable('banners', (table) => {
+		table.text('html');
+	});
+};
+
+exports.down = async (knex) => {
+	await knex.schema.alterTable('banners', (table) => {
+		table.dropColumn('html');
+	});
+};

public/banners/mindgeek/mindgeek_300_100.html

@@ -0,0 +1 @@
+<iframe style="background-color: white;" width="300" height="100" scrolling="no" frameborder="0" allowtransparency="true" marginheight="0" marginwidth="0" name="spot_id_10002480" src="//a.adtng.com/get/10002480?ata=DebaucheryLibrarian"></iframe>

public/banners/mindgeek/mindgeek_300_250.html

@@ -0,0 +1 @@
+<iframe style="background-color: white;" width="300" height="250" scrolling="no" frameborder="0" allowtransparency="true" marginheight="0" marginwidth="0" name="spot_id_10001807" src="//a.adtng.com/get/10001807?ata=DebaucheryLibrarian"></iframe>

public/banners/mindgeek/mindgeek_315_300.html

@@ -0,0 +1 @@
+<iframe style="background-color: white;" width="315" height="300" scrolling="no" frameborder="0" allowtransparency="true" marginheight="0" marginwidth="0" name="spot_id_10002484" src="//a.adtng.com/get/10002484?ata=DebaucheryLibrarian"></iframe>

public/banners/mindgeek/mindgeek_728_90_gay.html

@@ -0,0 +1 @@
+<iframe style="background-color: white;" width="728" height="90" scrolling="no" frameborder="0" allowtransparency="true" marginheight="0" marginwidth="0" name="spot_id_10002466" src="//a.adtng.com/get/10002466?ata=DebaucheryLibrarian"></iframe>