Compare commits
2 Commits
3bee1ac97d
...
a2d5828fda
| Author | SHA1 | Date | |
|---|---|---|---|
| a2d5828fda | |||
| 52d041c591 |
@@ -104,9 +104,6 @@ module.exports = {
|
|||||||
assetPath: '/img',
|
assetPath: '/img',
|
||||||
mediaPath: '/media',
|
mediaPath: '/media',
|
||||||
s3Path: 'https://s3.wasabisys.com',
|
s3Path: 'https://s3.wasabisys.com',
|
||||||
videoRestrictions: [ // entity slugs
|
videoRestrictions: [], // entity slugs, _ prefix for networks, hides trailer and teaser videos
|
||||||
'_kink',
|
|
||||||
'_kinkmen',
|
|
||||||
],
|
|
||||||
},
|
},
|
||||||
};
|
};
|
||||||
|
|||||||
4
package-lock.json
generated
4
package-lock.json
generated
@@ -1,11 +1,11 @@
|
|||||||
{
|
{
|
||||||
"name": "traxxx-web",
|
"name": "traxxx-web",
|
||||||
"version": "0.45.1",
|
"version": "0.45.2",
|
||||||
"lockfileVersion": 2,
|
"lockfileVersion": 2,
|
||||||
"requires": true,
|
"requires": true,
|
||||||
"packages": {
|
"packages": {
|
||||||
"": {
|
"": {
|
||||||
"version": "0.45.1",
|
"version": "0.45.2",
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
"@brillout/json-serializer": "^0.5.8",
|
"@brillout/json-serializer": "^0.5.8",
|
||||||
"@dicebear/collection": "^7.0.5",
|
"@dicebear/collection": "^7.0.5",
|
||||||
|
|||||||
@@ -89,7 +89,7 @@
|
|||||||
"overrides": {
|
"overrides": {
|
||||||
"vite": "$vite"
|
"vite": "$vite"
|
||||||
},
|
},
|
||||||
"version": "0.45.1",
|
"version": "0.45.2",
|
||||||
"imports": {
|
"imports": {
|
||||||
"#/*": "./*.js"
|
"#/*": "./*.js"
|
||||||
}
|
}
|
||||||
|
|||||||
11
src/knex.js
11
src/knex.js
@@ -1,15 +1,6 @@
|
|||||||
import config from 'config';
|
import config from 'config';
|
||||||
import knex from 'knex';
|
import knex from 'knex';
|
||||||
|
|
||||||
export const knexQuery = knex({
|
|
||||||
client: 'pg',
|
|
||||||
connection: config.database.query,
|
|
||||||
pool: config.database.pool,
|
|
||||||
// performance overhead, don't use asyncStackTraces in production
|
|
||||||
asyncStackTraces: process.env.NODE_ENV === 'development',
|
|
||||||
// debug: process.env.NODE_ENV === 'development',
|
|
||||||
});
|
|
||||||
|
|
||||||
export const knexOwner = knex({
|
export const knexOwner = knex({
|
||||||
client: 'pg',
|
client: 'pg',
|
||||||
connection: config.database.owner,
|
connection: config.database.owner,
|
||||||
@@ -19,6 +10,8 @@ export const knexOwner = knex({
|
|||||||
// debug: process.env.NODE_ENV === 'development',
|
// debug: process.env.NODE_ENV === 'development',
|
||||||
});
|
});
|
||||||
|
|
||||||
|
export const knexQuery = knexOwner; // legacy
|
||||||
|
|
||||||
export const knexManticore = knex({
|
export const knexManticore = knex({
|
||||||
client: 'mysql',
|
client: 'mysql',
|
||||||
connection: {
|
connection: {
|
||||||
|
|||||||
@@ -153,7 +153,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
|
|||||||
teasers,
|
teasers,
|
||||||
fingerprints,
|
fingerprints,
|
||||||
stashes,
|
stashes,
|
||||||
lastBatch: { id: lastBatchId },
|
lastBatch,
|
||||||
} = await promiseProps({
|
} = await promiseProps({
|
||||||
scenes: knex('releases').whereIn('releases.id', sceneIds),
|
scenes: knex('releases').whereIn('releases.id', sceneIds),
|
||||||
channels: knex('releases')
|
channels: knex('releases')
|
||||||
@@ -348,7 +348,7 @@ export async function fetchScenesById(sceneIds, { reqUser, ...context } = {}) {
|
|||||||
fingerprints: sceneFingerprints,
|
fingerprints: sceneFingerprints,
|
||||||
stashes: sceneStashes,
|
stashes: sceneStashes,
|
||||||
actorStashes: sceneActorStashes,
|
actorStashes: sceneActorStashes,
|
||||||
lastBatchId,
|
lastBatchId: lastBatch?.id,
|
||||||
}, reqUser);
|
}, reqUser);
|
||||||
}).filter(Boolean);
|
}).filter(Boolean);
|
||||||
}
|
}
|
||||||
|
|||||||
2
static
2
static
Submodule static updated: 2af6f58ca1...c8ee47e181
Reference in New Issue
Block a user