diff --git a/src/userscript.ts b/src/userscript.ts index 4d35eaf9..7f579f64 100644 --- a/src/userscript.ts +++ b/src/userscript.ts @@ -35266,8 +35266,12 @@ var $$IMU_EXPORT$$; } // https://www.thetrace.org/wp-content/uploads/2017/04/Cleveland_Gun_Survivors_065-5394x0-c-default.jpg - if (string_indexof(src, "/wp-content/uploads/") >= 0 || + if ((domain_nowww === "djavan.com.br" && /\/content\/+uploads\//.test(src)) || + string_indexof(src, "/wp-content/uploads/") >= 0 || string_indexof(src, "/wp/uploads/") >= 0) { + // thanks to anonymous for reporting: + // https://djavan.com.br/content/uploads/2018/11/djavan_5367024877_o-300x0-c-default.jpg + // https://djavan.com.br/content/uploads/2018/11/djavan_5367024877_o.jpg src = src.replace(/-[0-9]+x[0-9]+-c-default(\.[^/.]*)$/, "$1"); } @@ -42272,7 +42276,10 @@ var $$IMU_EXPORT$$; domain_nowww === "shisharc.com") { // https://2ch.hk/mov/arch/2018-01-11/thumb/1715093/15144001211300s.jpg // https://2ch.hk/mov/arch/2018-01-11/src/1715093/15144001211300.jpg - return add_extensions(src.replace(/\/thumb\/([0-9]+\/[0-9]+)s(\.[^/.]*)$/, "/src/$1$2")); + // thanks to anonymous for reporting: + // https://2ch.hk/b/thumb/310946465/17275023228290s.jpg + // https://2ch.hk/b/src/310946465/17275023228290.webp + return add_full_extensions(src.replace(/\/thumb\/([0-9]+\/[0-9]+)s(\.[^/.]*)$/, "/src/$1$2"), ["mp4", "webm", "png", "jpg", "jpeg"]); } if (domain_nowww === "m2ch.hk") { @@ -63627,6 +63634,7 @@ var $$IMU_EXPORT$$; // http://www.camshooker.com/contents/videos_screenshots/188000/188740/180x135/1.jpg domain_nosub === "camshooker.com" || domain_nosub === "cambro.tv" || + domain_nosub === "cambro.io" || domain_nosub === "camseek.tv" || // http://www.camvideos.tv/contents/videos_screenshots/94000/94538/180x135/1.jpg domain_nowww === "camvideos.tv" || @@ -63775,6 +63783,8 @@ var $$IMU_EXPORT$$; domain_nowww === "thisvid.com" || domain_nowww === "amateur8.com" || domain_nowww === "fpo.xxx" || + domain_nowww === "masturbationgirl.com" || + domain_nowww === "xhomealone.com" || // different system // https://static2.tubepornclassic.com/contents/videos_screenshots/1051000/1051741/240x180/1.jpg //domain_nosub === "tubepornclassic.com" || @@ -63795,7 +63805,7 @@ var $$IMU_EXPORT$$; // https://www.tube-bunny.com/kt_player/skin/img/play_white.png // https://cartoon-sex.tv/images/title_icon.png if (/\/(?:kt_)?player\/+skin\/+img\//.test(src) || - /\/images\/+title_icon\./.test(src)) + /\/images\/+(?:title_icon|blank)\.[A-Za-z]+(?:[?#].*)?$/.test(src)) return { url: src, bad: "mask" @@ -63835,7 +63845,9 @@ var $$IMU_EXPORT$$; match = src.match(/^[a-z]+:\/\/[^/]+\/+([^/.]{20,})\.html(?:[?#].*)?$/); } else if (domain_nosub === "cartoon-sex.tv") { match = src.match(/^[a-z]+:\/\/[^/]+\/+video\/+([^/.]+)\.html(?:[?#].*)?$/); - } else if (domain_nosub === "alotporn.com" || domain_nosub === "xcafe.com") { + } else if (domain_nosub === "alotporn.com" || + domain_nosub === "xcafe.com" || + domain_nosub === "cambro.io") { match = src.match(/^[a-z]+:\/\/[^/]+\/+([0-9]+)\/+(?:[^/]+\/*)?(?:[?#].*)?$/); } } @@ -63869,6 +63881,7 @@ var $$IMU_EXPORT$$; domain_nosub === "pornstarsadvice.com" || domain_nosub === "fetishburg.com" || domain_nosub === "camhub.cc" || + domain_nosub === "camhub.world" || domain_nosub === "mytradevideo.com" || domain_nosub === "japan-whores.com" || domain_nosub === "camshooker.com" || @@ -64006,7 +64019,8 @@ var $$IMU_EXPORT$$; } else if (domain_nosub === "anysex.com") { videos_component = ""; a_component = ""; - } else if (domain_nosub === "cambro.tv") { + } else if (domain_nosub === "cambro.tv" || + domain_nosub === "cambro.io") { videos_component = ""; } else if (domain_nosub === "camvideos.tv") { videos_component = ""; @@ -91742,7 +91756,7 @@ var $$IMU_EXPORT$$; return cb(token); api_query(cache_key, { - url: "https://api." + site + ".com/v2/auth/temporary", + url: "https://api." + site + ".com/v2/auth/temporary?session_id=" + get_random_text(18, true), method: "GET", headers: { Origin: "https://www." + site + ".com", @@ -91773,15 +91787,20 @@ var $$IMU_EXPORT$$; let pagelink = "https://www." + site + ".com/watch/" + id_lower; api_query(cache_key, { - url: "https://api." + site + ".com/v2/gifs/" + id_lower, + url: "https://api." + site + ".com/v2/gifs/" + id_lower + "?views=yes&users=yes&niches=yes", method: "GET", + imu_mode: "xhr", headers: { Origin: "https://www." + site + ".com", Referer: "https://www." + site + ".com", "Authorization": "Bearer " + token, - "Content-Type": "application/json", - "Accept": "application/json", - "x-customheader": pagelink + //"Content-Type": "application/json", + "Accept": "application/json, text/plain, */*", + //"Pragma": "no-cache", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-site" + //"x-customheader": pagelink }, json: true }, cb, function(done, json, cache_key) { @@ -110749,7 +110768,12 @@ var $$IMU_EXPORT$$; // thanks to roi: // https://www.leparisien.fr/resizer/9hAi8XJfgKznLUHslXM6XFHRJwQ=/arc-anglerfish-eu-central-1-prod-leparisien/public/INPJCBLRFBB47L3KDPDDIFLRNQ.jpg // https://cloudfront-eu-central-1.images.arcpublishing.com/leparisien/INPJCBLRFBB47L3KDPDDIFLRNQ.jpg - return src.replace(/^[a-z]+:\/\/[^/]+\/+resizer\/+[^/]+=\/+arc-anglerfish-([^/]+)-prod-([^/]+)\/+public\/+/, "https://cloudfront-$1.images.arcpublishing.com/$2/"); + // thanks to anonymous for reporting: + // https://www.leparisien.fr/resizer/sDkSebGhfs2bRpSIfh4dt2McTdQ=/932x582/cloudfront-eu-central-1.images.arcpublishing.com/leparisien/RZYJLHQX2NDXZAQRBG3AC45VRY.jpg + // https://cloudfront-eu-central-1.images.arcpublishing.com/leparisien/RZYJLHQX2NDXZAQRBG3AC45VRY.jpg + return src + .replace(/^[a-z]+:\/\/[^/]+\/+resizer\/+[^/]+=\/+(?:.*?\/)?(cloudfront-[^/]+\.images\.arcpublishing\.com\/.*)/, "https://$1") + .replace(/^[a-z]+:\/\/[^/]+\/+resizer\/+[^/]+=\/+arc-anglerfish-([^/]+)-prod-([^/]+)\/+public\/+/, "https://cloudfront-$1.images.arcpublishing.com/$2/"); } if (domain_nosub === "arcpublishing.com" && /\.cdn\./.test(domain)) { @@ -116717,6 +116741,30 @@ var $$IMU_EXPORT$$; return src.replace(/(\/[0-9]+)_300_s(\.[0-9]+\.[a-z]+)(?:[?#].*)?$/, "$1_1350_s$2"); } + if (domain_nowww === "brookenipar.com") { + // thanks to anonymous for reporting: + // https://brookenipar.com/media/pages/index/kyra-sedgwick/d7d9e9d7a4-1626404415/210303-people-kyra-0421-v1-1000x.jpg + // https://brookenipar.com/media/pages/index/kyra-sedgwick/d7d9e9d7a4-1626404415/210303-people-kyra-0421-v1-3000x.jpg -- 1580x2370 + // https://brookenipar.com/media/pages/home/ba5d101b60-1682398026/2304011-yara-b0201-2000x.jpg + // https://brookenipar.com/media/pages/home/ba5d101b60-1682398026/2304011-yara-b0201-3000x.jpg + // https://brookenipar.com/media/pages/home/d4f36e8f7c-1684354875/080222-florence-triplebounce-2163-copy-1500x.jpg + // https://brookenipar.com/media/pages/home/d4f36e8f7c-1684354875/080222-florence-triplebounce-2163-copy-3000x.jpg + // https://brookenipar.com/media/pages/index/christen-2/aaa0a1e06e-1682402184/christen-02-0278-portra400-400x.jpg + // https://brookenipar.com/media/pages/index/christen-2/aaa0a1e06e-1682402184/christen-02-0278-portra400-3000x.jpg + return src + .replace(/(\/media\/+pages\/+.*-)2000x(\.[a-z]+)(?:[?#].*)?$/, "$13000x$2") + .replace(/(\/media\/+pages\/+.*-)1500x(\.[a-z]+)(?:[?#].*)?$/, "$12000x$2") + .replace(/(\/media\/+pages\/+.*-)1000x(\.[a-z]+)(?:[?#].*)?$/, "$11500x$2") + .replace(/(\/media\/+pages\/+.*-)[1-9]00x(\.[a-z]+)(?:[?#].*)?$/, "$11000x$2"); + } + + if (domain_nowww === "publicdomainpictures.net") { + // thanks to anonymous for reporting: + // https://publicdomainpictures.net/pictures/370000/t2/travel-paris-france-poster-1596965769Q8C.jpg + // https://publicdomainpictures.net/pictures/370000/velka/travel-paris-france-poster-1596965769Q8C.jpg + return src.replace(/(\/pictures\/+[0-9]+\/+)t2?\/+/, "$1velka/"); + } + diff --git a/userscript.user.js b/userscript.user.js index 51d3115a..3cf22c3a 100644 --- a/userscript.user.js +++ b/userscript.user.js @@ -32390,8 +32390,12 @@ var $$IMU_EXPORT$$; src = src.replace(/__[0-9]{2,}(\.[^/.]*)$/, "$1"); } // https://www.thetrace.org/wp-content/uploads/2017/04/Cleveland_Gun_Survivors_065-5394x0-c-default.jpg - if (string_indexof(src, "/wp-content/uploads/") >= 0 || + if ((domain_nowww === "djavan.com.br" && /\/content\/+uploads\//.test(src)) || + string_indexof(src, "/wp-content/uploads/") >= 0 || string_indexof(src, "/wp/uploads/") >= 0) { + // thanks to anonymous for reporting: + // https://djavan.com.br/content/uploads/2018/11/djavan_5367024877_o-300x0-c-default.jpg + // https://djavan.com.br/content/uploads/2018/11/djavan_5367024877_o.jpg src = src.replace(/-[0-9]+x[0-9]+-c-default(\.[^/.]*)$/, "$1"); } /*if (false && (domain === "storage.journaldemontreal.com" || @@ -38726,7 +38730,10 @@ var $$IMU_EXPORT$$; domain_nowww === "shisharc.com") { // https://2ch.hk/mov/arch/2018-01-11/thumb/1715093/15144001211300s.jpg // https://2ch.hk/mov/arch/2018-01-11/src/1715093/15144001211300.jpg - return add_extensions(src.replace(/\/thumb\/([0-9]+\/[0-9]+)s(\.[^/.]*)$/, "/src/$1$2")); + // thanks to anonymous for reporting: + // https://2ch.hk/b/thumb/310946465/17275023228290s.jpg + // https://2ch.hk/b/src/310946465/17275023228290.webp + return add_full_extensions(src.replace(/\/thumb\/([0-9]+\/[0-9]+)s(\.[^/.]*)$/, "/src/$1$2"), ["mp4", "webm", "png", "jpg", "jpeg"]); } if (domain_nowww === "m2ch.hk") { // https://m2ch.hk/cg/big/thumb/1252393/15246051789290s.jpg @@ -57876,6 +57883,7 @@ var $$IMU_EXPORT$$; // http://www.camshooker.com/contents/videos_screenshots/188000/188740/180x135/1.jpg domain_nosub === "camshooker.com" || domain_nosub === "cambro.tv" || + domain_nosub === "cambro.io" || domain_nosub === "camseek.tv" || // http://www.camvideos.tv/contents/videos_screenshots/94000/94538/180x135/1.jpg domain_nowww === "camvideos.tv" || @@ -58024,6 +58032,8 @@ var $$IMU_EXPORT$$; domain_nowww === "thisvid.com" || domain_nowww === "amateur8.com" || domain_nowww === "fpo.xxx" || + domain_nowww === "masturbationgirl.com" || + domain_nowww === "xhomealone.com" || // different system // https://static2.tubepornclassic.com/contents/videos_screenshots/1051000/1051741/240x180/1.jpg //domain_nosub === "tubepornclassic.com" || @@ -58044,7 +58054,7 @@ var $$IMU_EXPORT$$; // https://www.tube-bunny.com/kt_player/skin/img/play_white.png // https://cartoon-sex.tv/images/title_icon.png if (/\/(?:kt_)?player\/+skin\/+img\//.test(src) || - /\/images\/+title_icon\./.test(src)) + /\/images\/+(?:title_icon|blank)\.[A-Za-z]+(?:[?#].*)?$/.test(src)) return { url: src, bad: "mask" @@ -58081,7 +58091,9 @@ var $$IMU_EXPORT$$; match = src.match(/^[a-z]+:\/\/[^/]+\/+([^/.]{20,})\.html(?:[?#].*)?$/); } else if (domain_nosub === "cartoon-sex.tv") { match = src.match(/^[a-z]+:\/\/[^/]+\/+video\/+([^/.]+)\.html(?:[?#].*)?$/); - } else if (domain_nosub === "alotporn.com" || domain_nosub === "xcafe.com") { + } else if (domain_nosub === "alotporn.com" || + domain_nosub === "xcafe.com" || + domain_nosub === "cambro.io") { match = src.match(/^[a-z]+:\/\/[^/]+\/+([0-9]+)\/+(?:[^/]+\/*)?(?:[?#].*)?$/); } } @@ -58113,6 +58125,7 @@ var $$IMU_EXPORT$$; domain_nosub === "pornstarsadvice.com" || domain_nosub === "fetishburg.com" || domain_nosub === "camhub.cc" || + domain_nosub === "camhub.world" || domain_nosub === "mytradevideo.com" || domain_nosub === "japan-whores.com" || domain_nosub === "camshooker.com" || @@ -58250,7 +58263,8 @@ var $$IMU_EXPORT$$; } else if (domain_nosub === "anysex.com") { videos_component = ""; a_component = ""; - } else if (domain_nosub === "cambro.tv") { + } else if (domain_nosub === "cambro.tv" || + domain_nosub === "cambro.io") { videos_component = ""; } else if (domain_nosub === "camvideos.tv") { videos_component = ""; @@ -82663,7 +82677,7 @@ var $$IMU_EXPORT$$; if (token) return cb(token); api_query(cache_key, { - url: "https://api." + site + ".com/v2/auth/temporary", + url: "https://api." + site + ".com/v2/auth/temporary?session_id=" + get_random_text(18, true), method: "GET", headers: { Origin: "https://www." + site + ".com", @@ -82690,15 +82704,20 @@ var $$IMU_EXPORT$$; var id_lower = id.toLowerCase(); // API is now case-sensitive var pagelink = "https://www." + site + ".com/watch/" + id_lower; api_query(cache_key, { - url: "https://api." + site + ".com/v2/gifs/" + id_lower, + url: "https://api." + site + ".com/v2/gifs/" + id_lower + "?views=yes&users=yes&niches=yes", method: "GET", + imu_mode: "xhr", headers: { Origin: "https://www." + site + ".com", Referer: "https://www." + site + ".com", "Authorization": "Bearer " + token, - "Content-Type": "application/json", - "Accept": "application/json", - "x-customheader": pagelink + //"Content-Type": "application/json", + "Accept": "application/json, text/plain, */*", + //"Pragma": "no-cache", + "Sec-Fetch-Dest": "empty", + "Sec-Fetch-Mode": "cors", + "Sec-Fetch-Site": "same-site" + //"x-customheader": pagelink }, json: true }, cb, function(done, json, cache_key) { @@ -99574,7 +99593,12 @@ var $$IMU_EXPORT$$; // thanks to roi: // https://www.leparisien.fr/resizer/9hAi8XJfgKznLUHslXM6XFHRJwQ=/arc-anglerfish-eu-central-1-prod-leparisien/public/INPJCBLRFBB47L3KDPDDIFLRNQ.jpg // https://cloudfront-eu-central-1.images.arcpublishing.com/leparisien/INPJCBLRFBB47L3KDPDDIFLRNQ.jpg - return src.replace(/^[a-z]+:\/\/[^/]+\/+resizer\/+[^/]+=\/+arc-anglerfish-([^/]+)-prod-([^/]+)\/+public\/+/, "https://cloudfront-$1.images.arcpublishing.com/$2/"); + // thanks to anonymous for reporting: + // https://www.leparisien.fr/resizer/sDkSebGhfs2bRpSIfh4dt2McTdQ=/932x582/cloudfront-eu-central-1.images.arcpublishing.com/leparisien/RZYJLHQX2NDXZAQRBG3AC45VRY.jpg + // https://cloudfront-eu-central-1.images.arcpublishing.com/leparisien/RZYJLHQX2NDXZAQRBG3AC45VRY.jpg + return src + .replace(/^[a-z]+:\/\/[^/]+\/+resizer\/+[^/]+=\/+(?:.*?\/)?(cloudfront-[^/]+\.images\.arcpublishing\.com\/.*)/, "https://$1") + .replace(/^[a-z]+:\/\/[^/]+\/+resizer\/+[^/]+=\/+arc-anglerfish-([^/]+)-prod-([^/]+)\/+public\/+/, "https://cloudfront-$1.images.arcpublishing.com/$2/"); } if (domain_nosub === "arcpublishing.com" && /\.cdn\./.test(domain)) { // thanks to roi: @@ -104888,6 +104912,28 @@ var $$IMU_EXPORT$$; // https://c.fotka.com/a.fotka.pl/140/932/140932490_1350_s.1726826522.jpg return src.replace(/(\/[0-9]+)_300_s(\.[0-9]+\.[a-z]+)(?:[?#].*)?$/, "$1_1350_s$2"); } + if (domain_nowww === "brookenipar.com") { + // thanks to anonymous for reporting: + // https://brookenipar.com/media/pages/index/kyra-sedgwick/d7d9e9d7a4-1626404415/210303-people-kyra-0421-v1-1000x.jpg + // https://brookenipar.com/media/pages/index/kyra-sedgwick/d7d9e9d7a4-1626404415/210303-people-kyra-0421-v1-3000x.jpg -- 1580x2370 + // https://brookenipar.com/media/pages/home/ba5d101b60-1682398026/2304011-yara-b0201-2000x.jpg + // https://brookenipar.com/media/pages/home/ba5d101b60-1682398026/2304011-yara-b0201-3000x.jpg + // https://brookenipar.com/media/pages/home/d4f36e8f7c-1684354875/080222-florence-triplebounce-2163-copy-1500x.jpg + // https://brookenipar.com/media/pages/home/d4f36e8f7c-1684354875/080222-florence-triplebounce-2163-copy-3000x.jpg + // https://brookenipar.com/media/pages/index/christen-2/aaa0a1e06e-1682402184/christen-02-0278-portra400-400x.jpg + // https://brookenipar.com/media/pages/index/christen-2/aaa0a1e06e-1682402184/christen-02-0278-portra400-3000x.jpg + return src + .replace(/(\/media\/+pages\/+.*-)2000x(\.[a-z]+)(?:[?#].*)?$/, "$13000x$2") + .replace(/(\/media\/+pages\/+.*-)1500x(\.[a-z]+)(?:[?#].*)?$/, "$12000x$2") + .replace(/(\/media\/+pages\/+.*-)1000x(\.[a-z]+)(?:[?#].*)?$/, "$11500x$2") + .replace(/(\/media\/+pages\/+.*-)[1-9]00x(\.[a-z]+)(?:[?#].*)?$/, "$11000x$2"); + } + if (domain_nowww === "publicdomainpictures.net") { + // thanks to anonymous for reporting: + // https://publicdomainpictures.net/pictures/370000/t2/travel-paris-france-poster-1596965769Q8C.jpg + // https://publicdomainpictures.net/pictures/370000/velka/travel-paris-france-poster-1596965769Q8C.jpg + return src.replace(/(\/pictures\/+[0-9]+\/+)t2?\/+/, "$1velka/"); + } // -- general rules -- if (src.match(/\/ImageGen\.ashx\?/)) { // http://www.lookalikes.info/umbraco/ImageGen.ashx?image=/media/97522/nick%20hewer%20-%20mark%20brown.jpeg&width=250&constrain=true