From 0fe6a1119a67053222f194a2455607e4b1d28f0b Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Thu, 31 Oct 2024 05:47:54 +0100
Subject: [PATCH] Accomodating unprint proxy options.

---
 common                   | 2 +-
 config/default.js        | 2 +-
 package-lock.json        | 8 ++++----
 package.json             | 2 +-
 src/app.js               | 6 +++---
 src/scrapers/analvids.js | 4 +---
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/common b/common
index 7a39529e..1122b419 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit 7a39529e2c20faa7153b8ffe932842e30b46aeb4
+Subproject commit 1122b4198f2c5bc27f9f4e3f3aedea6c81f09ba1
diff --git a/config/default.js b/config/default.js
index 09651e56..696aa9ea 100755
--- a/config/default.js
+++ b/config/default.js
@@ -301,7 +301,6 @@ module.exports = {
 	},
 	proxy: {
 		enable: false,
-		protocol: 'http',
 		host: '',
 		port: 8888,
 		hostnames: [
@@ -335,6 +334,7 @@ module.exports = {
 			'cdn.tushyraw.com',
 			'cdn.slayed.com',
 			'cdn.milfy.com',
+			'www.analvids.com',
 			'www.vogov.com',
 			'www.vogov.com',
 			'www.nubiles.net',
diff --git a/package-lock.json b/package-lock.json
index 154ec433..67ed9967 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -89,7 +89,7 @@
                 "tunnel": "0.0.6",
                 "ua-parser-js": "^1.0.37",
                 "undici": "^5.28.1",
-                "unprint": "^0.14.1",
+                "unprint": "^0.14.3",
                 "url-pattern": "^1.0.3",
                 "v-tooltip": "^2.1.3",
                 "video.js": "^8.6.1",
@@ -18312,9 +18312,9 @@
             }
         },
         "node_modules/unprint": {
-            "version": "0.14.1",
-            "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.14.1.tgz",
-            "integrity": "sha512-LpsktR7NK3iDaYfy1HpNOiYoKGzLSq6wDhQN7RcwTQVJMz9kE0qQ8DS+ru2L76j52lq4v6oBktpnghbe//s3Mw==",
+            "version": "0.14.3",
+            "resolved": "https://registry.npmjs.org/unprint/-/unprint-0.14.3.tgz",
+            "integrity": "sha512-frhe+/Cc9YzDhPmWB9oyTRWl6PPgtr91ayQkPx0J+5O1UlRd/cIcqF8RdhZnjl6DjibYB5aCX7+kmXGsQnqXLg==",
             "dependencies": {
                 "axios": "^0.27.2",
                 "bottleneck": "^2.19.5",
diff --git a/package.json b/package.json
index 1f7fc681..37636b13 100755
--- a/package.json
+++ b/package.json
@@ -148,7 +148,7 @@
         "tunnel": "0.0.6",
         "ua-parser-js": "^1.0.37",
         "undici": "^5.28.1",
-        "unprint": "^0.14.1",
+        "unprint": "^0.14.3",
         "url-pattern": "^1.0.3",
         "v-tooltip": "^2.1.3",
         "video.js": "^8.6.1",
diff --git a/src/app.js b/src/app.js
index b4ea4532..7bd04922 100755
--- a/src/app.js
+++ b/src/app.js
@@ -36,11 +36,11 @@ unprint.options({
 		'User-Agent': 'Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/125.0.0.0 Safari/537.36',
 	},
 	limits: config.limits,
-	proxyAddress: `http://${config.proxy.host}:${config.proxy.port}`,
+	proxy: config.proxy,
 });
 
-unprint.on('requestInit', (event) => logger.debug(`Unprint ${event.method} (${event.interval}ms/${event.concurrency}p${event.proxy ? '' : ' proxied'}) ${event.url}`));
-unprint.on('requestError', (event) => logger.error(`Unprint failed ${event.proxied ? ' proxied' : ''}${event.method} ${event.url} (${event.status}): ${event.statusText}`));
+unprint.on('requestInit', (event) => logger.debug(`Unprint ${event.method} (${event.interval}ms/${event.concurrency}p${event.isProxied ? ' proxied' : ''}) ${event.url}`));
+unprint.on('requestError', (event) => logger.error(`Unprint failed ${event.isProxied ? ' proxied' : ''}${event.method} ${event.url} (${event.status}): ${event.statusText}`));
 
 function logActive() {
 	setTimeout(() => {
diff --git a/src/scrapers/analvids.js b/src/scrapers/analvids.js
index c0c70087..bb1b511d 100644
--- a/src/scrapers/analvids.js
+++ b/src/scrapers/analvids.js
@@ -91,9 +91,7 @@ function scrapeProfile({ query }, url, channel) {
 
 async function fetchLatest(channel, page) {
 	// const res = await unprint.get(`https://www.analvids.com/new-videos/${page}`, { selectAll: '.card-scene' }); // analvids as channel
-	const res = await unprint.get(`${channel.url}/latest/${page}`, {
-		selectAll: '.card-scene', // studios as channels
-	});
+	const res = await unprint.get(`${channel.url}/latest/${page}`, { selectAll: '.card-scene' }); // studios as channels
 
 	if (res.ok) {
 		return scrapeAll(res.context, channel);