diff --git a/public/img/logos/whalemember/facials4k.png b/public/img/logos/whalemember/facials4k.png new file mode 100644 index 00000000..7766fa03 Binary files /dev/null and b/public/img/logos/whalemember/facials4k.png differ diff --git a/public/img/logos/whalemember/lazy/anal4k.png b/public/img/logos/whalemember/lazy/anal4k.png index 1506f22d..190c37f3 100644 Binary files a/public/img/logos/whalemember/lazy/anal4k.png 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 892c8e17..bbe547c1 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 c7cc07c6..1cce2265 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 b49dbc9e..fb25c7f8 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 e0dfc92a..f9c2ae9f 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 047ed3df..92155ed0 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/facials4k.png b/public/img/logos/whalemember/lazy/facials4k.png new file mode 100644 index 00000000..c3e65f92 Binary files /dev/null and b/public/img/logos/whalemember/lazy/facials4k.png differ diff --git a/public/img/logos/whalemember/lazy/fantasyhd.png b/public/img/logos/whalemember/lazy/fantasyhd.png index facdb4ed..cab07fe6 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 888ba2f5..718e4df1 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 index 1c1cd581..94223a84 100644 Binary files a/public/img/logos/whalemember/lazy/favicon_dark.png 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 index 12463dce..275364ab 100644 Binary files a/public/img/logos/whalemember/lazy/favicon_light.png 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 91b65e4e..a40db94a 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 e779d461..8e2cbc45 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 4ee3af73..7cf111fd 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 ca02a322..b6d5786e 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 4dfc0304..9c327295 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 ce4ec87e..8003fa74 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 fec2a983..dff591dd 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 19a093b6..3afaa7bc 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 572cbe96..011f563c 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 49844966..4fe503ad 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 eca51bd6..3b13a402 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 46cf97ab..b4528a6c 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/facials-4k.png b/public/img/logos/whalemember/misc/facials-4k.png new file mode 100644 index 00000000..59f20b98 Binary files /dev/null and b/public/img/logos/whalemember/misc/facials-4k.png differ diff --git a/public/img/logos/whalemember/misc/facials-4k_tld.png b/public/img/logos/whalemember/misc/facials-4k_tld.png new file mode 100644 index 00000000..fa4da427 Binary files /dev/null and b/public/img/logos/whalemember/misc/facials-4k_tld.png differ diff --git a/public/img/logos/whalemember/thumbs/anal4k.png b/public/img/logos/whalemember/thumbs/anal4k.png index 31ba665a..9ad0461d 100644 Binary files a/public/img/logos/whalemember/thumbs/anal4k.png 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 7fe5a6de..56dfaf7f 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 fd959ca7..3ceb9c0c 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 9ae7f283..34548074 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 8d730d25..07b59b8d 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 06956f22..6df26b5c 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/facials4k.png b/public/img/logos/whalemember/thumbs/facials4k.png new file mode 100644 index 00000000..4cef274e Binary files /dev/null and b/public/img/logos/whalemember/thumbs/facials4k.png differ diff --git a/public/img/logos/whalemember/thumbs/fantasyhd.png b/public/img/logos/whalemember/thumbs/fantasyhd.png index ca637f9d..df2de0cc 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 888ba2f5..718e4df1 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 index 1c1cd581..94223a84 100644 Binary files a/public/img/logos/whalemember/thumbs/favicon_dark.png 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 index 12463dce..275364ab 100644 Binary files a/public/img/logos/whalemember/thumbs/favicon_light.png 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 5ba5317a..f5d2b90b 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 a8b05f26..c074479a 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 822254cb..58188014 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 e676ee2d..200f113b 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 2cdb69b0..b1faba2b 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 bd40038a..84fae0ec 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 51b301d7..2097b4ae 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 26e5b294..54c94861 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 f269abc4..0e1c9a0e 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 f2df018d..352410fb 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 b8d0efeb..3f56ca6d 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 910b4959..c40559ec 100644 Binary files a/public/img/logos/whalemember/thumbs/wetvr.png and b/public/img/logos/whalemember/thumbs/wetvr.png differ diff --git a/src/scrapers/gamma.js b/src/scrapers/gamma.js index e12b4df4..82518c1b 100644 --- a/src/scrapers/gamma.js +++ b/src/scrapers/gamma.js @@ -255,9 +255,6 @@ async function scrapeApiReleases(json, site) { ]; } - console.log(scene); - console.log(release); - // release.movie = `${site.url}/en/movie/${scene.url_movie_title}/${scene.movie_id}`; return release; diff --git a/src/tags.js b/src/tags.js index 4a66782a..7bdbd4e0 100644 --- a/src/tags.js +++ b/src/tags.js @@ -99,14 +99,20 @@ async function matchReleaseTags(releases) { async function getEntityTags(releases) { const entityIds = releases.map((release) => release.entity?.id).filter(Boolean); - const entityTags = await knex('entities_tags').whereIn('entity_id', entityIds); + const entityTags = await knex('entities_tags') + .select('id', 'name', 'entity_id') + .whereIn('entity_id', entityIds) + .leftJoin('tags', 'tags.id', 'entities_tags.tag_id'); const entityTagIdsByEntityId = entityTags.reduce((acc, entityTag) => { if (!acc[entityTag.entity_id]) { acc[entityTag.entity_id] = []; } - acc[entityTag.entity_id].push(entityTag.tag_id); + acc[entityTag.entity_id].push({ + id: entityTag.id, + name: entityTag.name, + }); return acc; }, {}); @@ -117,7 +123,7 @@ async function getEntityTags(releases) { function buildReleaseTagAssociations(releases, tagIdsBySlug, entityTagIdsByEntityId, type) { const tagAssociations = releases .map((release) => { - const entityTagIds = entityTagIdsByEntityId[release.entity?.id]?.map((tag) => ({ id: tag.id, origin: tag.name })) || []; + const entityTagIds = entityTagIdsByEntityId[release.entity?.id]?.map((tag) => ({ id: tag.id, original: tag.name })) || []; const releaseTags = release.tags?.filter(Boolean) || []; const releaseTagsWithIds = releaseTags.every((tag) => typeof tag === 'number') @@ -152,9 +158,9 @@ async function associateReleaseTags(releases, type = 'release') { } const tagIdsBySlug = await matchReleaseTags(releases); - const EntityTagIdsByEntityId = await getEntityTags(releases); + const entityTagIdsByEntityId = await getEntityTags(releases); - const tagAssociations = buildReleaseTagAssociations(releases, tagIdsBySlug, EntityTagIdsByEntityId, type); + const tagAssociations = buildReleaseTagAssociations(releases, tagIdsBySlug, entityTagIdsByEntityId, type); await bulkInsert(`${type}s_tags`, tagAssociations, false); } diff --git a/src/updates.js b/src/updates.js index 355ac92d..ab3e7117 100644 --- a/src/updates.js +++ b/src/updates.js @@ -61,8 +61,6 @@ async function filterUniqueReleases(releases) { const duplicateReleaseEntries = duplicateReleaseEntryChunks.flat(); - console.log(duplicateReleaseEntries); - const duplicateReleases = duplicateReleaseEntries.map((release) => curateRelease(release)); const duplicateReleasesByEntityIdAndEntryId = duplicateReleases.reduce(mapReleasesToEntityIdAndEntryId, {});