DebaucheryLibrarian
/
traxxx
2
1
Fork 1
Code Issues 39 Pull Requests 1 Releases Wiki Activity

Compare commits

base: DebaucheryLibrarian:c43bef544e55ae6edaba577f7ef8da909898beb9
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
..
compare: DebaucheryLibrarian:078837f27656d6ef86a8be2ae1a051caa866bb53
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

No commits in common. "c43bef544e55ae6edaba577f7ef8da909898beb9" and "078837f27656d6ef86a8be2ae1a051caa866bb53" have entirely different histories.
c43bef544e ... 078837f276

9 changed files with 26 additions and 42 deletions
Show Stats Expand all files Collapse all files

6
assets/js/actors/actions.js
View File

@ -10,7 +10,6 @@ import {
actorStashesFields,
getIncludedEntities,
getIncludedActors,
batchFragment,
} from '../fragments';
function initActorActions(store, router) {
@ -28,7 +27,7 @@ function initActorActions(store, router) {
const includedTags = router.currentRoute.value.query.tags ? router.currentRoute.value.query.tags.split(',') : [];
const mode = router.currentRoute.value.query.mode || 'all';
const { actor, batches: [lastBatch] } = await graphql(`
const { actor } = await graphql(`
query Actor(
$actorId: Int!
$userId: Int,
@ -255,7 +254,6 @@ function initActorActions(store, router) {
}
${actorStashesFields}
}
${batchFragment}
}
`, {
actorId,
@ -283,7 +281,7 @@ function initActorActions(store, router) {
return {
actor: curateActor(actor, null, curateRelease),
releases: actor.scenesConnection.releases.map((release) => curateRelease(release, 'scene', { lastBatch: lastBatch.id })),
releases: actor.scenesConnection.releases.map((release) => curateRelease(release)),
totalCount: actor.scenesConnection.totalCount,
};
}

25
assets/js/curate.js
View File

@ -65,20 +65,19 @@ function curateActor(actor, release) {
return curatedActor;
}
function curateRelease(release, type = 'scene', context = {}) {
function curateRelease(release, type = 'scene') {
const curatedRelease = {
...release,
type: release.type || type,
actors: [],
poster: release.poster && release.poster.media,
tags: release.tags ? release.tags.map((tag) => tag.tag || tag) : [],
isNew: release.createdBatchId === context.lastBatch,
};
curatedRelease.scenes = release.scenes?.filter(Boolean).map(({ scene }) => curateRelease(scene, 'scene', context)) || [];
curatedRelease.movies = release.movies?.filter(Boolean).map(({ movie }) => curateRelease(movie, 'movie', context)) || [];
curatedRelease.series = release.series?.filter(Boolean).map(({ serie }) => curateRelease(serie, 'serie', context)) || [];
curatedRelease.chapters = release.chapters?.filter(Boolean).map((chapter) => curateRelease(chapter, 'chapter', context)) || [];
curatedRelease.scenes = release.scenes?.filter(Boolean).map(({ scene }) => curateRelease(scene, 'scene')) || [];
curatedRelease.movies = release.movies?.filter(Boolean).map(({ movie }) => curateRelease(movie, 'movie')) || [];
curatedRelease.series = release.series?.filter(Boolean).map(({ serie }) => curateRelease(serie, 'serie')) || [];
curatedRelease.chapters = release.chapters?.filter(Boolean).map((chapter) => curateRelease(chapter)) || [];
curatedRelease.photos = release.photos?.filter(Boolean).map((photo) => photo.media || photo) || [];
curatedRelease.scenesPhotos = release.scenesPhotos?.filter(Boolean).map((photo) => photo.media || photo) || [];
curatedRelease.covers = release.covers?.filter(Boolean).map(({ media }) => media) || [];
@ -103,7 +102,7 @@ function curateRelease(release, type = 'scene', context = {}) {
return curatedRelease;
}
function curateEntity(entity, parent, releases, context) {
function curateEntity(entity, parent, releases) {
const curatedEntity = {
...entity,
children: [],
@ -121,19 +120,19 @@ function curateEntity(entity, parent, releases, context) {
}
if (entity.parent || parent) curatedEntity.parent = curateEntity(entity.parent || parent);
if (releases) curatedEntity.releases = releases.map((release) => curateRelease(release, 'scene', context));
if (releases) curatedEntity.releases = releases.map((release) => curateRelease(release));
curatedEntity.sceneTotal = entity.sceneTotal;
return curatedEntity;
}
function curateTag(tag, context) {
function curateTag(tag) {
const curatedTag = {
...tag,
};
if (tag.releases) curatedTag.releases = tag.releases.map(({ release }) => curateRelease(release, 'scene', context));
if (tag.releases) curatedTag.releases = tag.releases.map(({ release }) => curateRelease(release));
if (tag.banners) curatedTag.banners = tag.banners.map(({ banner }) => banner);
if (tag.photos) curatedTag.photos = tag.photos.map(({ media }) => media);
if (tag.poster) curatedTag.poster = tag.poster.media;
@ -141,14 +140,14 @@ function curateTag(tag, context) {
return curatedTag;
}
function curateStash(stash, context) {
function curateStash(stash) {
const curatedStash = stash;
if (stash.scenes || stash.scenesConnection?.scenes) {
curatedStash.sceneTotal = stash.scenesConnection?.totalCount || null;
curatedStash.scenes = (stash.scenesConnection?.scenes || stash.scenes).map((item) => ({
...item,
scene: curateRelease(item.scene, 'scene', context),
scene: curateRelease(item.scene),
}));
}
@ -164,7 +163,7 @@ function curateStash(stash, context) {
curatedStash.movieTotal = stash.moviesConnection?.totalCount || null;
curatedStash.movies = (stash.moviesConnection?.movies || stash.movies).map((item) => ({
...item,
movie: curateRelease(item.movie, 'movie', context),
movie: curateRelease(item.movie),
}));
}

7
assets/js/entities/actions.js
View File

@ -1,6 +1,6 @@
import { graphql } from '../api';
// import { sitesFragment, releaseFields } from '../fragments';
import { releaseFields, batchFragment, campaignsFragment } from '../fragments';
import { releaseFields, campaignsFragment } from '../fragments';
import { curateEntity } from '../curate';
import getDateRange from '../get-date-range';
@ -14,7 +14,7 @@ function initEntitiesActions(store, router) {
}) {
const { before, after, orderBy } = getDateRange(range);
const { entity, batches: [lastBatch] } = await graphql(`
const { entity } = await graphql(`
query Entity(
$entitySlug: String!
$entityType: String! = "channel"
@ -110,7 +110,6 @@ function initEntitiesActions(store, router) {
totalCount
}
}
${batchFragment}
}
`, {
entitySlug,
@ -131,7 +130,7 @@ function initEntitiesActions(store, router) {
}
return {
entity: curateEntity(entity, null, entity.connection.releases, { lastBatch: lastBatch.id }),
entity: curateEntity(entity, null, entity.connection.releases),
totalCount: entity.connection.totalCount,
};
}

7
assets/js/fragments.js
View File

@ -596,12 +596,6 @@ const releaseFragment = `
}
`;
const batchFragment = `
batches(first: 1, orderBy: CREATED_AT_DESC) {
id
}
`;
function getIncludedEntities(router) {
const includedChannels = router.currentRoute.value.query.channels ? router.currentRoute.value.query.channels.split(',') : [];
const includedNetworks = router.currentRoute.value.query.networks ? router.currentRoute.value.query.networks.split(',') : [];
@ -668,7 +662,6 @@ function getIncludedActors(router) {
export {
actorFields,
actorStashesFields,
batchFragment,
campaignsFragment,
mediaFields,
mediaFragment,

6
assets/js/releases/actions.js
View File

@ -1,6 +1,5 @@
import { graphql } from '../api';
import {
batchFragment,
releasesFragment,
releaseFragment,
releaseFields,
@ -15,7 +14,7 @@ function initReleasesActions(store, router) {
async function fetchReleases({ _commit }, { limit = 10, pageNumber = 1, range = 'latest' }) {
const { before, after, orderBy } = getDateRange(range);
const { connection: { releases, totalCount }, batches: [lastBatch] } = await graphql(`
const { connection: { releases, totalCount } } = await graphql(`
query Releases(
$hasAuth: Boolean!
$userId: Int
@ -27,7 +26,6 @@ function initReleasesActions(store, router) {
$exclude: [String!]
) {
${releasesFragment}
${batchFragment}
}
`, {
hasAuth: !!store.state.auth.user,
@ -41,7 +39,7 @@ function initReleasesActions(store, router) {
});
return {
releases: releases.map((release) => curateRelease(release.release || release, 'scene', { lastBatch: lastBatch.id })),
releases: releases.map((release) => curateRelease(release.release || release)),
totalCount,
};
}

6
assets/js/tags/actions.js
View File

@ -1,7 +1,6 @@
import { graphql, get } from '../api';
import {
releaseFields,
batchFragment,
} from '../fragments';
import { curateTag, curateRelease } from '../curate';
import getDateRange from '../get-date-range';
@ -15,7 +14,7 @@ function initTagsActions(store, _router) {
}) {
const { before, after, orderBy } = getDateRange(range);
const { tagBySlug, batches: [lastBatch] } = await graphql(`
const { tagBySlug } = await graphql(`
query Tag(
$tagSlug:String!
$offset: Int = 0,
@ -181,7 +180,6 @@ function initTagsActions(store, _router) {
totalCount
}
}
${batchFragment}
}
`, {
tagSlug,
@ -197,7 +195,7 @@ function initTagsActions(store, _router) {
return {
tag: curateTag(tagBySlug, null, curateRelease),
releases: tagBySlug.scenesConnection.releases.map((release) => curateRelease(release, 'scene', { lastBatch: lastBatch.id })),
releases: tagBySlug.scenesConnection.releases.map((release) => curateRelease(release)),
totalCount: tagBySlug.scenesConnection.totalCount,
};
}

5
assets/js/ui/actions.js
View File

@ -1,5 +1,5 @@
import { graphql, patch } from '../api';
import { releaseFields, batchFragment, actorStashesFields } from '../fragments';
import { releaseFields, actorStashesFields } from '../fragments';
import { curateRelease, curateActor, curateNotification } from '../curate';
function initUiActions(store, _router) {
@ -218,7 +218,6 @@ function initUiActions(store, _router) {
}
${actorStashesFields}
}
${batchFragment}
}
`, {
query,
@ -228,7 +227,7 @@ function initUiActions(store, _router) {
});
return {
releases: res?.results.map((result) => curateRelease(result.release, 'scene', { lastBatch: res?.batches[0].id })) || [],
releases: res?.results.map((result) => curateRelease(result.release)) || [],
actors: res?.actors.map((actor) => curateActor(actor)) || [],
};
}

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{
"name": "traxxx",
"version": "1.227.14",
"version": "1.227.13",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "traxxx",
"version": "1.227.14",
"version": "1.227.13",
"license": "ISC",
"dependencies": {
"@casl/ability": "^5.2.2",

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "traxxx",
"version": "1.227.14",
"version": "1.227.13",
"description": "All the latest porn releases in one place",
"main": "src/app.js",
"scripts": {