diff --git a/public/img/logos/whalemember/anal4k.png b/public/img/logos/whalemember/anal4k.png new file mode 100644 index 00000000..e368f501 Binary files /dev/null and b/public/img/logos/whalemember/anal4k.png differ diff --git a/public/img/logos/whalemember/lazy/anal4k.png b/public/img/logos/whalemember/lazy/anal4k.png new file mode 100644 index 00000000..1506f22d Binary files /dev/null and b/public/img/logos/whalemember/lazy/anal4k.png differ diff --git a/public/img/logos/whalemember/lazy/baeb.png b/public/img/logos/whalemember/lazy/baeb.png index 972ea2a3..892c8e17 100644 Binary files a/public/img/logos/whalemember/lazy/baeb.png and b/public/img/logos/whalemember/lazy/baeb.png differ diff --git a/public/img/logos/whalemember/lazy/bbcpie.png b/public/img/logos/whalemember/lazy/bbcpie.png index 7322612a..c7cc07c6 100644 Binary files a/public/img/logos/whalemember/lazy/bbcpie.png and b/public/img/logos/whalemember/lazy/bbcpie.png differ diff --git a/public/img/logos/whalemember/lazy/castingcouchx.png b/public/img/logos/whalemember/lazy/castingcouchx.png index b2c6cfe6..b49dbc9e 100644 Binary files a/public/img/logos/whalemember/lazy/castingcouchx.png and b/public/img/logos/whalemember/lazy/castingcouchx.png differ diff --git a/public/img/logos/whalemember/lazy/cum4k.png b/public/img/logos/whalemember/lazy/cum4k.png index 44838c30..e0dfc92a 100644 Binary files a/public/img/logos/whalemember/lazy/cum4k.png and b/public/img/logos/whalemember/lazy/cum4k.png differ diff --git a/public/img/logos/whalemember/lazy/exotic4k.png b/public/img/logos/whalemember/lazy/exotic4k.png index 94a971b1..047ed3df 100644 Binary files a/public/img/logos/whalemember/lazy/exotic4k.png and b/public/img/logos/whalemember/lazy/exotic4k.png differ diff --git a/public/img/logos/whalemember/lazy/fantasyhd.png b/public/img/logos/whalemember/lazy/fantasyhd.png index e76724e3..facdb4ed 100644 Binary files a/public/img/logos/whalemember/lazy/fantasyhd.png and b/public/img/logos/whalemember/lazy/fantasyhd.png differ diff --git a/public/img/logos/whalemember/lazy/favicon.png b/public/img/logos/whalemember/lazy/favicon.png index 26e8f4d0..888ba2f5 100644 Binary files a/public/img/logos/whalemember/lazy/favicon.png and b/public/img/logos/whalemember/lazy/favicon.png differ diff --git a/public/img/logos/whalemember/lazy/favicon_dark.png b/public/img/logos/whalemember/lazy/favicon_dark.png new file mode 100644 index 00000000..1c1cd581 Binary files /dev/null and b/public/img/logos/whalemember/lazy/favicon_dark.png differ diff --git a/public/img/logos/whalemember/lazy/favicon_light.png b/public/img/logos/whalemember/lazy/favicon_light.png new file mode 100644 index 00000000..12463dce Binary files /dev/null and b/public/img/logos/whalemember/lazy/favicon_light.png differ diff --git a/public/img/logos/whalemember/lazy/girlcum.png b/public/img/logos/whalemember/lazy/girlcum.png index 0cb8ae09..91b65e4e 100644 Binary files a/public/img/logos/whalemember/lazy/girlcum.png and b/public/img/logos/whalemember/lazy/girlcum.png differ diff --git a/public/img/logos/whalemember/lazy/holed.png b/public/img/logos/whalemember/lazy/holed.png index f92a70f6..e779d461 100644 Binary files a/public/img/logos/whalemember/lazy/holed.png and b/public/img/logos/whalemember/lazy/holed.png differ diff --git a/public/img/logos/whalemember/lazy/lubed.png b/public/img/logos/whalemember/lazy/lubed.png index 6832e0c6..4ee3af73 100644 Binary files a/public/img/logos/whalemember/lazy/lubed.png and b/public/img/logos/whalemember/lazy/lubed.png differ diff --git a/public/img/logos/whalemember/lazy/myveryfirsttime.png b/public/img/logos/whalemember/lazy/myveryfirsttime.png index b244f6cc..ca02a322 100644 Binary files a/public/img/logos/whalemember/lazy/myveryfirsttime.png and b/public/img/logos/whalemember/lazy/myveryfirsttime.png differ diff --git a/public/img/logos/whalemember/lazy/nannyspy.png b/public/img/logos/whalemember/lazy/nannyspy.png index d101f62a..4dfc0304 100644 Binary files a/public/img/logos/whalemember/lazy/nannyspy.png and b/public/img/logos/whalemember/lazy/nannyspy.png differ diff --git a/public/img/logos/whalemember/lazy/network.png b/public/img/logos/whalemember/lazy/network.png index c507fd16..ce4ec87e 100644 Binary files a/public/img/logos/whalemember/lazy/network.png and b/public/img/logos/whalemember/lazy/network.png differ diff --git a/public/img/logos/whalemember/lazy/passionhd.png b/public/img/logos/whalemember/lazy/passionhd.png index ac686945..fec2a983 100644 Binary files a/public/img/logos/whalemember/lazy/passionhd.png and b/public/img/logos/whalemember/lazy/passionhd.png differ diff --git a/public/img/logos/whalemember/lazy/povd.png b/public/img/logos/whalemember/lazy/povd.png index 96a5a243..19a093b6 100644 Binary files a/public/img/logos/whalemember/lazy/povd.png and b/public/img/logos/whalemember/lazy/povd.png differ diff --git a/public/img/logos/whalemember/lazy/puremature.png b/public/img/logos/whalemember/lazy/puremature.png index d038d171..572cbe96 100644 Binary files a/public/img/logos/whalemember/lazy/puremature.png and b/public/img/logos/whalemember/lazy/puremature.png differ diff --git a/public/img/logos/whalemember/lazy/spyfam.png b/public/img/logos/whalemember/lazy/spyfam.png index 779cf3f0..49844966 100644 Binary files a/public/img/logos/whalemember/lazy/spyfam.png and b/public/img/logos/whalemember/lazy/spyfam.png differ diff --git a/public/img/logos/whalemember/lazy/tiny4k.png b/public/img/logos/whalemember/lazy/tiny4k.png index 71b62214..eca51bd6 100644 Binary files a/public/img/logos/whalemember/lazy/tiny4k.png and b/public/img/logos/whalemember/lazy/tiny4k.png differ diff --git a/public/img/logos/whalemember/lazy/wetvr.png b/public/img/logos/whalemember/lazy/wetvr.png index d8b78ff2..46cf97ab 100644 Binary files a/public/img/logos/whalemember/lazy/wetvr.png and b/public/img/logos/whalemember/lazy/wetvr.png differ diff --git a/public/img/logos/whalemember/misc/anal-4k.png b/public/img/logos/whalemember/misc/anal-4k.png new file mode 100644 index 00000000..c3741223 Binary files /dev/null and b/public/img/logos/whalemember/misc/anal-4k.png differ diff --git a/public/img/logos/whalemember/thumbs/anal4k.png b/public/img/logos/whalemember/thumbs/anal4k.png new file mode 100644 index 00000000..31ba665a Binary files /dev/null and b/public/img/logos/whalemember/thumbs/anal4k.png differ diff --git a/public/img/logos/whalemember/thumbs/baeb.png b/public/img/logos/whalemember/thumbs/baeb.png index aa5d36e1..7fe5a6de 100644 Binary files a/public/img/logos/whalemember/thumbs/baeb.png and b/public/img/logos/whalemember/thumbs/baeb.png differ diff --git a/public/img/logos/whalemember/thumbs/bbcpie.png b/public/img/logos/whalemember/thumbs/bbcpie.png index 609aa4e1..fd959ca7 100644 Binary files a/public/img/logos/whalemember/thumbs/bbcpie.png and b/public/img/logos/whalemember/thumbs/bbcpie.png differ diff --git a/public/img/logos/whalemember/thumbs/castingcouchx.png b/public/img/logos/whalemember/thumbs/castingcouchx.png index e50f9db9..9ae7f283 100644 Binary files a/public/img/logos/whalemember/thumbs/castingcouchx.png and b/public/img/logos/whalemember/thumbs/castingcouchx.png differ diff --git a/public/img/logos/whalemember/thumbs/cum4k.png b/public/img/logos/whalemember/thumbs/cum4k.png index a9b2c951..8d730d25 100644 Binary files a/public/img/logos/whalemember/thumbs/cum4k.png and b/public/img/logos/whalemember/thumbs/cum4k.png differ diff --git a/public/img/logos/whalemember/thumbs/exotic4k.png b/public/img/logos/whalemember/thumbs/exotic4k.png index da7a9380..06956f22 100644 Binary files a/public/img/logos/whalemember/thumbs/exotic4k.png and b/public/img/logos/whalemember/thumbs/exotic4k.png differ diff --git a/public/img/logos/whalemember/thumbs/fantasyhd.png b/public/img/logos/whalemember/thumbs/fantasyhd.png index 7b5e2f59..ca637f9d 100644 Binary files a/public/img/logos/whalemember/thumbs/fantasyhd.png and b/public/img/logos/whalemember/thumbs/fantasyhd.png differ diff --git a/public/img/logos/whalemember/thumbs/favicon.png b/public/img/logos/whalemember/thumbs/favicon.png index 26e8f4d0..888ba2f5 100644 Binary files a/public/img/logos/whalemember/thumbs/favicon.png and b/public/img/logos/whalemember/thumbs/favicon.png differ diff --git a/public/img/logos/whalemember/thumbs/favicon_dark.png b/public/img/logos/whalemember/thumbs/favicon_dark.png new file mode 100644 index 00000000..1c1cd581 Binary files /dev/null and b/public/img/logos/whalemember/thumbs/favicon_dark.png differ diff --git a/public/img/logos/whalemember/thumbs/favicon_light.png b/public/img/logos/whalemember/thumbs/favicon_light.png new file mode 100644 index 00000000..12463dce Binary files /dev/null and b/public/img/logos/whalemember/thumbs/favicon_light.png differ diff --git a/public/img/logos/whalemember/thumbs/girlcum.png b/public/img/logos/whalemember/thumbs/girlcum.png index 5eb1256a..5ba5317a 100644 Binary files a/public/img/logos/whalemember/thumbs/girlcum.png and b/public/img/logos/whalemember/thumbs/girlcum.png differ diff --git a/public/img/logos/whalemember/thumbs/holed.png b/public/img/logos/whalemember/thumbs/holed.png index e6ef739d..a8b05f26 100644 Binary files a/public/img/logos/whalemember/thumbs/holed.png and b/public/img/logos/whalemember/thumbs/holed.png differ diff --git a/public/img/logos/whalemember/thumbs/lubed.png b/public/img/logos/whalemember/thumbs/lubed.png index bbb996bb..822254cb 100644 Binary files a/public/img/logos/whalemember/thumbs/lubed.png and b/public/img/logos/whalemember/thumbs/lubed.png differ diff --git a/public/img/logos/whalemember/thumbs/myveryfirsttime.png b/public/img/logos/whalemember/thumbs/myveryfirsttime.png index 021b7c3b..e676ee2d 100644 Binary files a/public/img/logos/whalemember/thumbs/myveryfirsttime.png and b/public/img/logos/whalemember/thumbs/myveryfirsttime.png differ diff --git a/public/img/logos/whalemember/thumbs/nannyspy.png b/public/img/logos/whalemember/thumbs/nannyspy.png index 346ec771..2cdb69b0 100644 Binary files a/public/img/logos/whalemember/thumbs/nannyspy.png and b/public/img/logos/whalemember/thumbs/nannyspy.png differ diff --git a/public/img/logos/whalemember/thumbs/network.png b/public/img/logos/whalemember/thumbs/network.png index ea014889..bd40038a 100644 Binary files a/public/img/logos/whalemember/thumbs/network.png and b/public/img/logos/whalemember/thumbs/network.png differ diff --git a/public/img/logos/whalemember/thumbs/passionhd.png b/public/img/logos/whalemember/thumbs/passionhd.png index e3d5c62f..51b301d7 100644 Binary files a/public/img/logos/whalemember/thumbs/passionhd.png and b/public/img/logos/whalemember/thumbs/passionhd.png differ diff --git a/public/img/logos/whalemember/thumbs/povd.png b/public/img/logos/whalemember/thumbs/povd.png index a0d07dd5..26e5b294 100644 Binary files a/public/img/logos/whalemember/thumbs/povd.png and b/public/img/logos/whalemember/thumbs/povd.png differ diff --git a/public/img/logos/whalemember/thumbs/puremature.png b/public/img/logos/whalemember/thumbs/puremature.png index 4c173567..f269abc4 100644 Binary files a/public/img/logos/whalemember/thumbs/puremature.png and b/public/img/logos/whalemember/thumbs/puremature.png differ diff --git a/public/img/logos/whalemember/thumbs/spyfam.png b/public/img/logos/whalemember/thumbs/spyfam.png index 0fc74ccc..f2df018d 100644 Binary files a/public/img/logos/whalemember/thumbs/spyfam.png and b/public/img/logos/whalemember/thumbs/spyfam.png differ diff --git a/public/img/logos/whalemember/thumbs/tiny4k.png b/public/img/logos/whalemember/thumbs/tiny4k.png index cfba3a8b..b8d0efeb 100644 Binary files a/public/img/logos/whalemember/thumbs/tiny4k.png and b/public/img/logos/whalemember/thumbs/tiny4k.png differ diff --git a/public/img/logos/whalemember/thumbs/wetvr.png b/public/img/logos/whalemember/thumbs/wetvr.png index 28cfdaa9..910b4959 100644 Binary files a/public/img/logos/whalemember/thumbs/wetvr.png and b/public/img/logos/whalemember/thumbs/wetvr.png differ diff --git a/public/img/tags/da-tp/7.jpeg b/public/img/tags/da-tp/7.jpeg new file mode 100644 index 00000000..c8afd9e1 Binary files /dev/null and b/public/img/tags/da-tp/7.jpeg differ diff --git a/public/img/tags/da-tp/lazy/7.jpeg b/public/img/tags/da-tp/lazy/7.jpeg new file mode 100644 index 00000000..58e9a4b2 Binary files /dev/null and b/public/img/tags/da-tp/lazy/7.jpeg differ diff --git a/public/img/tags/da-tp/originals/7.jpeg b/public/img/tags/da-tp/originals/7.jpeg new file mode 100644 index 00000000..6b50b32a Binary files /dev/null and b/public/img/tags/da-tp/originals/7.jpeg differ diff --git a/public/img/tags/da-tp/thumbs/7.jpeg b/public/img/tags/da-tp/thumbs/7.jpeg new file mode 100644 index 00000000..3f41fe7f Binary files /dev/null and b/public/img/tags/da-tp/thumbs/7.jpeg differ diff --git a/seeds/02_sites.js b/seeds/02_sites.js index b0283c76..2c648e16 100644 --- a/seeds/02_sites.js +++ b/seeds/02_sites.js @@ -9396,6 +9396,13 @@ const sites = [ tags: ['fake-cum', 'creampie', '4k'], parent: 'whalemember', }, + { + name: 'Anal 4K', + slug: 'anal4k', + url: 'https://anal4k.com', + tags: ['anal', '4k'], + parent: 'whalemember', + }, { name: 'Tiny 4K', slug: 'tiny4k', diff --git a/seeds/04_media.js b/seeds/04_media.js index 4f36fe07..3b673ae3 100644 --- a/seeds/04_media.js +++ b/seeds/04_media.js @@ -611,7 +611,7 @@ const tagPosters = [ ['cum-on-butt', 0, 'Jynx Maze in "Don\'t Make Me Beg 4" for Evil Angel'], ['cum-on-boobs', 1, 'Kylie Page in "Melt In Your Mouth" for Twistys Hard'], ['cum-on-pussy', 0, 'Talinka A for Sex Art'], - ['da-tp', 5, 'Venera Maxima in LegalPorno GIO1287'], + ['da-tp', 7, 'Polly Petrova in LegalPorno YE069'], ['deepthroat', 2, 'Sarah Vandella for Throated'], ['dap', 7, 'Adriana Chechik in "DP Masters 6" for Jules Jordan'], ['double-blowjob', 1, 'Veronica Rodriguez and Penny Pax in "Fucking Older Guys 5" for Penthouse'], @@ -743,6 +743,7 @@ const tagPhotos = [ ['cum-in-mouth', 0, 'Vina Sky and Avi Love for HardX'], ['cum-on-boobs', 0, 'Alessandra Jane for Private'], ['cum-on-boobs', 2, 'Blake Blossom in "Naturally Stacked Cutie" for HardX'], + ['da-tp', 5, 'Venera Maxima in LegalPorno GIO1287'], ['da-tp', 6, 'Adriana Chechik in "Gangbang Me" for HardX'], ['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'], ['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'], diff --git a/src/actors.js b/src/actors.js index f660f7e8..4ab54e82 100644 --- a/src/actors.js +++ b/src/actors.js @@ -24,7 +24,7 @@ const logger = require('./logger')(__filename); const { toBaseReleases } = require('./deep'); const { associateAvatars, flushOrphanedMedia } = require('./media'); -const { fetchEntitiesBySlug } = require('./entities'); +const { fetchEntitiesBySlug, getRecursiveParent } = require('./entities'); const { deleteScenes } = require('./releases'); const slugify = require('./utils/slugify'); @@ -159,11 +159,13 @@ function toBaseActors(actorsOrNames, release) { const name = capitalize(baseName); const slug = slugify(name); + const entity = getRecursiveParent(release?.entity); + const baseActor = { name, slug, - entryId: entryId || actorOrName.entryId || null, - entity: release?.entity?.parent || release?.entity || null, + entryId: entity && (entryId || actorOrName.entryId || null), + entity, hasProfile: !!actorOrName.name, // actor contains profile information }; diff --git a/src/entities.js b/src/entities.js index 543ba330..1076da95 100644 --- a/src/entities.js +++ b/src/entities.js @@ -9,6 +9,18 @@ const knex = require('./knex'); const { deleteScenes, deleteMovies } = require('./releases'); const { flushOrphanedMedia } = require('./media'); +function getRecursiveParent(entity) { + if (!entity) { + return null; + } + + if (entity.parent) { + return getRecursiveParent(entity.parent); + } + + return entity; +} + function curateEntity(entity, includeParameters = false) { if (!entity) { return null; @@ -377,6 +389,7 @@ module.exports = { fetchEntitiesBySlug, fetchEntity, fetchEntities, + getRecursiveParent, searchEntities, flushEntities, urlToSiteSlug,