Compare commits

..

No commits in common. "1408074ef449a36129951f152eb45b050fe9a1db" and "578350734442b96a24420f0e828d1684dba560b5" have entirely different histories.

24 changed files with 13 additions and 83 deletions

View File

@ -35,10 +35,7 @@
/>
<div class="info column">
<div
class="row row-title"
:class="{ 'has-alt': release.altTitles?.length > 0 }"
>
<div class="row row-title">
<h2
v-if="release.title"
class="title"
@ -65,19 +62,6 @@
/>
</div>
<div
v-if="release.altTitles?.length > 0"
class="row alttitles"
>
<h2
v-for="(altTitle, index) in release.altTitles"
:key="`altitle-${index}`"
class="alttitle"
>
{{ altTitle }}
</h2>
</div>
<Releases
v-if="release.scenes && release.scenes.length > 0"
:releases="release.scenes"
@ -536,11 +520,6 @@ export default {
color: var(--shadow);
}
.alttitle {
color: var(--shadow);
font-size: 1rem;
}
.album-toggle {
height: fit-content;
display: inline-flex;

View File

@ -545,7 +545,6 @@ const releaseFragment = `
release(id: $releaseId) {
id
title
altTitles
description
date
datePrecision

View File

@ -30,9 +30,6 @@ module.exports = {
},
},
},
location: {
userAgent: 'contact via https://traxxx.me/',
},
analytics: {
enabled: false,
address: 'http://localhost:3000/script.js',

View File

@ -1,11 +0,0 @@
exports.up = async (knex) => {
await knex.schema.alterTable('releases', (table) => {
table.specificType('alt_titles', 'text ARRAY');
});
};
exports.down = async (knex) => {
await knex.schema.alterTable('releases', (table) => {
table.dropColumn('alt_titles');
});
};

4
package-lock.json generated
View File

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

View File

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

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 4.0 KiB

After

Width:  |  Height:  |  Size: 4.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.0 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 12 KiB

After

Width:  |  Height:  |  Size: 12 KiB

View File

@ -14,38 +14,10 @@ function scrapeAll(scenes) {
const { origin, pathname, searchParams } = new URL(url);
release.url = `${origin}${pathname}`;
release.shootId = pathname.match(/((LA)|(LT)|(MA)|(MD)|(MM)|(MS)|(MT)|(RR))[\w-]+/)?.[0]; // pathname sometimes contains other text, match at least two letters to prevent false positives
release.actors = searchParams.get('models_name')?.split(',').map((actor) => {
const [han, english] = actor.split('/').map((name) => name.trim());
if (/amateur/i.test(english)) {
// not a name
return null;
}
return {
name: english || han,
alias: english && han,
};
}).filter(Boolean);
}
const rawTitle = query.content('.video-title div')?.replace(release.shootId, '');
if (rawTitle) {
// find / closest to Han in case there are multiple, account for no / at all
const hanIndex = rawTitle.match(/\p{Script_Extensions=Han}/u)?.index;
const splitIndex = rawTitle.slice(0, hanIndex).lastIndexOf('/') || hanIndex;
if (hanIndex && splitIndex > -1) {
release.title = rawTitle.slice(0, splitIndex).trim();
release.altTitles = [rawTitle.slice(splitIndex + 1).trim()];
} else {
release.title = rawTitle;
}
release.actors = searchParams.get('models_name')?.split(',');
}
release.title = query.content('.video-title div');
release.duration = query.duration('.timestamp');
const poster = query.img('img', { attribute: 'data-src' });
@ -59,6 +31,8 @@ function scrapeAll(scenes) {
release.teaser = query.video(null, { attribute: 'data-video-src' });
console.log(release);
return release;
});
}
@ -75,16 +49,17 @@ function scrapeProfile({ query }) {
}
profile.description = query.content('h2') || null;
profile.height = query.number('//span[text()="Height"]/following-sibling::span', { match: /(\d+) cm/, matchIndex: 1 });
profile.height = query.number('//span[text()="Measurements"]/following-sibling::span', { match: /(\d+) cm/, matchIndex: 1 });
profile.weight = query.number('//span[text()="Weight"]/following-sibling::span', { match: /(\d+) kg/, matchIndex: 1 });
// can't find a single profile wiht this information available, but add for good measure
profile.measurements = query.content('//span[text()="Measurements"]/following-sibling::span');
profile.measurements = query.number('//span[text()="Birth Place"]/following-sibling::span', { match: /(\d+) cm/, matchIndex: 1 });
profile.birthPlace = query.number('//span[text()="Birth Place"]/following-sibling::span');
profile.banner = query.img('div[class*="banner"] > img');
profile.photos = query.imgs('#MusModelSwiper img');
console.log(profile);
return profile;
}

View File

@ -82,7 +82,6 @@ const scrapers = {
americanpornstar,
amateureuro: porndoe,
archangel,
asiam: modelmedia,
assylum,
aziani,
badoink,
@ -116,7 +115,6 @@ const scrapers = {
interracialpass: hush,
inthecrack,
jayrock,
jerkaoke: modelmedia,
jesseloadsmonsterfacials,
julesjordan,
karups,
@ -180,7 +178,6 @@ const scrapers = {
analviolation: fullpornnetwork,
anilos: nubiles,
archangel,
asiam: modelmedia,
aziani,
babes: mindgeek,
babevr: badoink,
@ -237,7 +234,6 @@ const scrapers = {
interracialpovs: hush,
inthecrack,
jamesdeen: fullpornnetwork,
jerkaoke: modelmedia,
julesjordan,
karups,
kellymadison,

View File

@ -32,7 +32,6 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
const curatedRelease = {
title: decode(release.title),
alt_titles: release.altTitles?.map((title) => decode(title)),
entry_id: release.entryId || null,
entity_id: release.entity.id,
studio_id: release.studio?.id || null,
@ -47,8 +46,6 @@ async function curateReleaseEntry(release, batchId, existingRelease, type = 'sce
updated_batch_id: batchId,
};
console.log(curatedRelease);
if (release.id) {
// release is updated
curatedRelease.id = release.id;

View File

@ -1,7 +1,5 @@
'use strict';
const config = require('config');
const knex = require('../knex');
const logger = require('../logger')(__filename);
const http = require('./http');
@ -29,7 +27,7 @@ async function resolvePlace(query) {
// https://operations.osmfoundation.org/policies/nominatim/
const res = await http.get(`https://nominatim.openstreetmap.org/search/${encodeURI(query)}?format=json&accept-language=en&addressdetails=1`, {
headers: {
'User-Agent': config.location.userAgent,
'User-Agent': 'contact at moonloop.adult@protonmail.com',
},
interval: 1000,
concurrency: 1,