diff --git a/assets/js/entities/actions.js b/assets/js/entities/actions.js index cbba74ba..3f32254b 100644 --- a/assets/js/entities/actions.js +++ b/assets/js/entities/actions.js @@ -84,9 +84,24 @@ function initEntitiesActions(store, _router) { { entity: { or: [ - { slug: { equalTo: $entitySlug } }, - { parent: { slug: { equalTo: $entitySlug } } }, - { parent: { parent: { slug: { equalTo: $entitySlug } } } } + { + slug: { equalTo: $entitySlug } + type: { equalTo: "channel" } + }, + { + parent: { + slug: { equalTo: $entitySlug } + type: { equalTo: $entityType } + } + }, + { + parent: { + parent: { + slug: { equalTo: $entitySlug } + type: { equalTo: $entityType } + } + } + } ] } } diff --git a/config/default.js b/config/default.js index 9d92e2cd..1d95a5cc 100644 --- a/config/default.js +++ b/config/default.js @@ -128,6 +128,14 @@ module.exports = { 'naughtyamerica', 'cherrypimps', 'pimpxxx', + [ + 'letsdoeit', + 'mamacitaz', + 'forbondage', + 'amateureuro', + 'vipsexvault', + 'transbella', + ], [ 'hussiepass', 'hushpass', diff --git a/public/img/logos/amateureuro/amateureuro.png b/public/img/logos/amateureuro/amateureuro.png new file mode 100644 index 00000000..6d1f7f8b Binary files /dev/null and b/public/img/logos/amateureuro/amateureuro.png differ diff --git a/public/img/logos/amateureuro/castingallaitaliana.png b/public/img/logos/amateureuro/castingallaitaliana.png new file mode 100644 index 00000000..ab7a45e3 Binary files /dev/null and b/public/img/logos/amateureuro/castingallaitaliana.png differ diff --git a/public/img/logos/amateureuro/castingfrancais.png b/public/img/logos/amateureuro/castingfrancais.png new file mode 100644 index 00000000..c18bca76 Binary files /dev/null and b/public/img/logos/amateureuro/castingfrancais.png differ diff --git a/public/img/logos/amateureuro/deutschlandreport.png b/public/img/logos/amateureuro/deutschlandreport.png new file mode 100644 index 00000000..26f26db8 Binary files /dev/null and b/public/img/logos/amateureuro/deutschlandreport.png differ diff --git a/public/img/logos/amateureuro/favicon.png b/public/img/logos/amateureuro/favicon.png new file mode 100644 index 00000000..a089b66b Binary files /dev/null and b/public/img/logos/amateureuro/favicon.png differ diff --git a/public/img/logos/amateureuro/hausfrauficken.png b/public/img/logos/amateureuro/hausfrauficken.png new file mode 100644 index 00000000..11d8bfe9 Binary files /dev/null and b/public/img/logos/amateureuro/hausfrauficken.png differ diff --git a/public/img/logos/amateureuro/lacochonne.png b/public/img/logos/amateureuro/lacochonne.png new file mode 100644 index 00000000..2685362c Binary files /dev/null and b/public/img/logos/amateureuro/lacochonne.png differ diff --git a/public/img/logos/amateureuro/lanovice.png b/public/img/logos/amateureuro/lanovice.png new file mode 100644 index 00000000..ce2f94d8 Binary files /dev/null and b/public/img/logos/amateureuro/lanovice.png differ diff --git a/public/img/logos/amateureuro/lasfolladoras.png b/public/img/logos/amateureuro/lasfolladoras.png new file mode 100644 index 00000000..e218f2cd Binary files /dev/null and b/public/img/logos/amateureuro/lasfolladoras.png differ diff --git a/public/img/logos/amateureuro/lazy/amateureuro.png b/public/img/logos/amateureuro/lazy/amateureuro.png new file mode 100644 index 00000000..ed9fee52 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/amateureuro.png differ diff --git a/public/img/logos/amateureuro/lazy/castingallaitaliana.png b/public/img/logos/amateureuro/lazy/castingallaitaliana.png new file mode 100644 index 00000000..aac063c7 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/castingallaitaliana.png differ diff --git a/public/img/logos/amateureuro/lazy/castingfrancais.png b/public/img/logos/amateureuro/lazy/castingfrancais.png new file mode 100644 index 00000000..95c2c396 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/castingfrancais.png differ diff --git a/public/img/logos/amateureuro/lazy/deutschlandreport.png b/public/img/logos/amateureuro/lazy/deutschlandreport.png new file mode 100644 index 00000000..aef4c1fc Binary files /dev/null and b/public/img/logos/amateureuro/lazy/deutschlandreport.png differ diff --git a/public/img/logos/amateureuro/lazy/favicon.png b/public/img/logos/amateureuro/lazy/favicon.png new file mode 100644 index 00000000..15587300 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/favicon.png differ diff --git a/public/img/logos/amateureuro/lazy/hausfrauficken.png b/public/img/logos/amateureuro/lazy/hausfrauficken.png new file mode 100644 index 00000000..d31b740e Binary files /dev/null and b/public/img/logos/amateureuro/lazy/hausfrauficken.png differ diff --git a/public/img/logos/amateureuro/lazy/lacochonne.png b/public/img/logos/amateureuro/lazy/lacochonne.png new file mode 100644 index 00000000..dfff0a76 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/lacochonne.png differ diff --git a/public/img/logos/amateureuro/lazy/lanovice.png b/public/img/logos/amateureuro/lazy/lanovice.png new file mode 100644 index 00000000..04d209b1 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/lanovice.png differ diff --git a/public/img/logos/amateureuro/lazy/lasfolladoras.png b/public/img/logos/amateureuro/lazy/lasfolladoras.png new file mode 100644 index 00000000..f4f2d822 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/lasfolladoras.png differ diff --git a/public/img/logos/amateureuro/lazy/network.png b/public/img/logos/amateureuro/lazy/network.png new file mode 100644 index 00000000..dafa10cf Binary files /dev/null and b/public/img/logos/amateureuro/lazy/network.png differ diff --git a/public/img/logos/amateureuro/lazy/reifeswinger.png b/public/img/logos/amateureuro/lazy/reifeswinger.png new file mode 100644 index 00000000..b4b64256 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/reifeswinger.png differ diff --git a/public/img/logos/amateureuro/lazy/scambistimaturi.png b/public/img/logos/amateureuro/lazy/scambistimaturi.png new file mode 100644 index 00000000..d4d9bf9e Binary files /dev/null and b/public/img/logos/amateureuro/lazy/scambistimaturi.png differ diff --git a/public/img/logos/amateureuro/lazy/sextapegermany.png b/public/img/logos/amateureuro/lazy/sextapegermany.png new file mode 100644 index 00000000..7b970319 Binary files /dev/null and b/public/img/logos/amateureuro/lazy/sextapegermany.png differ diff --git a/public/img/logos/amateureuro/lazy/xxxomas.png b/public/img/logos/amateureuro/lazy/xxxomas.png new file mode 100644 index 00000000..0baa478f Binary files /dev/null and b/public/img/logos/amateureuro/lazy/xxxomas.png differ diff --git a/public/img/logos/amateureuro/misc/amateur-euro.svg b/public/img/logos/amateureuro/misc/amateur-euro.svg new file mode 100644 index 00000000..dbd404ec --- /dev/null +++ b/public/img/logos/amateureuro/misc/amateur-euro.svg @@ -0,0 +1,141 @@ + + diff --git a/public/img/logos/amateureuro/misc/casting-alla-italiana.svg b/public/img/logos/amateureuro/misc/casting-alla-italiana.svg new file mode 100644 index 00000000..74bec05a --- /dev/null +++ b/public/img/logos/amateureuro/misc/casting-alla-italiana.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/casting-francais.svg b/public/img/logos/amateureuro/misc/casting-francais.svg new file mode 100644 index 00000000..41816ffe --- /dev/null +++ b/public/img/logos/amateureuro/misc/casting-francais.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/deutschland-report.svg b/public/img/logos/amateureuro/misc/deutschland-report.svg new file mode 100644 index 00000000..d005ba77 --- /dev/null +++ b/public/img/logos/amateureuro/misc/deutschland-report.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/hausfrau-ficken.svg b/public/img/logos/amateureuro/misc/hausfrau-ficken.svg new file mode 100644 index 00000000..e06d251b --- /dev/null +++ b/public/img/logos/amateureuro/misc/hausfrau-ficken.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/la-cochonne.svg b/public/img/logos/amateureuro/misc/la-cochonne.svg new file mode 100644 index 00000000..4430f7f1 --- /dev/null +++ b/public/img/logos/amateureuro/misc/la-cochonne.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/la-novice.svg b/public/img/logos/amateureuro/misc/la-novice.svg new file mode 100644 index 00000000..53be4606 --- /dev/null +++ b/public/img/logos/amateureuro/misc/la-novice.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/las-folladoras.svg b/public/img/logos/amateureuro/misc/las-folladoras.svg new file mode 100644 index 00000000..361337fe --- /dev/null +++ b/public/img/logos/amateureuro/misc/las-folladoras.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/olivier_demo.ttf b/public/img/logos/amateureuro/misc/olivier_demo.ttf new file mode 100644 index 00000000..03db16ac Binary files /dev/null and b/public/img/logos/amateureuro/misc/olivier_demo.ttf differ diff --git a/public/img/logos/amateureuro/misc/reife-swinger.svg b/public/img/logos/amateureuro/misc/reife-swinger.svg new file mode 100644 index 00000000..34229e90 --- /dev/null +++ b/public/img/logos/amateureuro/misc/reife-swinger.svg @@ -0,0 +1,1108 @@ + + diff --git a/public/img/logos/amateureuro/misc/scambisti-maturi.svg b/public/img/logos/amateureuro/misc/scambisti-maturi.svg new file mode 100644 index 00000000..d511b470 --- /dev/null +++ b/public/img/logos/amateureuro/misc/scambisti-maturi.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/sextape-germany.svg b/public/img/logos/amateureuro/misc/sextape-germany.svg new file mode 100644 index 00000000..00f7c573 --- /dev/null +++ b/public/img/logos/amateureuro/misc/sextape-germany.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/misc/xxx-omas.svg b/public/img/logos/amateureuro/misc/xxx-omas.svg new file mode 100644 index 00000000..b1bd95ca --- /dev/null +++ b/public/img/logos/amateureuro/misc/xxx-omas.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/amateureuro/network.png b/public/img/logos/amateureuro/network.png new file mode 100644 index 00000000..16487b9c Binary files /dev/null and b/public/img/logos/amateureuro/network.png differ diff --git a/public/img/logos/amateureuro/reifeswinger.png b/public/img/logos/amateureuro/reifeswinger.png new file mode 100644 index 00000000..572d5b18 Binary files /dev/null and b/public/img/logos/amateureuro/reifeswinger.png differ diff --git a/public/img/logos/amateureuro/scambistimaturi.png b/public/img/logos/amateureuro/scambistimaturi.png new file mode 100644 index 00000000..87b13790 Binary files /dev/null and b/public/img/logos/amateureuro/scambistimaturi.png differ diff --git a/public/img/logos/amateureuro/sextapegermany.png b/public/img/logos/amateureuro/sextapegermany.png new file mode 100644 index 00000000..d72e0893 Binary files /dev/null and b/public/img/logos/amateureuro/sextapegermany.png differ diff --git a/public/img/logos/amateureuro/thumbs/amateureuro.png b/public/img/logos/amateureuro/thumbs/amateureuro.png new file mode 100644 index 00000000..b3db7bef Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/amateureuro.png differ diff --git a/public/img/logos/amateureuro/thumbs/castingallaitaliana.png b/public/img/logos/amateureuro/thumbs/castingallaitaliana.png new file mode 100644 index 00000000..17cc1cce Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/castingallaitaliana.png differ diff --git a/public/img/logos/amateureuro/thumbs/castingfrancais.png b/public/img/logos/amateureuro/thumbs/castingfrancais.png new file mode 100644 index 00000000..61848228 Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/castingfrancais.png differ diff --git a/public/img/logos/amateureuro/thumbs/deutschlandreport.png b/public/img/logos/amateureuro/thumbs/deutschlandreport.png new file mode 100644 index 00000000..04ad25e5 Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/deutschlandreport.png differ diff --git a/public/img/logos/amateureuro/thumbs/favicon.png b/public/img/logos/amateureuro/thumbs/favicon.png new file mode 100644 index 00000000..e49cf82d Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/favicon.png differ diff --git a/public/img/logos/amateureuro/thumbs/hausfrauficken.png b/public/img/logos/amateureuro/thumbs/hausfrauficken.png new file mode 100644 index 00000000..9ccf554e Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/hausfrauficken.png differ diff --git a/public/img/logos/amateureuro/thumbs/lacochonne.png b/public/img/logos/amateureuro/thumbs/lacochonne.png new file mode 100644 index 00000000..fb7e773e Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/lacochonne.png differ diff --git a/public/img/logos/amateureuro/thumbs/lanovice.png b/public/img/logos/amateureuro/thumbs/lanovice.png new file mode 100644 index 00000000..6a45889a Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/lanovice.png differ diff --git a/public/img/logos/amateureuro/thumbs/lasfolladoras.png b/public/img/logos/amateureuro/thumbs/lasfolladoras.png new file mode 100644 index 00000000..ca57c16c Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/lasfolladoras.png differ diff --git a/public/img/logos/amateureuro/thumbs/network.png b/public/img/logos/amateureuro/thumbs/network.png new file mode 100644 index 00000000..0f8d8d80 Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/network.png differ diff --git a/public/img/logos/amateureuro/thumbs/reifeswinger.png b/public/img/logos/amateureuro/thumbs/reifeswinger.png new file mode 100644 index 00000000..0cff54ac Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/reifeswinger.png differ diff --git a/public/img/logos/amateureuro/thumbs/scambistimaturi.png b/public/img/logos/amateureuro/thumbs/scambistimaturi.png new file mode 100644 index 00000000..d1c4fba4 Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/scambistimaturi.png differ diff --git a/public/img/logos/amateureuro/thumbs/sextapegermany.png b/public/img/logos/amateureuro/thumbs/sextapegermany.png new file mode 100644 index 00000000..49efbdf7 Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/sextapegermany.png differ diff --git a/public/img/logos/amateureuro/thumbs/xxxomas.png b/public/img/logos/amateureuro/thumbs/xxxomas.png new file mode 100644 index 00000000..564cf10f Binary files /dev/null and b/public/img/logos/amateureuro/thumbs/xxxomas.png differ diff --git a/public/img/logos/amateureuro/xxxomas.png b/public/img/logos/amateureuro/xxxomas.png new file mode 100644 index 00000000..e5525eaa Binary files /dev/null and b/public/img/logos/amateureuro/xxxomas.png differ diff --git a/public/img/logos/forbondage/badtimestories.png b/public/img/logos/forbondage/badtimestories.png new file mode 100644 index 00000000..f112ff91 Binary files /dev/null and b/public/img/logos/forbondage/badtimestories.png differ diff --git a/public/img/logos/forbondage/crowdbondage.png b/public/img/logos/forbondage/crowdbondage.png new file mode 100644 index 00000000..3dff010f Binary files /dev/null and b/public/img/logos/forbondage/crowdbondage.png differ diff --git a/public/img/logos/forbondage/favicon.png b/public/img/logos/forbondage/favicon.png new file mode 100644 index 00000000..2c93ef89 Binary files /dev/null and b/public/img/logos/forbondage/favicon.png differ diff --git a/public/img/logos/forbondage/forbondage.png b/public/img/logos/forbondage/forbondage.png new file mode 100644 index 00000000..563f23c1 Binary files /dev/null and b/public/img/logos/forbondage/forbondage.png differ diff --git a/public/img/logos/forbondage/lazy/badtimestories.png b/public/img/logos/forbondage/lazy/badtimestories.png new file mode 100644 index 00000000..2797b783 Binary files /dev/null and b/public/img/logos/forbondage/lazy/badtimestories.png differ diff --git a/public/img/logos/forbondage/lazy/crowdbondage.png b/public/img/logos/forbondage/lazy/crowdbondage.png new file mode 100644 index 00000000..d515f083 Binary files /dev/null and b/public/img/logos/forbondage/lazy/crowdbondage.png differ diff --git a/public/img/logos/forbondage/lazy/forbondage.png b/public/img/logos/forbondage/lazy/forbondage.png new file mode 100644 index 00000000..6e90b8e6 Binary files /dev/null and b/public/img/logos/forbondage/lazy/forbondage.png differ diff --git a/public/img/logos/forbondage/lazy/network.png b/public/img/logos/forbondage/lazy/network.png new file mode 100644 index 00000000..8c57c80f Binary files /dev/null and b/public/img/logos/forbondage/lazy/network.png differ diff --git a/public/img/logos/forbondage/lazy/specialfeetforce.png b/public/img/logos/forbondage/lazy/specialfeetforce.png new file mode 100644 index 00000000..d24ead4b Binary files /dev/null and b/public/img/logos/forbondage/lazy/specialfeetforce.png differ diff --git a/public/img/logos/forbondage/misc/badtime-stories.svg b/public/img/logos/forbondage/misc/badtime-stories.svg new file mode 100644 index 00000000..d68dc86f --- /dev/null +++ b/public/img/logos/forbondage/misc/badtime-stories.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/forbondage/misc/crowd-bondage.svg b/public/img/logos/forbondage/misc/crowd-bondage.svg new file mode 100644 index 00000000..fc258121 --- /dev/null +++ b/public/img/logos/forbondage/misc/crowd-bondage.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/forbondage/misc/for-bondage.svg b/public/img/logos/forbondage/misc/for-bondage.svg new file mode 100644 index 00000000..c4a36744 --- /dev/null +++ b/public/img/logos/forbondage/misc/for-bondage.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/forbondage/misc/special-feet-force.svg b/public/img/logos/forbondage/misc/special-feet-force.svg new file mode 100644 index 00000000..4aeded91 --- /dev/null +++ b/public/img/logos/forbondage/misc/special-feet-force.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/forbondage/network.png b/public/img/logos/forbondage/network.png new file mode 100644 index 00000000..4ccb7f47 Binary files /dev/null and b/public/img/logos/forbondage/network.png differ diff --git a/public/img/logos/forbondage/specialfeetforce.png b/public/img/logos/forbondage/specialfeetforce.png new file mode 100644 index 00000000..a78e7df8 Binary files /dev/null and b/public/img/logos/forbondage/specialfeetforce.png differ diff --git a/public/img/logos/forbondage/thumbs/badtimestories.png b/public/img/logos/forbondage/thumbs/badtimestories.png new file mode 100644 index 00000000..9141ad74 Binary files /dev/null and b/public/img/logos/forbondage/thumbs/badtimestories.png differ diff --git a/public/img/logos/forbondage/thumbs/crowdbondage.png b/public/img/logos/forbondage/thumbs/crowdbondage.png new file mode 100644 index 00000000..719e0eae Binary files /dev/null and b/public/img/logos/forbondage/thumbs/crowdbondage.png differ diff --git a/public/img/logos/forbondage/thumbs/forbondage.png b/public/img/logos/forbondage/thumbs/forbondage.png new file mode 100644 index 00000000..3a98b29e Binary files /dev/null and b/public/img/logos/forbondage/thumbs/forbondage.png differ diff --git a/public/img/logos/forbondage/thumbs/network.png b/public/img/logos/forbondage/thumbs/network.png new file mode 100644 index 00000000..5b512e32 Binary files /dev/null and b/public/img/logos/forbondage/thumbs/network.png differ diff --git a/public/img/logos/forbondage/thumbs/specialfeetforce.png b/public/img/logos/forbondage/thumbs/specialfeetforce.png new file mode 100644 index 00000000..bf185a9e Binary files /dev/null and b/public/img/logos/forbondage/thumbs/specialfeetforce.png differ diff --git a/public/img/logos/letsdoeit/favicon.png b/public/img/logos/letsdoeit/favicon.png index 34fcc9c2..1e1eb7aa 100644 Binary files a/public/img/logos/letsdoeit/favicon.png and b/public/img/logos/letsdoeit/favicon.png differ diff --git a/public/img/logos/letsdoeit/misc/favicon_border.png b/public/img/logos/letsdoeit/misc/favicon_border.png index 34fcc9c2..30d81b0b 100644 Binary files a/public/img/logos/letsdoeit/misc/favicon_border.png and b/public/img/logos/letsdoeit/misc/favicon_border.png differ diff --git a/public/img/logos/mamacitaz/carnedelmercado.png b/public/img/logos/mamacitaz/carnedelmercado.png new file mode 100644 index 00000000..f58a4e3d Binary files /dev/null and b/public/img/logos/mamacitaz/carnedelmercado.png differ diff --git a/public/img/logos/mamacitaz/chicasloca.png b/public/img/logos/mamacitaz/chicasloca.png new file mode 100644 index 00000000..8442487c Binary files /dev/null and b/public/img/logos/mamacitaz/chicasloca.png differ diff --git a/public/img/logos/mamacitaz/favicon.png b/public/img/logos/mamacitaz/favicon.png new file mode 100644 index 00000000..b4204a55 Binary files /dev/null and b/public/img/logos/mamacitaz/favicon.png differ diff --git a/public/img/logos/mamacitaz/herbigass.png b/public/img/logos/mamacitaz/herbigass.png new file mode 100644 index 00000000..01de7737 Binary files /dev/null and b/public/img/logos/mamacitaz/herbigass.png differ diff --git a/public/img/logos/mamacitaz/lazy/carnedelmercado.png b/public/img/logos/mamacitaz/lazy/carnedelmercado.png new file mode 100644 index 00000000..1d4ae872 Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/carnedelmercado.png differ diff --git a/public/img/logos/mamacitaz/lazy/chicasloca.png b/public/img/logos/mamacitaz/lazy/chicasloca.png new file mode 100644 index 00000000..eb04736f Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/chicasloca.png differ diff --git a/public/img/logos/mamacitaz/lazy/favicon.png b/public/img/logos/mamacitaz/lazy/favicon.png new file mode 100644 index 00000000..893d683b Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/favicon.png differ diff --git a/public/img/logos/mamacitaz/lazy/herbigass.png b/public/img/logos/mamacitaz/lazy/herbigass.png new file mode 100644 index 00000000..83e8d679 Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/herbigass.png differ diff --git a/public/img/logos/mamacitaz/lazy/mamacitaz.png b/public/img/logos/mamacitaz/lazy/mamacitaz.png new file mode 100644 index 00000000..7d341972 Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/mamacitaz.png differ diff --git a/public/img/logos/mamacitaz/lazy/network.png b/public/img/logos/mamacitaz/lazy/network.png new file mode 100644 index 00000000..f72cb8e5 Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/network.png differ diff --git a/public/img/logos/mamacitaz/lazy/operacionlimpieza.png b/public/img/logos/mamacitaz/lazy/operacionlimpieza.png new file mode 100644 index 00000000..3eb81786 Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/operacionlimpieza.png differ diff --git a/public/img/logos/mamacitaz/lazy/tuvenganza.png b/public/img/logos/mamacitaz/lazy/tuvenganza.png new file mode 100644 index 00000000..98673985 Binary files /dev/null and b/public/img/logos/mamacitaz/lazy/tuvenganza.png differ diff --git a/public/img/logos/mamacitaz/mamacitaz.png b/public/img/logos/mamacitaz/mamacitaz.png new file mode 100644 index 00000000..f050b23e Binary files /dev/null and b/public/img/logos/mamacitaz/mamacitaz.png differ diff --git a/public/img/logos/mamacitaz/misc/carne-del-mercado.svg b/public/img/logos/mamacitaz/misc/carne-del-mercado.svg new file mode 100644 index 00000000..8a79b319 --- /dev/null +++ b/public/img/logos/mamacitaz/misc/carne-del-mercado.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/mamacitaz/misc/chicas-loca.svg b/public/img/logos/mamacitaz/misc/chicas-loca.svg new file mode 100644 index 00000000..5a73949e --- /dev/null +++ b/public/img/logos/mamacitaz/misc/chicas-loca.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/mamacitaz/misc/favicon.svg b/public/img/logos/mamacitaz/misc/favicon.svg new file mode 100644 index 00000000..eb9ea6dc --- /dev/null +++ b/public/img/logos/mamacitaz/misc/favicon.svg @@ -0,0 +1,48 @@ + + diff --git a/public/img/logos/mamacitaz/misc/her-big-ass.svg b/public/img/logos/mamacitaz/misc/her-big-ass.svg new file mode 100644 index 00000000..3aaa8e20 --- /dev/null +++ b/public/img/logos/mamacitaz/misc/her-big-ass.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/mamacitaz/misc/mamacitaz.svg b/public/img/logos/mamacitaz/misc/mamacitaz.svg new file mode 100644 index 00000000..d848b560 --- /dev/null +++ b/public/img/logos/mamacitaz/misc/mamacitaz.svg @@ -0,0 +1,162 @@ + + diff --git a/public/img/logos/mamacitaz/misc/operacion-limpieza.svg b/public/img/logos/mamacitaz/misc/operacion-limpieza.svg new file mode 100644 index 00000000..cb8ae1fd --- /dev/null +++ b/public/img/logos/mamacitaz/misc/operacion-limpieza.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/mamacitaz/misc/tu-venganza.svg b/public/img/logos/mamacitaz/misc/tu-venganza.svg new file mode 100644 index 00000000..8f3530f4 --- /dev/null +++ b/public/img/logos/mamacitaz/misc/tu-venganza.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/mamacitaz/network.png b/public/img/logos/mamacitaz/network.png new file mode 100644 index 00000000..3adf6b39 Binary files /dev/null and b/public/img/logos/mamacitaz/network.png differ diff --git a/public/img/logos/mamacitaz/operacionlimpieza.png b/public/img/logos/mamacitaz/operacionlimpieza.png new file mode 100644 index 00000000..cf7828e1 Binary files /dev/null and b/public/img/logos/mamacitaz/operacionlimpieza.png differ diff --git a/public/img/logos/mamacitaz/thumbs/carnedelmercado.png b/public/img/logos/mamacitaz/thumbs/carnedelmercado.png new file mode 100644 index 00000000..dfdaba6b Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/carnedelmercado.png differ diff --git a/public/img/logos/mamacitaz/thumbs/chicasloca.png b/public/img/logos/mamacitaz/thumbs/chicasloca.png new file mode 100644 index 00000000..ca8acdf9 Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/chicasloca.png differ diff --git a/public/img/logos/mamacitaz/thumbs/favicon.png b/public/img/logos/mamacitaz/thumbs/favicon.png new file mode 100644 index 00000000..893d683b Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/favicon.png differ diff --git a/public/img/logos/mamacitaz/thumbs/herbigass.png b/public/img/logos/mamacitaz/thumbs/herbigass.png new file mode 100644 index 00000000..11073928 Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/herbigass.png differ diff --git a/public/img/logos/mamacitaz/thumbs/mamacitaz.png b/public/img/logos/mamacitaz/thumbs/mamacitaz.png new file mode 100644 index 00000000..a22631a4 Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/mamacitaz.png differ diff --git a/public/img/logos/mamacitaz/thumbs/network.png b/public/img/logos/mamacitaz/thumbs/network.png new file mode 100644 index 00000000..6a442a94 Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/network.png differ diff --git a/public/img/logos/mamacitaz/thumbs/operacionlimpieza.png b/public/img/logos/mamacitaz/thumbs/operacionlimpieza.png new file mode 100644 index 00000000..8b838838 Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/operacionlimpieza.png differ diff --git a/public/img/logos/mamacitaz/thumbs/tuvenganza.png b/public/img/logos/mamacitaz/thumbs/tuvenganza.png new file mode 100644 index 00000000..2cbc6a0f Binary files /dev/null and b/public/img/logos/mamacitaz/thumbs/tuvenganza.png differ diff --git a/public/img/logos/mamacitaz/tuvenganza.png b/public/img/logos/mamacitaz/tuvenganza.png new file mode 100644 index 00000000..1e219456 Binary files /dev/null and b/public/img/logos/mamacitaz/tuvenganza.png differ diff --git a/public/img/logos/porndoe/favicon.png b/public/img/logos/porndoe/favicon.png new file mode 100644 index 00000000..fa8b29a5 Binary files /dev/null and b/public/img/logos/porndoe/favicon.png differ diff --git a/public/img/logos/porndoe/lazy/favicon.png b/public/img/logos/porndoe/lazy/favicon.png new file mode 100644 index 00000000..a7b515bf Binary files /dev/null and b/public/img/logos/porndoe/lazy/favicon.png differ diff --git a/public/img/logos/porndoe/lazy/network.png b/public/img/logos/porndoe/lazy/network.png new file mode 100644 index 00000000..32ab0290 Binary files /dev/null and b/public/img/logos/porndoe/lazy/network.png differ diff --git a/public/img/logos/porndoe/lazy/porndoe.png b/public/img/logos/porndoe/lazy/porndoe.png new file mode 100644 index 00000000..15fb9b7e Binary files /dev/null and b/public/img/logos/porndoe/lazy/porndoe.png differ diff --git a/public/img/logos/porndoe/misc/porndoe.svg b/public/img/logos/porndoe/misc/porndoe.svg new file mode 100644 index 00000000..f771175a --- /dev/null +++ b/public/img/logos/porndoe/misc/porndoe.svg @@ -0,0 +1,48 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + diff --git a/public/img/logos/porndoe/network.png b/public/img/logos/porndoe/network.png new file mode 100644 index 00000000..9a82068b Binary files /dev/null and b/public/img/logos/porndoe/network.png differ diff --git a/public/img/logos/porndoe/porndoe.png b/public/img/logos/porndoe/porndoe.png new file mode 100644 index 00000000..a72d6343 Binary files /dev/null and b/public/img/logos/porndoe/porndoe.png differ diff --git a/public/img/logos/porndoe/thumbs/favicon.png b/public/img/logos/porndoe/thumbs/favicon.png new file mode 100644 index 00000000..a7b515bf Binary files /dev/null and b/public/img/logos/porndoe/thumbs/favicon.png differ diff --git a/public/img/logos/porndoe/thumbs/network.png b/public/img/logos/porndoe/thumbs/network.png new file mode 100644 index 00000000..524b3b94 Binary files /dev/null and b/public/img/logos/porndoe/thumbs/network.png differ diff --git a/public/img/logos/porndoe/thumbs/porndoe.png b/public/img/logos/porndoe/thumbs/porndoe.png new file mode 100644 index 00000000..e7922b78 Binary files /dev/null and b/public/img/logos/porndoe/thumbs/porndoe.png differ diff --git a/public/img/logos/transbella/favicon.png b/public/img/logos/transbella/favicon.png new file mode 100644 index 00000000..449a07bc Binary files /dev/null and b/public/img/logos/transbella/favicon.png differ diff --git a/public/img/logos/transbella/lazy/network.png b/public/img/logos/transbella/lazy/network.png new file mode 100644 index 00000000..82c32015 Binary files /dev/null and b/public/img/logos/transbella/lazy/network.png differ diff --git a/public/img/logos/transbella/lazy/transbella.png b/public/img/logos/transbella/lazy/transbella.png new file mode 100644 index 00000000..d7179096 Binary files /dev/null and b/public/img/logos/transbella/lazy/transbella.png differ diff --git a/public/img/logos/transbella/lazy/transtaboo.png b/public/img/logos/transbella/lazy/transtaboo.png new file mode 100644 index 00000000..75f383d5 Binary files /dev/null and b/public/img/logos/transbella/lazy/transtaboo.png differ diff --git a/public/img/logos/transbella/misc/trans-bella.svg b/public/img/logos/transbella/misc/trans-bella.svg new file mode 100644 index 00000000..0b3cfc8a --- /dev/null +++ b/public/img/logos/transbella/misc/trans-bella.svg @@ -0,0 +1,136 @@ + + diff --git a/public/img/logos/transbella/misc/trans-taboo.svg b/public/img/logos/transbella/misc/trans-taboo.svg new file mode 100644 index 00000000..a0c0e45f --- /dev/null +++ b/public/img/logos/transbella/misc/trans-taboo.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/transbella/network.png b/public/img/logos/transbella/network.png new file mode 100644 index 00000000..54cdec31 Binary files /dev/null and b/public/img/logos/transbella/network.png differ diff --git a/public/img/logos/transbella/thumbs/network.png b/public/img/logos/transbella/thumbs/network.png new file mode 100644 index 00000000..be4e202c Binary files /dev/null and b/public/img/logos/transbella/thumbs/network.png differ diff --git a/public/img/logos/transbella/thumbs/transbella.png b/public/img/logos/transbella/thumbs/transbella.png new file mode 100644 index 00000000..e08a7e95 Binary files /dev/null and b/public/img/logos/transbella/thumbs/transbella.png differ diff --git a/public/img/logos/transbella/thumbs/transtaboo.png b/public/img/logos/transbella/thumbs/transtaboo.png new file mode 100644 index 00000000..73a3d6fa Binary files /dev/null and b/public/img/logos/transbella/thumbs/transtaboo.png differ diff --git a/public/img/logos/transbella/transbella.png b/public/img/logos/transbella/transbella.png new file mode 100644 index 00000000..54cdec31 Binary files /dev/null and b/public/img/logos/transbella/transbella.png differ diff --git a/public/img/logos/transbella/transtaboo.png b/public/img/logos/transbella/transtaboo.png new file mode 100644 index 00000000..0169b9dc Binary files /dev/null and b/public/img/logos/transbella/transtaboo.png differ diff --git a/public/img/logos/vipsexvault/exposedcasting.png b/public/img/logos/vipsexvault/exposedcasting.png new file mode 100644 index 00000000..21e5ae9d Binary files /dev/null and b/public/img/logos/vipsexvault/exposedcasting.png differ diff --git a/public/img/logos/vipsexvault/favicon.png b/public/img/logos/vipsexvault/favicon.png new file mode 100644 index 00000000..877e4754 Binary files /dev/null and b/public/img/logos/vipsexvault/favicon.png differ diff --git a/public/img/logos/vipsexvault/fuckedintraffic.png b/public/img/logos/vipsexvault/fuckedintraffic.png new file mode 100644 index 00000000..776da6e8 Binary files /dev/null and b/public/img/logos/vipsexvault/fuckedintraffic.png differ diff --git a/public/img/logos/vipsexvault/lazy/exposedcasting.png b/public/img/logos/vipsexvault/lazy/exposedcasting.png new file mode 100644 index 00000000..6427a46d Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/exposedcasting.png differ diff --git a/public/img/logos/vipsexvault/lazy/fuckedintraffic.png b/public/img/logos/vipsexvault/lazy/fuckedintraffic.png new file mode 100644 index 00000000..621d3c23 Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/fuckedintraffic.png differ diff --git a/public/img/logos/vipsexvault/lazy/losconsoladores.png b/public/img/logos/vipsexvault/lazy/losconsoladores.png new file mode 100644 index 00000000..79260271 Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/losconsoladores.png differ diff --git a/public/img/logos/vipsexvault/lazy/network.png b/public/img/logos/vipsexvault/lazy/network.png new file mode 100644 index 00000000..90918855 Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/network.png differ diff --git a/public/img/logos/vipsexvault/lazy/pinupsex.png b/public/img/logos/vipsexvault/lazy/pinupsex.png new file mode 100644 index 00000000..cc62447b Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/pinupsex.png differ diff --git a/public/img/logos/vipsexvault/lazy/porndoepedia.png b/public/img/logos/vipsexvault/lazy/porndoepedia.png new file mode 100644 index 00000000..d95c8c84 Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/porndoepedia.png differ diff --git a/public/img/logos/vipsexvault/lazy/vipsexvault.png b/public/img/logos/vipsexvault/lazy/vipsexvault.png new file mode 100644 index 00000000..cae757c7 Binary files /dev/null and b/public/img/logos/vipsexvault/lazy/vipsexvault.png differ diff --git a/public/img/logos/vipsexvault/losconsoladores.png b/public/img/logos/vipsexvault/losconsoladores.png new file mode 100644 index 00000000..9b2b90a6 Binary files /dev/null and b/public/img/logos/vipsexvault/losconsoladores.png differ diff --git a/public/img/logos/vipsexvault/misc/exposed-casting.svg b/public/img/logos/vipsexvault/misc/exposed-casting.svg new file mode 100644 index 00000000..faa34bf4 --- /dev/null +++ b/public/img/logos/vipsexvault/misc/exposed-casting.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/vipsexvault/misc/fucked-in-traffic.svg b/public/img/logos/vipsexvault/misc/fucked-in-traffic.svg new file mode 100644 index 00000000..14ec1eb5 --- /dev/null +++ b/public/img/logos/vipsexvault/misc/fucked-in-traffic.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/vipsexvault/misc/los-consoladores.svg b/public/img/logos/vipsexvault/misc/los-consoladores.svg new file mode 100644 index 00000000..e8f86380 --- /dev/null +++ b/public/img/logos/vipsexvault/misc/los-consoladores.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/vipsexvault/misc/pinup-sex.svg b/public/img/logos/vipsexvault/misc/pinup-sex.svg new file mode 100644 index 00000000..56381286 --- /dev/null +++ b/public/img/logos/vipsexvault/misc/pinup-sex.svg @@ -0,0 +1,1629 @@ + + diff --git a/public/img/logos/vipsexvault/misc/porndoe-pedia.svg b/public/img/logos/vipsexvault/misc/porndoe-pedia.svg new file mode 100644 index 00000000..0c782b63 --- /dev/null +++ b/public/img/logos/vipsexvault/misc/porndoe-pedia.svg @@ -0,0 +1 @@ + diff --git a/public/img/logos/vipsexvault/misc/vip-sex-vault.svg b/public/img/logos/vipsexvault/misc/vip-sex-vault.svg new file mode 100644 index 00000000..db0a1afb --- /dev/null +++ b/public/img/logos/vipsexvault/misc/vip-sex-vault.svg @@ -0,0 +1,130 @@ + + diff --git a/public/img/logos/vipsexvault/network.png b/public/img/logos/vipsexvault/network.png new file mode 100644 index 00000000..72e4cdc8 Binary files /dev/null and b/public/img/logos/vipsexvault/network.png differ diff --git a/public/img/logos/vipsexvault/pinupsex.png b/public/img/logos/vipsexvault/pinupsex.png new file mode 100644 index 00000000..b49f2404 Binary files /dev/null and b/public/img/logos/vipsexvault/pinupsex.png differ diff --git a/public/img/logos/vipsexvault/porndoepedia.png b/public/img/logos/vipsexvault/porndoepedia.png new file mode 100644 index 00000000..56293e2f Binary files /dev/null and b/public/img/logos/vipsexvault/porndoepedia.png differ diff --git a/public/img/logos/vipsexvault/thumbs/exposedcasting.png b/public/img/logos/vipsexvault/thumbs/exposedcasting.png new file mode 100644 index 00000000..96ed9270 Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/exposedcasting.png differ diff --git a/public/img/logos/vipsexvault/thumbs/fuckedintraffic.png b/public/img/logos/vipsexvault/thumbs/fuckedintraffic.png new file mode 100644 index 00000000..e3fe6ce2 Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/fuckedintraffic.png differ diff --git a/public/img/logos/vipsexvault/thumbs/losconsoladores.png b/public/img/logos/vipsexvault/thumbs/losconsoladores.png new file mode 100644 index 00000000..0ee0b890 Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/losconsoladores.png differ diff --git a/public/img/logos/vipsexvault/thumbs/network.png b/public/img/logos/vipsexvault/thumbs/network.png new file mode 100644 index 00000000..f40bf23f Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/network.png differ diff --git a/public/img/logos/vipsexvault/thumbs/pinupsex.png b/public/img/logos/vipsexvault/thumbs/pinupsex.png new file mode 100644 index 00000000..c09ff4a5 Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/pinupsex.png differ diff --git a/public/img/logos/vipsexvault/thumbs/porndoepedia.png b/public/img/logos/vipsexvault/thumbs/porndoepedia.png new file mode 100644 index 00000000..f6574314 Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/porndoepedia.png differ diff --git a/public/img/logos/vipsexvault/thumbs/vipsexvault.png b/public/img/logos/vipsexvault/thumbs/vipsexvault.png new file mode 100644 index 00000000..56ebce99 Binary files /dev/null and b/public/img/logos/vipsexvault/thumbs/vipsexvault.png differ diff --git a/public/img/logos/vipsexvault/vipsexvault.png b/public/img/logos/vipsexvault/vipsexvault.png new file mode 100644 index 00000000..1266ec66 Binary files /dev/null and b/public/img/logos/vipsexvault/vipsexvault.png differ diff --git a/public/img/tags/mff/1.jpeg b/public/img/tags/mff/1.jpeg new file mode 100644 index 00000000..1346b8d1 Binary files /dev/null and b/public/img/tags/mff/1.jpeg differ diff --git a/public/img/tags/mff/lazy/1.jpeg b/public/img/tags/mff/lazy/1.jpeg new file mode 100644 index 00000000..98069a44 Binary files /dev/null and b/public/img/tags/mff/lazy/1.jpeg differ diff --git a/public/img/tags/mff/thumbs/1.jpeg b/public/img/tags/mff/thumbs/1.jpeg new file mode 100644 index 00000000..a0e53832 Binary files /dev/null and b/public/img/tags/mff/thumbs/1.jpeg differ diff --git a/public/img/tags/pussy-eating/1.jpeg b/public/img/tags/pussy-eating/1.jpeg new file mode 100644 index 00000000..9b427f6d Binary files /dev/null and b/public/img/tags/pussy-eating/1.jpeg differ diff --git a/public/img/tags/pussy-eating/lazy/1.jpeg b/public/img/tags/pussy-eating/lazy/1.jpeg new file mode 100644 index 00000000..4484f386 Binary files /dev/null and b/public/img/tags/pussy-eating/lazy/1.jpeg differ diff --git a/public/img/tags/pussy-eating/thumbs/1.jpeg b/public/img/tags/pussy-eating/thumbs/1.jpeg new file mode 100644 index 00000000..117ede1c Binary files /dev/null and b/public/img/tags/pussy-eating/thumbs/1.jpeg differ diff --git a/seeds/01_networks.js b/seeds/01_networks.js index 2c7bf1b0..5e94e1ee 100644 --- a/seeds/01_networks.js +++ b/seeds/01_networks.js @@ -21,6 +21,10 @@ const parentNetworks = [ slug: 'whalemember', name: 'Whale Member', }, + { + slug: 'porndoe', + name: 'PornDoe', + }, { slug: 'wgcz', name: 'WGCZ Holding', @@ -70,6 +74,12 @@ const networks = [ name: 'Amateur Allure', url: 'https://www.amateurallure.com', }, + { + slug: 'amateureuro', + name: 'Amateur Euro', + url: 'https://amateureuro.com', + parent: 'porndoe', + }, { slug: 'assylum', name: 'Assylum', @@ -185,6 +195,12 @@ const networks = [ description: 'Wherever they go, there is porn. Hospital, Taxis, Casting… Maybe fucking to a fake cop, fake agent or fake taxi driver. And we record it all.', parent: 'mindgeek', }, + { + slug: 'forbondage', + name: 'ForBondage', + url: 'https://forbondage.com', + parent: 'porndoe', + }, { slug: 'fullpornnetwork', name: 'Full Porn Network', @@ -260,6 +276,13 @@ const networks = [ slug: 'letsdoeit', name: 'LetsDoeIt', url: 'https://letsdoeit.com', + parent: 'porndoe', + }, + { + slug: 'mamacitaz', + name: 'Mamacitaz', + url: 'https://mamacitaz.com', + parent: 'porndoe', }, { slug: 'men', @@ -382,6 +405,13 @@ const networks = [ name: 'Teen Core Club', url: 'https://teencoreclub.com', }, + { + slug: 'transbella', + name: 'Trans Bella', + url: 'https://transbella.com', + tags: ['transsexual'], + parent: 'porndoe', + }, { slug: 'twistys', name: 'Twistys', @@ -389,6 +419,12 @@ const networks = [ description: 'The hottest high quality glamour porn for over 18 years! Over 3700+ models and 46000+ scenes. TWISTYS.com', parent: 'mindgeek', }, + { + slug: 'vipsexvault', + name: 'VIP Sex Vault', + url: 'https://vipsexvault.com', + parent: 'porndoe', + }, { slug: 'vivid', name: 'Vivid', diff --git a/seeds/02_sites.js b/seeds/02_sites.js index 7771bfe7..b7e052c0 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -427,6 +427,73 @@ const sites = [ }, parent: 'amateurallure', }, + // AMATEUR EURO + { + name: 'La Cochonne', + slug: 'lacochonne', + url: 'https://amateureuro.com/channels/la-cochonne.en.html', + parent: 'amateureuro', + }, + { + name: 'Casting Francais', + slug: 'castingfrancais', + url: 'https://amateureuro.com/channels/casting-francais.en.html', + parent: 'amateureuro', + }, + { + name: 'Las Folladoras', + slug: 'lasfolladoras', + url: 'https://amateureuro.com/channels/las-folladoras.en.html', + parent: 'amateureuro', + }, + { + name: 'La Novice', + slug: 'lanovice', + url: 'https://amateureuro.com/channels/la-novice.en.html', + parent: 'amateureuro', + }, + { + name: 'Casting Alla Italiana', + slug: 'castingallaitaliana', + url: 'https://amateureuro.com/channels/casting-alla-italiana.en.html', + parent: 'amateureuro', + }, + { + name: 'Hausfrau Ficken', + slug: 'hausfrauficken', + url: 'https://amateureuro.com/channels/hausfrau-ficken.en.html', + parent: 'amateureuro', + }, + { + name: 'Deutschland Report', + slug: 'deutschlandreport', + url: 'https://amateureuro.com/channels/deutschland-report.en.html', + parent: 'amateureuro', + }, + { + name: 'Reife Swinger', + slug: 'reifeswinger', + url: 'https://amateureuro.com/channels/reife-swinger.en.html', + parent: 'amateureuro', + }, + { + name: 'Scambisti Maturi', + slug: 'scambistimaturi', + url: 'https://amateureuro.com/channels/scambisti-maturi.en.html', + parent: 'amateureuro', + }, + { + name: 'Sextape Germany', + slug: 'sextapegermany', + url: 'https://amateureuro.com/channels/sextape-germany.en.html', + parent: 'amateureuro', + }, + { + name: 'XXX Omas', + slug: 'xxxomas', + url: 'https://amateureuro.com/channels/xxx-omas.en.html', + parent: 'amateureuro', + }, // ASSYLUM { slug: 'assylum', @@ -2019,6 +2086,28 @@ const sites = [ url: 'https://www.freeones.com', parent: 'freeones', }, + // FOR BONDAGE + { + name: 'Crowd Bondage', + slug: 'crowdbondage', + url: 'https://forbondage.com/channels/crowd-bondage.en.html', + tags: ['bdsm'], + parent: 'forbondage', + }, + { + name: 'Badtime Stories', + slug: 'badtimestories', + url: 'https://forbondage.com/channels/badtime-stories.en.html', + tags: ['bdsm'], + parent: 'forbondage', + }, + { + name: 'Special Feet Force', + slug: 'specialfeetforce', + url: 'https://forbondage.com/channels/special-feet-force.en.html', + tags: ['bdsm', 'feet'], + parent: 'forbondage', + }, // FULL PORN NETWORK { slug: 'analbbc', @@ -3342,6 +3431,42 @@ const sites = [ url: 'https://letsdoeit.com/channels/bums-besuch.en.html', parent: 'letsdoeit', }, + // MAMACITAZ + { + name: 'Her Big Ass', + slug: 'herbigass', + url: 'https://mamacitaz.com/channels/her-big-ass.en.html', + tags: ['latina'], + parent: 'mamacitaz', + }, + { + name: 'Carne Del Mercado', + slug: 'carnedelmercado', + url: 'https://mamacitaz.com/channels/carne-del-mercado.en.html', + tags: ['latina'], + parent: 'mamacitaz', + }, + { + name: 'Chicas Loca', + slug: 'chicasloca', + url: 'https://mamacitaz.com/channels/chicas-loca.en.html', + tags: ['latina'], + parent: 'mamacitaz', + }, + { + name: 'Tu Venganza', + slug: 'tuvenganza', + url: 'https://mamacitaz.com/channels/tu-venganza.en.html', + tags: ['latina'], + parent: 'mamacitaz', + }, + { + name: 'Operación Limpieza', + slug: 'operacionlimpieza', + url: 'https://mamacitaz.com/channels/operation-limpieza.en.html', + tags: ['latina', 'maid'], + parent: 'mamacitaz', + }, // METRO HD { slug: 'devianthardcore', @@ -7070,6 +7195,21 @@ const sites = [ parameters: {}, }, */ + // TRANS BELLA + { + name: 'Trans Bella', + slug: 'transbella', + url: 'https://transbella.com/channels/trans-bella.en.html', + tags: ['transsexual'], + parent: 'transbella', + }, + { + name: 'Trans Taboo', + slug: 'transtaboo', + url: 'https://transbella.com/channels/trans-taboo.en.html', + tags: ['transsexual'], + parent: 'transbella', + }, // TWISTYS { name: 'Twistys', @@ -7165,6 +7305,43 @@ const sites = [ description: 'BustyOnes.com bringing you the most beautiful big breasts in the world! The hottest women alive showcasing their fantastic tits.', parent: 'twistys', }, + // VIP SEX VAULT + { + name: 'Los Consoladores', + slug: 'losconsoladores', + url: 'https://vipsexvault.com/channels/los-consoladores.en.html', + parent: 'vipsexvault', + }, + { + name: 'Fucked In Traffic', + slug: 'fuckedintraffic', + url: 'https://vipsexvault.com/channels/fucked-in-traffic.en.html', + parent: 'vipsexvault', + }, + { + name: 'Exposed Casting', + slug: 'exposedcasting', + url: 'https://vipsexvault.com/channels/exposed-casting.en.html', + parent: 'vipsexvault', + }, + { + name: 'VIP Sex Vault', + slug: 'vipsexvault', + url: 'https://vipsexvault.com/channels/vip-sex-vault.en.html', + parent: 'vipsexvault', + }, + { + name: 'PornDoe Pedia', + slug: 'porndoepedia', + url: 'https://vipsexvault.com/channels/vipsexvault-pedia.en.html', + parent: 'vipsexvault', + }, + { + name: 'Pinup Sex', + slug: 'pinupsex', + url: 'https://vipsexvault.com/channels/pinup-sex.en.html', + parent: 'vipsexvault', + }, // VIVID { slug: 'vividceleb', diff --git a/src/scrapers/kellymadison.js b/src/scrapers/kellymadison.js index 9b29be65..34acf751 100644 --- a/src/scrapers/kellymadison.js +++ b/src/scrapers/kellymadison.js @@ -1,9 +1,8 @@ 'use strict'; -const bhttp = require('bhttp'); -const { JSDOM } = require('jsdom'); -const moment = require('moment'); - +const slugify = require('../utils/slugify'); +const qu = require('../utils/qu'); +const http = require('../utils/http'); const { feetInchesToCm } = require('../utils/convert'); const siteMapByKey = { @@ -14,17 +13,11 @@ const siteMapByKey = { const siteMapBySlug = Object.entries(siteMapByKey).reduce((acc, [key, value]) => ({ ...acc, [value]: key }), {}); -function extractTextNode(parentEl) { - return Array.from(parentEl).reduce((acc, el) => (el.nodeType === 3 ? `${acc}${el.textContent.trim()}` : acc), ''); -} - -function scrapeLatest(html, site) { - const { document } = new JSDOM(html).window; - - return Array.from(document.querySelectorAll('.episode'), (scene) => { +function scrapeLatest(scenes, site) { + return scenes.map(({ query }) => { const release = { site }; - release.shootId = scene.querySelector('.card-meta .text-right').textContent.trim(); + release.shootId = query.q('.card-meta .text-right', true); const siteId = release.shootId.match(/\w{2}/)[0]; const siteSlug = siteMapByKey[siteId]; @@ -34,96 +27,94 @@ function scrapeLatest(html, site) { return null; } - const durationEl = scene.querySelector('.content a'); - - [release.entryId] = durationEl.href.match(/\d+$/); + const { pathname } = new URL(query.url('h5 a')); + [release.entryId] = pathname.match(/\d+$/); release.url = `${site.url}/episodes/${release.entryId}`; - release.title = scene.querySelector('h5 a').textContent.trim(); + release.title = query.q('h5 a', true); - const dateEl = scene.querySelector('.card-meta .text-left').childNodes; - const dateString = extractTextNode(dateEl); + release.date = query.date('.card-meta .text-left', ['MMM D', 'MMM D, YYYY'], /\w+ \d+(, \w+)?/); + release.actors = query.all('.models a', true); - release.date = moment.utc(dateString, ['MMM D', 'MMM D, YYYY']).toDate(); - release.actors = Array.from(scene.querySelectorAll('.models a'), el => el.textContent); + release.duration = query.dur('.content a'); - const durationString = durationEl.textContent.match(/\d+ min/); - if (durationString) release.duration = Number(durationString[0].match(/\d+/)[0]) * 60; + const duration = query.q('.content a', true).match(/(\d+) min/)[1]; + if (duration) release.duration = Number(duration) * 60; - release.poster = scene.querySelector('.card-img-top').dataset.src; + release.poster = query.img('.card-img-top'); release.teaser = { - src: scene.querySelector('video').src, + src: query.video('video'), }; return release; }).filter(scene => scene); } -function scrapeScene(html, url, site, baseRelease) { - const { document } = new JSDOM(html).window; - const release = { url, site }; +async function scrapeScene({ query, html }, url, baseRelease) { + const { pathname, origin } = new URL(url); + const release = {}; - const titleEl = document.querySelector('.card-header.row h4').childNodes; - const titleString = extractTextNode(titleEl); - - if (!baseRelease) [release.entryId] = url.match(/\d+/); - - release.title = titleString - .replace('Trailer: ', '') - .replace(/- \w+ #\d+$/, '') - .trim(); - - release.channel = titleString.match(/\w+ #\d+$/)[0].match(/\w+/)[0].toLowerCase(); + [release.entryId] = pathname.match(/\d+$/); + const titleString = query.q('.card-header.row h4', true); const episode = titleString.match(/#\d+$/)[0]; + + release.title = titleString.match(/Trailer: ([\w\s]+) -/)[1]; + release.channel = slugify(titleString.match(/([\w\s]+) #\d+$/)[1], ''); + const siteKey = siteMapBySlug[release.channel]; release.shootId = `${siteKey} ${episode}`; - release.description = document.querySelector('p.card-text').textContent.trim(); + release.description = query.q('p.card-text', true); - const dateEl = document.querySelector('.card-body h4.card-title:nth-child(3)').childNodes; - const dateString = extractTextNode(dateEl); + // order not reliable, get keys + const detailElsByKey = query.all('.card-body h4.card-title').reduce((acc, rowEl) => ({ + ...acc, + [slugify(rowEl.textContent.match(/(\w+):/)?.[1])]: rowEl, + }), {}); - release.date = moment.utc(dateString, 'YYYY-MM-DD').toDate(); - release.actors = Array.from(document.querySelectorAll('.card-body h4.card-title:nth-child(4) a'), el => el.textContent); + release.date = query.date(detailElsByKey.published, null, 'YYYY-MM-DD'); + release.duration = query.dur(detailElsByKey.episode); - const durationRaw = document.querySelector('.card-body h4.card-title:nth-child(1)').textContent; - const durationString = durationRaw.match(/\d+:\d+/)[0]; + release.actors = query.all(detailElsByKey.starring, 'a', true); - release.duration = moment.duration(`00:${durationString}`).asSeconds(); - - const trailerStart = document.body.innerHTML.indexOf('player.updateSrc'); - const trailerString = document.body.innerHTML.slice(trailerStart, document.body.innerHTML.indexOf(');', trailerStart)); - - const trailers = trailerString.match(/https:\/\/.*.mp4/g); - const resolutions = trailerString.match(/res: '\d+'/g).map((res) => { - const resolution = Number(res.match(/\d+/)[0]); - - return resolution === 4000 ? 2160 : resolution; // 4k is not 4000 pixels high + const token = query.meta('name=_token'); + const trailerInfoUrl = `${origin}/episodes/trailer/sources/${release.entryId}?type=trailer`; + const trailerInfoRes = await http.post(trailerInfoUrl, null, { + 'X-CSRF-Token': token, + 'X-Requested-With': 'XMLHttpRequest', }); - release.trailer = trailers.map((trailer, index) => ({ - src: trailer, - quality: resolutions[index], - })); + if (trailerInfoRes.ok && trailerInfoRes.body.sources.length > 0) { + release.trailer = trailerInfoRes.body.sources.map(trailer => ({ + src: trailer.src, + type: trailer.type, + quality: trailer.res.replace(4000, 2160), + })); + } const posterPrefix = html.indexOf('poster:'); const poster = html.slice(html.indexOf('http', posterPrefix), html.indexOf('.jpg', posterPrefix) + 4); - if (baseRelease?.poster) release.photos = [poster]; - else release.poster = poster; + if (poster) { + if (baseRelease?.poster) { + release.photos = [poster]; + } else { + release.poster = poster; + } + } return release; } -function scrapeProfile(html, actorName) { - const { document } = new JSDOM(html).window; - const profile = { name: actorName }; +function scrapeProfile({ query }) { + const profile = {}; - const bioKeys = Array.from(document.querySelectorAll('table.table td:nth-child(1)'), el => el.textContent.slice(0, -1)); - const bioValues = Array.from(document.querySelectorAll('table.table td:nth-child(2)'), el => el.textContent); - const bio = bioKeys.reduce((acc, key, index) => ({ ...acc, [key]: bioValues[index] }), {}); + const bioKeys = query.all('table.table td:nth-child(1)', true); + const bioValues = query.all('table.table td:nth-child(2)', true); + const bio = bioKeys.reduce((acc, key, index) => ({ ...acc, [key.slice(0, -1)]: bioValues[index] }), {}); + if (bio.Ethnicity) profile.ethnicity = bio.Ethnicity; if (bio.Measurements) [profile.bust, profile.waist, profile.hip] = bio.Measurements.split('-'); if (bio.Birthplace) profile.birthPlace = bio.Birthplace; @@ -132,55 +123,45 @@ function scrapeProfile(html, actorName) { profile.height = feetInchesToCm(feet, inches); } - if (bio.Ethnicity) profile.ethnicity = bio.Ethnicity; - - const avatarEl = Array.from(document.querySelectorAll('img')).find(photo => photo.src.match('model')); - - if (avatarEl) profile.avatar = avatarEl.src; + profile.avatar = query.img('img[src*="model"]'); return profile; } async function fetchLatest(site, page = 1) { const url = `https://kellymadison.com/episodes/search?page=${page}`; // TLS issues with teenfidelity.com, same overview on all sites - const res = await bhttp.get(url, { - headers: { - 'X-Requested-With': 'XMLHttpRequest', - }, + const res = await http.get(url, { + 'X-Requested-With': 'XMLHttpRequest', }); - if (res.statusCode === 200 && res.body.status === 'success') { - return scrapeLatest(res.body.html, site); + if (res.ok && res.body.status === 'success') { + return scrapeLatest(qu.extractAll(res.body.html, '.episode'), site); } - return null; + return res.status; } -async function fetchScene(url, site, baseRelease) { +async function fetchScene(url, channel, baseRelease) { const { pathname } = new URL(url); - const res = await bhttp.get(`https://www.kellymadison.com${pathname}`, { - headers: { - 'X-Requested-With': 'XMLHttpRequest', - }, + const res = await qu.get(`https://www.kellymadison.com${pathname}`, null, { + 'X-Requested-With': 'XMLHttpRequest', }); - return scrapeScene(res.body.toString(), url, site, baseRelease); + return res.ok ? scrapeScene(res.item, url, baseRelease) : res.status; } async function fetchProfile(actorName) { - const actorSlug = actorName.toLowerCase().replace(/\s+/g, '-'); - const res = await bhttp.get(`https://www.kellymadison.com/models/${actorSlug}`, { - headers: { - 'X-Requested-With': 'XMLHttpRequest', - }, + const actorSlug = slugify(actorName); + const res = await qu.get(`https://www.kellymadison.com/models/${actorSlug}`, null, { + 'X-Requested-With': 'XMLHttpRequest', }); - if (res.statusCode === 200) { - return scrapeProfile(res.body.toString(), actorName); + if (res.ok) { + return scrapeProfile(res.item); } - return null; + return res.status; } module.exports = { diff --git a/src/scrapers/letsdoeit.js b/src/scrapers/porndoe.js similarity index 100% rename from src/scrapers/letsdoeit.js rename to src/scrapers/porndoe.js diff --git a/src/scrapers/scrapers.js b/src/scrapers/scrapers.js index caad833c..fb64da6d 100644 --- a/src/scrapers/scrapers.js +++ b/src/scrapers/scrapers.js @@ -31,7 +31,7 @@ const kellymadison = require('./kellymadison'); const killergram = require('./killergram'); const kink = require('./kink'); const legalporno = require('./legalporno'); -const letsdoeit = require('./letsdoeit'); +const porndoe = require('./porndoe'); const men = require('./men'); const metrohd = require('./metrohd'); const mikeadriano = require('./mikeadriano'); @@ -74,6 +74,7 @@ module.exports = { '21sextury': sextury, adulttime, amateurallure, + amateureuro: porndoe, assylum, aziani, babes, @@ -92,6 +93,7 @@ module.exports = { fakehub, famedigital, fantasymassage, + forbondage: porndoe, fullpornnetwork, girlsway, girlgirl: julesjordan, @@ -106,7 +108,8 @@ module.exports = { killergram, kink, legalporno, - letsdoeit, + letsdoeit: porndoe, + mamacitaz: porndoe, men, metrohd, mikeadriano, @@ -128,7 +131,9 @@ module.exports = { swallowsalon: julesjordan, teencoreclub, teamskeet, + transbella: porndoe, twistys, + vipsexvault: porndoe, vivid, vixen, vogov, @@ -139,6 +144,7 @@ module.exports = { actors: { '21sextury': sextury, allanal: mikeadriano, + amateureuro: porndoe, analbbc: fullpornnetwork, analized: fullpornnetwork, analviolation: fullpornnetwork, @@ -166,6 +172,7 @@ module.exports = { evilangel, eyeontheguy: hush, fakehub, + forbondage: porndoe, freeones, gangbangcreampie: aziani, girlfaction: fullpornnetwork, @@ -184,7 +191,6 @@ module.exports = { killergram, kink, legalporno, - letsdoeit, men, metrohd, milehighmedia, @@ -201,6 +207,8 @@ module.exports = { pervertgallery: fullpornnetwork, peternorth: famedigital, pimpxxx: cherrypimps, + letsdoeit: porndoe, + mamacitaz: porndoe, pornhub, povperverts: fullpornnetwork, povpornstars: hush, @@ -216,10 +224,12 @@ module.exports = { teencoreclub, thatsitcomshow: nubiles, transangels, + transbella: porndoe, trueanal: mikeadriano, tushy: vixen, tushyraw: vixen, twistys, + vipsexvault: porndoe, vixen, wicked, wildoncam: cherrypimps, diff --git a/src/updates.js b/src/updates.js index 0a65b9ed..a27d28fb 100644 --- a/src/updates.js +++ b/src/updates.js @@ -53,15 +53,15 @@ async function filterUniqueReleases(latestReleases, accReleases) { } function needNextPage(uniqueReleases, pageAccReleases) { - if (uniqueReleases.length === 0) { - return false; - } - if (argv.last && pageAccReleases.length < argv.last) { // request for last N releases not yet satisfied return true; } + if (uniqueReleases.length === 0) { + return false; + } + if (uniqueReleases.every(release => !!release.date)) { const oldestReleaseOnPage = uniqueReleases .sort((releaseA, releaseB) => releaseB.date - releaseA.date) @@ -89,10 +89,12 @@ async function scrapeReleases(scraper, entity, preData, upcoming = false) { return accReleases; } + /* prevents argv.last from being satisfied if (latestReleases.length === 0) { // scraper successfully requested releases, but found none return accReleases; } + */ const latestReleasesWithEntity = latestReleases.map(release => ({ ...release, diff --git a/src/utils/qu.js b/src/utils/qu.js index 92323c9c..7caa72e0 100644 --- a/src/utils/qu.js +++ b/src/utils/qu.js @@ -332,6 +332,7 @@ async function get(urlValue, selector, headers, options, queryAll = false) { res, ok: true, status: res.statusCode, + ...res, }; } @@ -341,6 +342,7 @@ async function get(urlValue, selector, headers, options, queryAll = false) { res, ok: false, status: res.statusCode, + ...res, }; }