Compare commits
No commits in common. "4b9cf255048ac23b9882561cf1cac02fd183e10d" and "1e4bcb9e02bfc53fbb7050305c02757cb34b6322" have entirely different histories.
4b9cf25504
...
1e4bcb9e02
|
@ -1,11 +1,11 @@
|
|||
{
|
||||
"name": "traxxx-web",
|
||||
"version": "0.11.2",
|
||||
"version": "0.11.1",
|
||||
"lockfileVersion": 2,
|
||||
"requires": true,
|
||||
"packages": {
|
||||
"": {
|
||||
"version": "0.11.2",
|
||||
"version": "0.11.1",
|
||||
"dependencies": {
|
||||
"@brillout/json-serializer": "^0.5.8",
|
||||
"@dicebear/collection": "^7.0.5",
|
||||
|
|
|
@ -70,5 +70,5 @@
|
|||
"postcss-custom-media": "^10.0.2",
|
||||
"postcss-nesting": "^12.0.2"
|
||||
},
|
||||
"version": "0.11.2"
|
||||
"version": "0.11.1"
|
||||
}
|
||||
|
|
|
@ -311,7 +311,6 @@ async function unstash() {
|
|||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
flex-grow: 1;
|
||||
}
|
||||
|
||||
.photo-link {
|
||||
|
|
|
@ -323,18 +323,10 @@ async function queryManticoreSql(filters, options, _reqUser) {
|
|||
if (filters.stashId) {
|
||||
builder.select(knex.raw(`
|
||||
actors.id as id,
|
||||
actors.gender as gender,
|
||||
actors.country as country,
|
||||
actors.height as height,
|
||||
actors.weight as weight,
|
||||
actors.cup as cup,
|
||||
actors.natural_boobs as natural_boobs,
|
||||
actors.date_of_birth as date_of_birth,
|
||||
actors.has_avatar as has_avatar,
|
||||
actors.scenes as scenes,
|
||||
actors.stashed as stashed,
|
||||
created_at as stashed_at,
|
||||
if(actors.date_of_birth, floor((now() - actors.date_of_birth) / 31556952), 0) as age
|
||||
created_at as stashed_at
|
||||
`));
|
||||
// weight() as _score
|
||||
|
||||
|
@ -378,8 +370,7 @@ async function queryManticoreSql(filters, options, _reqUser) {
|
|||
}
|
||||
|
||||
if (filters.cup) {
|
||||
builder.select(`regex(actors.cup, '^[${filters.cup[0]}-${filters.cup[1]}]') as cup_in_range`);
|
||||
builder.where('cup_in_range', 1);
|
||||
builder.where(`regex(cup, '^[${filters.cup[0]}-${filters.cup[1]}]')`, 1);
|
||||
}
|
||||
|
||||
if (typeof filters.naturalBoobs === 'boolean') {
|
||||
|
@ -462,8 +453,6 @@ export async function fetchActors(filters, rawOptions, reqUser) {
|
|||
|
||||
const result = await queryManticoreSql(filters, options, reqUser);
|
||||
|
||||
// console.log('result', result);
|
||||
|
||||
const actorIds = result.actors.map((actor) => Number(actor.id));
|
||||
const [actors, countries] = await Promise.all([
|
||||
fetchActorsById(actorIds, {}, reqUser),
|
||||
|
|
Loading…
Reference in New Issue