From 83f51219e4ad8b227b652ef413842a226699196e Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Fri, 18 Dec 2020 23:28:02 +0100
Subject: [PATCH] Updated warning message. Added grandparent networks to
 network seed file, merged 21Naturals and 21Sextreme into 21Sextury.

---
 assets/components/container/warning.vue | 31 ++++++++++++++++++---
 seeds/01_networks.js                    | 37 +++++++++++++++++++++----
 2 files changed, 58 insertions(+), 10 deletions(-)

diff --git a/assets/components/container/warning.vue b/assets/components/container/warning.vue
index 50c09750..47338464 100644
--- a/assets/components/container/warning.vue
+++ b/assets/components/container/warning.vue
@@ -1,15 +1,20 @@
 <template>
 	<div class="warning-container">
 		<div class="warning">
+			<div
+				class="logo"
+				v-html="logo"
+			/>
+
 			<strong class="title">This website contains sexually explicit content</strong>
 
 			<span class="copy">By entering, you agree to the following</span>
 
 			<ul class="rules">
-				<li class="rule">You are at least 18 years old, and a legal adult in your jurisdiction.</li>
-				<li class="rule">You are prepared see, hear and read erotic and sexual material, some of which could be considered obscene or offensive by some.</li>
-				<li class="rule">You understand that the majority of sexual acts on this website are fictional, performed by professional actors for entertainment purposes, and not representative of real-life interactions.</li>
-				<li class="rule">Respect your sexual partners, communicate about each other's fantasies and limits, and take precautions to prevent sexually transmitted infections and unintended pregnancies.</li>
+				<li class="rule">You are at least 18 years old, and have the legal right to consume adult material in your jurisdiction.</li>
+				<li class="rule">You are prepared see, hear and read erotic and sexual material, and do not regard such content as obscene or offensive.</li>
+				<li class="rule">You understand that most sexual acts on this website depict fictional scenarios, performed by professional actors for entertainment purposes, and are not representative of real-life interactions.</li>
+				<li class="rule">Respect your sexual partners, communicate about each other's desires and limits, and take precautions to prevent sexually transmitted infections and unintended pregnancies.</li>
 			</ul>
 
 			<div class="actions">
@@ -27,6 +32,18 @@
 	</div>
 </template>
 
+<script>
+import logo from '../../img/logo.svg';
+
+export default {
+	data() {
+		return {
+			logo,
+		};
+	},
+};
+</script>
+
 <style lang="scss" scoped>
 @import 'breakpoints';
 
@@ -117,6 +134,12 @@
 	}
 }
 
+.logo {
+	fill: var(--primary);
+	text-align: center;
+	width: 2rem;
+}
+
 @media(max-width: $breakpoint) {
 	.title {
 		font-size: 1.5rem;
diff --git a/seeds/01_networks.js b/seeds/01_networks.js
index 1debbf11..123dd2fc 100644
--- a/seeds/01_networks.js
+++ b/seeds/01_networks.js
@@ -1,7 +1,7 @@
 /* eslint-disable max-len */
 const upsert = require('../src/utils/upsert');
 
-const parentNetworks = [
+const grandParentNetworks = [
 	{
 		slug: 'gamma',
 		name: 'Gamma Entertainment',
@@ -36,7 +36,7 @@ const parentNetworks = [
 	},
 ];
 
-const networks = [
+const parentNetworks = [
 	{
 		slug: '21sextury',
 		name: '21Sextury',
@@ -47,6 +47,9 @@ const networks = [
 		},
 		parent: 'gamma',
 	},
+];
+
+const networks = [
 	{
 		slug: '21sextreme',
 		name: '21Sextreme',
@@ -55,7 +58,7 @@ const networks = [
 		parameters: {
 			mobile: 'https://m.dpfanatics.com/en/video',
 		},
-		parent: 'gamma',
+		parent: '21sextury',
 	},
 	{
 		slug: '21naturals',
@@ -65,7 +68,7 @@ const networks = [
 		parameters: {
 			mobile: 'https://m.dpfanatics.com/en/video',
 		},
-		parent: 'gamma',
+		parent: '21sextury',
 	},
 	{
 		slug: 'adulttime',
@@ -512,7 +515,21 @@ const networks = [
 
 exports.seed = knex => Promise.resolve()
 	.then(async () => {
-		const parentNetworkEntries = await upsert('entities', parentNetworks.map(network => ({ ...network, type: 'network' })), ['slug', 'type'], knex);
+		const grandParentNetworkEntries = await upsert('entities', grandParentNetworks.map(network => ({ ...network, type: 'network' })), ['slug', 'type'], knex);
+		const grandParentNetworksBySlug = [].concat(grandParentNetworkEntries.inserted, grandParentNetworkEntries.updated).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
+
+		const parentNetworksWithGrandParent = parentNetworks.map(network => ({
+			slug: network.slug,
+			name: network.name,
+			type: network.type || 'network',
+			alias: network.alias,
+			url: network.url,
+			description: network.description,
+			parameters: network.parameters,
+			parent_id: grandParentNetworksBySlug[network.parent] || null,
+		}));
+
+		const parentNetworkEntries = await upsert('entities', parentNetworksWithGrandParent, ['slug', 'type'], knex);
 		const parentNetworksBySlug = [].concat(parentNetworkEntries.inserted, parentNetworkEntries.updated).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
 
 		const networksWithParent = networks.map(network => ({
@@ -528,7 +545,15 @@ exports.seed = knex => Promise.resolve()
 
 		const networkEntries = await upsert('entities', networksWithParent, ['slug', 'type'], knex);
 
-		const networkIdsBySlug = [].concat(networkEntries.inserted, networkEntries.updated).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
+		const networkIdsBySlug = [].concat(
+			grandParentNetworkEntries.inserted,
+			grandParentNetworkEntries.updated,
+			parentNetworkEntries.inserted,
+			parentNetworkEntries.updated,
+			networkEntries.inserted,
+			networkEntries.updated,
+		).reduce((acc, network) => ({ ...acc, [network.slug]: network.id }), {});
+
 		const tagSlugs = networks.map(network => network.tags).flat().filter(Boolean);
 
 		const tagEntries = await knex('tags').whereIn('slug', tagSlugs);