Preventing actor entry ID from being inserted without entity ID.

This commit is contained in:
DebaucheryLibrarian 2021-02-24 02:43:34 +01:00
parent af131f903e
commit fb2217a733
54 changed files with 27 additions and 4 deletions

Binary file not shown.

After

Width:  |  Height:  |  Size: 34 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 7.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

After

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.3 KiB

After

Width:  |  Height:  |  Size: 2.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.0 KiB

After

Width:  |  Height:  |  Size: 3.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.2 KiB

After

Width:  |  Height:  |  Size: 1.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.4 KiB

After

Width:  |  Height:  |  Size: 3.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.5 KiB

After

Width:  |  Height:  |  Size: 3.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.3 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.5 KiB

After

Width:  |  Height:  |  Size: 2.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.5 KiB

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 26 KiB

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 31 KiB

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 30 KiB

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.5 KiB

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.5 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 25 KiB

After

Width:  |  Height:  |  Size: 25 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.4 KiB

After

Width:  |  Height:  |  Size: 9.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.9 KiB

After

Width:  |  Height:  |  Size: 7.9 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 23 KiB

After

Width:  |  Height:  |  Size: 23 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 29 KiB

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 36 KiB

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 325 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 5.3 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 280 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -9396,6 +9396,13 @@ const sites = [
tags: ['fake-cum', 'creampie', '4k'], tags: ['fake-cum', 'creampie', '4k'],
parent: 'whalemember', parent: 'whalemember',
}, },
{
name: 'Anal 4K',
slug: 'anal4k',
url: 'https://anal4k.com',
tags: ['anal', '4k'],
parent: 'whalemember',
},
{ {
name: 'Tiny 4K', name: 'Tiny 4K',
slug: 'tiny4k', slug: 'tiny4k',

View File

@ -611,7 +611,7 @@ const tagPosters = [
['cum-on-butt', 0, 'Jynx Maze in "Don\'t Make Me Beg 4" for Evil Angel'], ['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-boobs', 1, 'Kylie Page in "Melt In Your Mouth" for Twistys Hard'],
['cum-on-pussy', 0, 'Talinka A for Sex Art'], ['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'], ['deepthroat', 2, 'Sarah Vandella for Throated'],
['dap', 7, 'Adriana Chechik in "DP Masters 6" for Jules Jordan'], ['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'], ['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-in-mouth', 0, 'Vina Sky and Avi Love for HardX'],
['cum-on-boobs', 0, 'Alessandra Jane for Private'], ['cum-on-boobs', 0, 'Alessandra Jane for Private'],
['cum-on-boobs', 2, 'Blake Blossom in "Naturally Stacked Cutie" for HardX'], ['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', 6, 'Adriana Chechik in "Gangbang Me" for HardX'],
['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'], ['da-tp', 0, 'Natasha Teen in LegalPorno SZ2164'],
['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'], ['da-tp', 1, 'Francys Belle in SZ1702 for LegalPorno'],

View File

@ -24,7 +24,7 @@ const logger = require('./logger')(__filename);
const { toBaseReleases } = require('./deep'); const { toBaseReleases } = require('./deep');
const { associateAvatars, flushOrphanedMedia } = require('./media'); const { associateAvatars, flushOrphanedMedia } = require('./media');
const { fetchEntitiesBySlug } = require('./entities'); const { fetchEntitiesBySlug, getRecursiveParent } = require('./entities');
const { deleteScenes } = require('./releases'); const { deleteScenes } = require('./releases');
const slugify = require('./utils/slugify'); const slugify = require('./utils/slugify');
@ -159,11 +159,13 @@ function toBaseActors(actorsOrNames, release) {
const name = capitalize(baseName); const name = capitalize(baseName);
const slug = slugify(name); const slug = slugify(name);
const entity = getRecursiveParent(release?.entity);
const baseActor = { const baseActor = {
name, name,
slug, slug,
entryId: entryId || actorOrName.entryId || null, entryId: entity && (entryId || actorOrName.entryId || null),
entity: release?.entity?.parent || release?.entity || null, entity,
hasProfile: !!actorOrName.name, // actor contains profile information hasProfile: !!actorOrName.name, // actor contains profile information
}; };

View File

@ -9,6 +9,18 @@ const knex = require('./knex');
const { deleteScenes, deleteMovies } = require('./releases'); const { deleteScenes, deleteMovies } = require('./releases');
const { flushOrphanedMedia } = require('./media'); 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) { function curateEntity(entity, includeParameters = false) {
if (!entity) { if (!entity) {
return null; return null;
@ -377,6 +389,7 @@ module.exports = {
fetchEntitiesBySlug, fetchEntitiesBySlug,
fetchEntity, fetchEntity,
fetchEntities, fetchEntities,
getRecursiveParent,
searchEntities, searchEntities,
flushEntities, flushEntities,
urlToSiteSlug, urlToSiteSlug,