Compare commits

..

No commits in common. "0056780dc465d19b88d90a7029bd4365bd57ac30" and "236d4a94270cd0edb79cc05100dc2ab20c8b1fcd" have entirely different histories.

6 changed files with 13 additions and 49 deletions

View File

@ -42,7 +42,7 @@ export default {
},
data() {
return {
tags: ['gay', 'transsexual', 'bisexual', 'anal', 'anal prolapse', 'pissing'],
tags: ['anal', 'gay', 'transsexual', 'bisexual', 'pissing', 'anal prolapse'],
};
},
computed: {

View File

@ -425,9 +425,10 @@ const releasesFragment = `
releasesTagsConnection: {
none: {
tag: {
slug: {
in: $exclude
}
or: [
{ slug: { in: $exclude } }
{ name: { in: $exclude } }
]
}
}
}
@ -443,40 +444,6 @@ const releasesFragment = `
}
`;
// unused due performance
const releasesShowcasedFragment = `
connection: releasesShowcasedsConnection(
filter: {
release: {
date: {
lessThan: $before,
greaterThan: $after
}
releasesTagsConnection: {
none: {
tag: {
or: [
{ slug: { in: $exclude } }
{ name: { in: $exclude } }
]
}
}
}
}
},
first: $limit,
offset: $offset,
orderBy: $orderBy
) {
releases: nodes {
release {
${releaseFields}
}
}
totalCount
}
`;
const mediaFields = `
id
index
@ -713,7 +680,6 @@ export {
releasePhotosFragment,
releaseTrailerFragment,
releasesFragment,
releasesShowcasedFragment,
releaseFragment,
siteFragment,
sitesFragment,

View File

@ -3,12 +3,10 @@ const config = require('config');
exports.up = async (knex) => knex.raw(`
CREATE VIEW releases_not_showcased AS (
SELECT releases.id AS release_id FROM releases
LEFT JOIN entities AS channels ON channels.id = releases.entity_id
LEFT JOIN entities ON entities.id = releases.entity_id
LEFT JOIN entities AS studios ON studios.id = releases.studio_id
LEFT JOIN entities AS networks ON networks .id = entities.parent_id
WHERE (studios.showcased = false)
OR (channel.showcased = false AND studios.showcased IS NOT true)
OR (network.showcased = false AND channel.showcased IS NOT true AND studios.showcased IS NOT true)
WHERE entities.showcased = false
OR studios.showcased = false
);
COMMENT ON VIEW releases_not_showcased IS E'@foreignKey (release_id) references releases (id)';

4
package-lock.json generated
View File

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

View File

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

View File

@ -687,7 +687,7 @@ exports.seed = (knex) => Promise.resolve()
url: network.url,
description: network.description,
has_logo: network.hasLogo,
showcased: typeof network.showcased === 'boolean' ? network.showcased : true,
showcased: network.showcased,
parameters: network.parameters,
parent_id: grandParentNetworksBySlug[network.parent] || null,
}));
@ -703,7 +703,7 @@ exports.seed = (knex) => Promise.resolve()
url: network.url,
description: network.description,
has_logo: network.hasLogo,
showcased: typeof network.showcased === 'boolean' ? network.showcased : true,
showcased: network.showcased,
parameters: network.parameters,
parent_id: parentNetworksBySlug[network.parent] || grandParentNetworksBySlug[network.parent] || null,
}));