Moved all tag photos to public asset directory.

assets/components/tags/tag.vue

@@ -37,12 +37,12 @@
                         v-for="photo in tag.photos"
                         :key="`photo-${photo.id}`"
                         :title="photo.comment"
-                        :href="`/media/${photo.path}`"
+                        :href="`/img/${photo.path}`"
                         target="_blank"
                         rel="noopener noreferrer"
                     >
                         <img
-                            :src="`/media/${photo.thumbnail}`"
+                            :src="`/img/${photo.thumbnail}`"
                             class="photo"
                         >
                     </a>

seeds/04_media.js

@@ -3,7 +3,7 @@ const upsert = require('../src/utils/upsert');
 function getMedia(tagsMap) {
     return [
         {
-            path: 'tags/airtight.jpeg',
+            path: 'tags/airtight/poster.jpeg',
             target_id: tagsMap.airtight,
             role: 'poster',
             comment: 'Jynx Maze in "Pump My Ass Full of Cum 3" for Jules Jordan',
@@ -19,41 +19,47 @@ function getMedia(tagsMap) {
             comment: 'Chloe Amour in "DP Masters 4" for Jules Jordan',
         },
         {
-            path: 'tags/airtight/0.jpeg',
+            path: 'tags/airtight/0/poster.jpeg',
             domain: 'tags',
             target_id: tagsMap.airtight,
             comment: 'Sheena Shaw in "Ass Worship 14" for Jules Jordan',
         },
         {
-            path: 'tags/anal.jpeg',
+            path: 'tags/anal/poster.jpeg',
             target_id: tagsMap.anal,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/double-penetration.jpeg',
+            path: 'tags/double-penetration/poster.jpeg',
             target_id: tagsMap['double-penetration'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/double-anal.jpeg',
+            path: 'tags/double-anal/poster.jpeg',
             target_id: tagsMap['double-anal'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/double-vaginal.jpeg',
+            path: 'tags/double-vaginal/poster.jpeg',
             target_id: tagsMap['double-vaginal'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/da-tp.jpeg',
+            path: 'tags/da-tp/poster.jpeg',
             target_id: tagsMap['da-tp'],
             role: 'poster',
             comment: 'Ninel Mojado aka Mira Cuckold in GIO063 for LegalPorno',
         },
+        {
+            path: 'tags/da-tp/3.jpeg',
+            target_id: tagsMap['da-tp'],
+            role: 'photo',
+            comment: 'Evelina Darling in GIO294',
+        },
         {
             path: 'tags/da-tp/1.jpeg',
             target_id: tagsMap['da-tp'],
@@ -67,19 +73,19 @@ function getMedia(tagsMap) {
             comment: 'Angel Smalls in GIO408 for LegalPorno',
         },
         {
-            path: 'tags/dv-tp.jpeg',
+            path: 'tags/dv-tp/poster.jpeg',
             target_id: tagsMap['dv-tp'],
             role: 'poster',
             comment: 'Juelz Ventura in "Gangbanged 5" for Elegant Angel',
         },
         {
-            path: 'tags/tattoo.jpeg',
+            path: 'tags/tattoo/poster.jpeg',
             target_id: tagsMap.tattoo,
             role: 'poster',
             comment: 'Kali Roses in "Goes All In For Anal" for Hussie Pass',
         },
         {
-            path: 'tags/triple-anal.jpeg',
+            path: 'tags/triple-anal/poster.jpeg',
             target_id: tagsMap['triple-anal'],
             role: 'poster',
             comment: 'Kristy Black in SZ1986 for LegalPorno',
@@ -97,13 +103,13 @@ function getMedia(tagsMap) {
             comment: 'Kira Thorn in GIO1018 for LegalPorno',
         },
         {
-            path: 'tags/blowbang.jpeg',
+            path: 'tags/blowbang/poster.jpeg',
             target_id: tagsMap.blowbang,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/gangbang.jpeg',
+            path: 'tags/gangbang/poster.jpeg',
             target_id: tagsMap.gangbang,
             role: 'poster',
             comment: '',
@@ -127,85 +133,85 @@ function getMedia(tagsMap) {
             comment: 'Kelsi Monroe in "Brazzers House 2, Day 2" for Brazzers',
         },
         {
-            path: 'tags/mff.jpeg',
+            path: 'tags/mff/poster.jpeg',
             target_id: tagsMap.mff,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/mfm.jpeg',
+            path: 'tags/mfm/poster.jpeg',
             target_id: tagsMap.mfm,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/orgy.jpeg',
+            path: 'tags/orgy/poster.jpeg',
             target_id: tagsMap.orgy,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/asian.jpeg',
+            path: 'tags/asian/poster.jpeg',
             target_id: tagsMap.asian,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/caucasian.jpeg',
+            path: 'tags/caucasian/poster.jpeg',
             target_id: tagsMap.caucasian,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/ebony.jpeg',
+            path: 'tags/ebony/poster.jpeg',
             target_id: tagsMap.ebony,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/latina.jpeg',
+            path: 'tags/latina/poster.jpeg',
             target_id: tagsMap.latina,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/interracial.jpeg',
+            path: 'tags/interracial/poster.jpeg',
             target_id: tagsMap.interracial,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/facial.jpeg',
+            path: 'tags/facial/poster.jpeg',
             target_id: tagsMap.facial,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/bukkake.jpeg',
+            path: 'tags/bukkake/poster.jpeg',
             target_id: tagsMap.bukkake,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/swallowing.jpeg',
+            path: 'tags/swallowing/poster.jpeg',
             target_id: tagsMap.swallowing,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/creampie.jpeg',
+            path: 'tags/creampie/poster.jpeg',
             target_id: tagsMap.creampie,
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/anal-creampie.jpeg',
+            path: 'tags/anal-creampie/poster.jpeg',
             target_id: tagsMap['anal-creampie'],
             role: 'poster',
             comment: '',
         },
         {
-            path: 'tags/oral-creampie.jpeg',
+            path: 'tags/oral-creampie/poster.jpeg',
             target_id: tagsMap['oral-creampie'],
             role: 'poster',
             comment: '',

src/actors.js

@@ -332,8 +332,9 @@ async function scrapeActors(actorNames) {
                 const profile = await scraper.fetchProfile(actorEntry ? actorEntry.name : actorName);
 
                 return {
-                    scraper: scraperSlug,
                     ...profile,
+                    name: actorName,
+                    scraper: scraperSlug,
                 };
             });
 

src/scrapers/freeones.js

@@ -1,135 +1,86 @@
 'use strict';
 
-/* eslint-disable newline-per-chained-call */
 const bhttp = require('bhttp');
 const { JSDOM } = require('jsdom');
 const moment = require('moment');
 
-async function scrapeProfileFrontpage(html, url, name) {
+function scrapeProfile(html, actorName) {
     const { document } = new JSDOM(html).window;
-    const bioEl = document.querySelector('.dashboard-bio-list');
+    const profile = { name: actorName };
 
-    const bioUrl = `https:${document.querySelector('.seemore a').href}`;
+    const bio = Array.from(document.querySelectorAll('a[href^="/babes"]'), el => decodeURI(el.href)).reduce((acc, item) => {
+        const keyMatch = item.match(/\[\w+\]/);
 
-    const keys = Array.from(bioEl.querySelectorAll('dt'), el => el.textContent.trim());
-    const values = Array.from(bioEl.querySelectorAll('dd'), el => el.textContent.trim());
+        if (keyMatch) {
+            const key = keyMatch[0].slice(1, -1);
+            const [, value] = item.split('=');
 
-    const bio = keys.reduce((acc, key, index) => ({ ...acc, [key]: values[index] }), {});
+            // both hip and waist link to 'waist', assume biggest value is hip
+            if (key === 'waist' && acc.waist) {
+                if (acc.waist > value) {
+                    acc.hip = acc.waist;
+                    acc.waist = value;
 
-    const profile = {
-        name,
-        gender: 'female',
-    };
+                    return acc;
+                }
 
-    const birthdateString = bio['Date of Birth:'];
-    const measurementsString = bio['Measurements:'];
+                acc.hip = value;
 
-    const birthCityString = bio['Place of Birth:'];
-    const birthCity = birthCityString !== undefined && birthCityString !== 'Unknown' && birthCityString !== 'Unknown (add)' && birthCityString;
+                return acc;
+            }
 
-    const birthCountryString = bio['Country of Origin:'];
-    const birthCountry = birthCountryString !== undefined && birthCountryString !== 'Unknown' && birthCountryString !== 'Unknown (add)' && birthCountryString;
+            acc[key] = value;
+        }
 
-    const piercingsString = bio['Piercings:'];
-    const tattoosString = bio['Tattoos:'];
+        return acc;
+    }, {});
 
-    if (birthdateString && birthdateString !== 'Unknown (add)') profile.birthdate = moment.utc(birthdateString.slice(0, birthdateString.indexOf(' (')), 'MMMM D, YYYY').toDate();
-    if (measurementsString) [profile.bust, profile.waist, profile.hip] = measurementsString.split('-').map(measurement => (measurement === '??' ? null : measurement));
+    if (bio.dateOfBirth) profile.birthdate = moment.utc(bio.dateOfBirth, 'YYYY-MM-DD').toDate();
 
-    if (bio['Fake Boobs:']) profile.naturalBoobs = bio['Fake Boobs:'] === 'No';
-    profile.birthPlace = `${birthCity || ''}${birthCity ? ', ' : ''}${birthCountry || ''}`;
+    if (profile.placeOfBirth || bio.country) profile.birthPlace = `${bio.placeOfBirth}, ${bio.country}`;
+    profile.eyes = bio.eyeColor;
+    profile.hair = bio.hairColor;
+    profile.ethnicity = bio.ethnicity;
 
-    profile.hair = bio['Hair Color:'].toLowerCase();
-    profile.eyes = bio['Eye Color:'].toLowerCase();
+    profile.bust = bio.bra;
+    if (bio.waist) profile.waist = Number(bio.waist.split(',')[0]);
+    if (bio.hip) profile.hip = Number(bio.hip.split(',')[0]);
 
-    if (piercingsString) profile.hasPiercings = !!(piercingsString !== 'Unknown (add)' && piercingsString !== 'None');
-    if (tattoosString) profile.hasTattoos = !!(tattoosString !== 'Unknown (add)' && tattoosString !== 'None');
+    if (bio.height) profile.height = Number(bio.height.split(',')[0]);
+    if (bio.weight) profile.weight = Number(bio.weight.split(',')[0]);
 
-    if (profile.hasPiercings && piercingsString !== 'various') profile.piercings = piercingsString;
-    if (profile.hasTattoos && tattoosString !== 'various') profile.tattoos = tattoosString;
-
-    profile.social = Array.from(bioEl.querySelectorAll('.dashboard-socialmedia a'), el => el.href);
-
-    return {
-        profile,
-        url: bioUrl,
-    };
-}
-
-async function scrapeProfileBio(html, frontpageProfile, url, name) {
-    const { document } = new JSDOM(html).window;
-    const bioEl = document.querySelector('#biographyTable');
-
-    const keys = Array.from(bioEl.querySelectorAll('td:nth-child(1)'), el => el.textContent.trim());
-    const values = Array.from(bioEl.querySelectorAll('td:nth-child(2)'), el => el.textContent.trim());
-
-    const bio = keys.reduce((acc, key, index) => ({ ...acc, [key]: values[index] }), {});
-
-    const profile = {
-        ...frontpageProfile,
-        name,
-        gender: 'female',
-    };
-
-    const birthdateString = bio['Date of Birth:'];
-    const measurementsString = bio['Measurements:'];
-
-    const birthCityString = bio['Place of Birth:'];
-    const birthCity = birthCityString !== undefined && birthCityString !== 'Unknown' && birthCityString !== 'Unknown (add)' && birthCityString;
-
-    const birthCountryString = bio['Country of Origin:'];
-    const birthCountry = birthCountryString !== undefined && birthCountryString !== 'Unknown' && birthCountryString !== 'Unknown (add)' && birthCountryString;
-
-    const piercingsString = bio['Piercings:'];
-    const tattoosString = bio['Tattoos:'];
-
-    if (birthdateString && birthdateString !== 'Unknown') profile.birthdate = moment.utc(birthdateString.slice(0, birthdateString.indexOf(' (')), 'MMMM D, YYYY').toDate();
-    if (measurementsString) [profile.bust, profile.waist, profile.hip] = measurementsString.split('-').map(measurement => (measurement === '??' ? null : measurement));
-
-    if (bio['Fake boobs']) profile.naturalBoobs = bio['Fake boobs:'] === 'No';
-    profile.ethnicity = bio['Ethnicity:'];
-
-    profile.birthPlace = `${birthCity || ''}${birthCity ? ', ' : ''}${birthCountry || ''}`;
-
-    profile.hair = bio['Hair Color:'].toLowerCase();
-    profile.eyes = bio['Eye Color:'].toLowerCase();
-    profile.height = Number(bio['Height:'].match(/\d+/)[0]);
-    profile.weight = Number(bio['Weight:'].match(/\d+/)[0]);
-
-    if (piercingsString) profile.hasPiercings = !!(piercingsString !== 'Unknown (add)' && piercingsString !== 'None');
-    if (tattoosString) profile.hasTattoos = !!(tattoosString !== 'Unknown (add)' && tattoosString !== 'None');
-
-    if (profile.hasPiercings && piercingsString !== 'various') profile.piercings = piercingsString;
-    if (profile.hasTattoos && tattoosString !== 'various') profile.tattoos = tattoosString;
-
-    profile.social = Array.from(bioEl.querySelectorAll('#socialmedia a'), el => el.href);
+    profile.social = Array.from(document.querySelectorAll('.profile-meta-item a.social-icons'), el => el.href);
+    profile.avatar = document.querySelector('.profile-image-large img').src;
 
     return profile;
 }
 
+function scrapeSearch(html) {
+    const { document } = new JSDOM(html).window;
+
+    return document.querySelector('a.image-link')?.href || null;
+}
+
 async function fetchProfile(actorName) {
-    const slug = actorName.replace(' ', '_');
-    const frontpageUrl = `https://www.freeones.com/html/v_links/${slug}`;
+    const actorSlug = actorName.toLowerCase().replace(/\s+/g, '-');
 
-    const resFrontpage = await bhttp.get(frontpageUrl);
+    const res = await bhttp.get(`https://freeones.nl/${actorSlug}/profile`);
 
-    if (resFrontpage.statusCode === 200) {
-        const { url, bio } = await scrapeProfileFrontpage(resFrontpage.body.toString(), frontpageUrl, actorName);
-        const resBio = await bhttp.get(url);
-
-        return scrapeProfileBio(resBio.body.toString(), bio, url, actorName);
+    if (res.statusCode === 200) {
+        return scrapeProfile(res.body.toString(), actorName);
     }
 
-    // apparently some actors are appended 'Babe' as their surname...
-    const fallbackSlug = `${slug}_Babe`;
-    const fallbackUrl = `https://www.freeones.com/html/s_links/${fallbackSlug}`;
-    const resFallback = await bhttp.get(fallbackUrl);
+    const searchRes = await bhttp.get(`https://freeones.nl/babes?q=${actorName}`);
+    const actorPath = scrapeSearch(searchRes.body.toString());
 
-    if (resFallback.statusCode === 200) {
-        const { url, profile } = await scrapeProfileFrontpage(resFallback.body.toString(), fallbackUrl, actorName);
-        const resBio = await bhttp.get(url);
+    if (actorPath) {
+        const actorRes = await bhttp.get(`https://freeones.nl${actorPath}/profile`);
 
-        return scrapeProfileBio(resBio.body.toString(), profile, url, actorName);
+        if (actorRes.statusCode === 200) {
+            return scrapeProfile(actorRes.body.toString(), actorName);
+        }
+
+        return null;
     }
 
     return null;

src/scrapers/freeones_legacy.js

@@ -0,0 +1,140 @@
+'use strict';
+
+/* eslint-disable newline-per-chained-call */
+const bhttp = require('bhttp');
+const { JSDOM } = require('jsdom');
+const moment = require('moment');
+
+async function scrapeProfileFrontpage(html, url, name) {
+    const { document } = new JSDOM(html).window;
+    const bioEl = document.querySelector('.dashboard-bio-list');
+
+    const bioUrl = `https:${document.querySelector('.seemore a').href}`;
+
+    const keys = Array.from(bioEl.querySelectorAll('dt'), el => el.textContent.trim());
+    const values = Array.from(bioEl.querySelectorAll('dd'), el => el.textContent.trim());
+
+    const bio = keys.reduce((acc, key, index) => ({ ...acc, [key]: values[index] }), {});
+
+    const profile = {
+        name,
+        gender: 'female',
+    };
+
+    const birthdateString = bio['Date of Birth:'];
+    const measurementsString = bio['Measurements:'];
+
+    const birthCityString = bio['Place of Birth:'];
+    const birthCity = birthCityString !== undefined && birthCityString !== 'Unknown' && birthCityString !== 'Unknown (add)' && birthCityString;
+
+    const birthCountryString = bio['Country of Origin:'];
+    const birthCountry = birthCountryString !== undefined && birthCountryString !== 'Unknown' && birthCountryString !== 'Unknown (add)' && birthCountryString;
+
+    const piercingsString = bio['Piercings:'];
+    const tattoosString = bio['Tattoos:'];
+
+    if (birthdateString && birthdateString !== 'Unknown (add)') profile.birthdate = moment.utc(birthdateString.slice(0, birthdateString.indexOf(' (')), 'MMMM D, YYYY').toDate();
+    if (measurementsString) [profile.bust, profile.waist, profile.hip] = measurementsString.split('-').map(measurement => (measurement === '??' ? null : measurement));
+
+    if (bio['Fake Boobs:']) profile.naturalBoobs = bio['Fake Boobs:'] === 'No';
+    profile.birthPlace = `${birthCity || ''}${birthCity ? ', ' : ''}${birthCountry || ''}`;
+
+    profile.hair = bio['Hair Color:'].toLowerCase();
+    profile.eyes = bio['Eye Color:'].toLowerCase();
+
+    if (piercingsString) profile.hasPiercings = !!(piercingsString !== 'Unknown (add)' && piercingsString !== 'None');
+    if (tattoosString) profile.hasTattoos = !!(tattoosString !== 'Unknown (add)' && tattoosString !== 'None');
+
+    if (profile.hasPiercings && piercingsString !== 'various') profile.piercings = piercingsString;
+    if (profile.hasTattoos && tattoosString !== 'various') profile.tattoos = tattoosString;
+
+    profile.social = Array.from(bioEl.querySelectorAll('.dashboard-socialmedia a'), el => el.href);
+
+    return {
+        profile,
+        url: bioUrl,
+    };
+}
+
+async function scrapeProfileBio(html, frontpageProfile, url, name) {
+    const { document } = new JSDOM(html).window;
+    const bioEl = document.querySelector('#biographyTable');
+
+    const keys = Array.from(bioEl.querySelectorAll('td:nth-child(1)'), el => el.textContent.trim());
+    const values = Array.from(bioEl.querySelectorAll('td:nth-child(2)'), el => el.textContent.trim());
+
+    const bio = keys.reduce((acc, key, index) => ({ ...acc, [key]: values[index] }), {});
+
+    const profile = {
+        ...frontpageProfile,
+        name,
+        gender: 'female',
+    };
+
+    const birthdateString = bio['Date of Birth:'];
+    const measurementsString = bio['Measurements:'];
+
+    const birthCityString = bio['Place of Birth:'];
+    const birthCity = birthCityString !== undefined && birthCityString !== 'Unknown' && birthCityString !== 'Unknown (add)' && birthCityString;
+
+    const birthCountryString = bio['Country of Origin:'];
+    const birthCountry = birthCountryString !== undefined && birthCountryString !== 'Unknown' && birthCountryString !== 'Unknown (add)' && birthCountryString;
+
+    const piercingsString = bio['Piercings:'];
+    const tattoosString = bio['Tattoos:'];
+
+    if (birthdateString && birthdateString !== 'Unknown') profile.birthdate = moment.utc(birthdateString.slice(0, birthdateString.indexOf(' (')), 'MMMM D, YYYY').toDate();
+    if (measurementsString) [profile.bust, profile.waist, profile.hip] = measurementsString.split('-').map(measurement => (measurement === '??' ? null : measurement));
+
+    if (bio['Fake boobs']) profile.naturalBoobs = bio['Fake boobs:'] === 'No';
+    profile.ethnicity = bio['Ethnicity:'];
+
+    profile.birthPlace = `${birthCity || ''}${birthCity ? ', ' : ''}${birthCountry || ''}`;
+
+    profile.hair = bio['Hair Color:'].toLowerCase();
+    profile.eyes = bio['Eye Color:'].toLowerCase();
+    profile.height = Number(bio['Height:'].match(/\d+/)[0]);
+    profile.weight = Number(bio['Weight:'].match(/\d+/)[0]);
+
+    if (piercingsString) profile.hasPiercings = !!(piercingsString !== 'Unknown (add)' && piercingsString !== 'None');
+    if (tattoosString) profile.hasTattoos = !!(tattoosString !== 'Unknown (add)' && tattoosString !== 'None');
+
+    if (profile.hasPiercings && piercingsString !== 'various') profile.piercings = piercingsString;
+    if (profile.hasTattoos && tattoosString !== 'various') profile.tattoos = tattoosString;
+
+    profile.social = Array.from(bioEl.querySelectorAll('#socialmedia a'), el => el.href);
+
+    return profile;
+}
+
+async function fetchProfile(actorName) {
+    const slug = actorName.replace(' ', '_');
+    const frontpageUrl = `https://www.freeones.com/html/v_links/${slug}`;
+
+    const resFrontpage = await bhttp.get(frontpageUrl);
+
+    if (resFrontpage.statusCode === 200) {
+        const { url, bio } = await scrapeProfileFrontpage(resFrontpage.body.toString(), frontpageUrl, actorName);
+        const resBio = await bhttp.get(url);
+
+        return scrapeProfileBio(resBio.body.toString(), bio, url, actorName);
+    }
+
+    // apparently some actors are appended 'Babe' as their surname...
+    const fallbackSlug = `${slug}_Babe`;
+    const fallbackUrl = `https://www.freeones.com/html/s_links/${fallbackSlug}`;
+    const resFallback = await bhttp.get(fallbackUrl);
+
+    if (resFallback.statusCode === 200) {
+        const { url, profile } = await scrapeProfileFrontpage(resFallback.body.toString(), fallbackUrl, actorName);
+        const resBio = await bhttp.get(url);
+
+        return scrapeProfileBio(resBio.body.toString(), profile, url, actorName);
+    }
+
+    return null;
+}
+
+module.exports = {
+    fetchProfile,
+};

src/scrapers/legalporno.js

@@ -28,6 +28,10 @@ function getPoster(posterElement, sceneId) {
     const posterRangeData = posterRange ? JSON.parse(posterRange) : null;
     const posterTimeRange = posterRangeData[Math.floor(Math.random() * posterRangeData.length)];
 
+    if (!posterTimeRange) {
+        return null;
+    }
+
     if (typeof posterTimeRange === 'number') {
         // poster time is already a single time value
         return `https://legalporno.com/casting/${sceneId}/${posterTimeRange}`;

src/scrapers/scrapers.js

@@ -25,6 +25,7 @@ const xempire = require('./xempire');
 
 // profiles
 const freeones = require('./freeones');
+const freeonesLegacy = require('./freeones_legacy');
 const pornhub = require('./pornhub');
 
 module.exports = {
@@ -54,11 +55,12 @@ module.exports = {
         // ordered by data priority
         xempire,
         brazzers,
-        freeones,
-        kellymadison,
-        julesjordan,
         legalporno,
         pornhub,
+        freeones,
+        freeonesLegacy,
+        kellymadison,
+        julesjordan,
         ddfnetwork,
     },
 };