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

Compare commits

base: DebaucheryLibrarian:53e8495d06b93bfd1961f3daa421b37798e46cc6
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental
...
compare: DebaucheryLibrarian:38b90b3d4cd30c85578e2d174548e096a23aedaa
Branches Tags
DebaucheryLibrarian:master
DebaucheryLibrarian:old
DebaucheryLibrarian:experimental

2 Commits
53e8495d06 ... 38b90b3d4c

Author SHA1 Message Date
DebaucheryLibrarian 38b90b3d4c 1.135.5 2020-09-18 02:54:15 +02:00
DebaucheryLibrarian a4929819df Using channel URL instead of composed URL for session retrieval, should fix Brazzers. 2020-09-18 02:54:05 +02:00
3 changed files with 14 additions and 12 deletions
Show Stats Expand all files Collapse all files

2
package-lock.json generated
View File

@ -1,6 +1,6 @@
{
"name": "traxxx",
"version": "1.135.4",
"version": "1.135.5",
"lockfileVersion": 1,
"requires": true,
"dependencies": {

2
package.json
View File

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

22
src/scrapers/mindgeek.js
View File

@ -121,9 +121,10 @@ function scrapeScene(data, url, _site, networkName) {
}
function getUrl(site) {
const { search } = new URL(site.url);
const { searchParams } = new URL(site.url);
if (search.match(/\?site=\d+/)) {
// if (search.match(/\?site=\d+/)) {
if (searchParams.has('site')) {
return site.url;
}
@ -142,11 +143,12 @@ function getUrl(site) {
throw new Error(`Mind Geek site '${site.name}' (${site.url}) not supported`);
}
async function getSession(url) {
async function getSession(url, site) {
const cookieJar = new CookieJar();
const session = bhttp.session({ cookieJar });
const res = await session.get(url);
// const res = await session.get(url);
const res = await session.get(site.parameters?.siteId ? site.parent.url : site.url);
if (res.statusCode === 200) {
const cookieString = await cookieJar.getCookieStringAsync(url);
@ -198,10 +200,10 @@ function scrapeProfile(data, html, releases = [], networkName) {
async function fetchLatest(site, page = 1) {
const url = getUrl(site);
const { search } = new URL(url);
const siteId = new URLSearchParams(search).get('site');
const { searchParams } = new URL(url);
const siteId = searchParams.get('site');
const { session, instanceToken } = await getSession(url);
const { session, instanceToken } = await getSession(url, site);
const beforeDate = moment().add('1', 'day').format('YYYY-MM-DD');
const limit = 10;
@ -226,7 +228,7 @@ async function fetchLatest(site, page = 1) {
async function fetchUpcoming(site) {
const url = getUrl(site);
const { session, instanceToken } = await getSession(url);
const { session, instanceToken } = await getSession(url, site);
const apiUrl = 'https://site-api.project1service.com/v2/upcoming-releases';
@ -252,7 +254,7 @@ async function fetchScene(url, site, baseScene) {
}
const entryId = url.match(/\d+/)[0];
const { session, instanceToken } = await getSession(url);
const { session, instanceToken } = await getSession(url, site);
const res = await session.get(`https://site-api.project1service.com/v2/releases/${entryId}`, {
headers: {
@ -269,7 +271,7 @@ async function fetchScene(url, site, baseScene) {
async function fetchProfile({ name: actorName }, networkOrNetworkSlug, actorPath = 'model') {
const url = `https://www.${networkOrNetworkSlug.slug || networkOrNetworkSlug}.com`;
const { session, instanceToken } = await getSession(url);
const { session, instanceToken } = await getSession(url, networkOrNetworkSlug);
const res = await session.get(`https://site-api.project1service.com/v1/actors/?search=${encodeURI(actorName)}`, {
headers: {