From 213e4336c2b2d0ef38787fa7cede813f3f3fc38e Mon Sep 17 00:00:00 2001 From: qsniyg Date: Fri, 12 Jan 2024 18:19:13 +0000 Subject: [PATCH] More websites/rules Fixes #1256 --- src/userscript.ts | 112 +++++++++++++++++++++++++++++++++++---------- userscript.user.js | 75 ++++++++++++++++++++++++++---- 2 files changed, 153 insertions(+), 34 deletions(-) diff --git a/src/userscript.ts b/src/userscript.ts index cf90b624..1deae0fa 100644 --- a/src/userscript.ts +++ b/src/userscript.ts @@ -32565,6 +32565,9 @@ var $$IMU_EXPORT$$; // https://d1kq2dqeox7x40.cloudfront.net/images/posts/20230810_Ig2PxEY2ZEFTVlC.jpg?w=300 // https://d1kq2dqeox7x40.cloudfront.net/images/profile_images/20211214_M2CHl32roXp4kTn.png?h=48&w=48 (domain === "d1kq2dqeox7x40.cloudfront.net" && /\/images\//.test(src)) || + // thanks to anonymous for reporting: + // https://nouwcdn.com/v201/u/44/1353044/419/201908221517070611.jpg?version=202007&width=700 + domain_nowww === "nouwcdn.com" || // http://us.jimmychoo.com/dw/image/v2/AAWE_PRD/on/demandware.static/-/Sites-jch-master-product-catalog/default/dw70b1ebd2/images/rollover/LIZ100MPY_120004_MODEL.jpg?sw=245&sh=245&sm=fit // https://www.aritzia.com/on/demandware.static/-/Library-Sites-Aritzia_Shared/default/dw3a7fef87/seasonal/ss18/ss18-springsummercampaign/ss18-springsummercampaign-homepage/hptiles/tile-wilfred-lrg.jpg src.match(/\/demandware\.static\//) || @@ -32651,6 +32654,9 @@ var $$IMU_EXPORT$$; // https://mz.eastday.com/62506697.jpeg?imageView2/1/w/675/h/450 // https://mz.eastday.com/62506697.jpeg?imageslim domain === "mz.eastday.com" || + // thanks to anonymous for reporting: + // https://s.isanook.com/gu/0/pichistory/118112112007053654.jpg?ip/crop/w200/q90/webp + domain === "s.isanook.com" || // thanks to doio on github: https://github.com/qsniyg/maxurl/issues/1065 // https://att.fengimg.com/2022/10/01/180531wola29wdc80v3bq1.jpeg?imageMogr2/thumbnail/320x/format/jpg/interlace/0/quality/100 -- via https://www.feng.com/post/13618502 // https://att.fengimg.com/2022/10/01/180531wola29wdc80v3bq1.jpeg @@ -60075,28 +60081,36 @@ var $$IMU_EXPORT$$; } } - if ((domain_nosub === "pictoa.com" || - // https://s.lilitube.com/068/695/0686955565570053c59/thumbs/137493255655700ac8bd.jpg - // https://s.lilitube.com/068/695/0686955565570053c59/137493255655700ac8bd.jpg - domain_nosub === "lilitube.com" || - // http://s.heavenlynudes.net/085/279/085279556b1e0a7f645/thumbs/1620146556b1e0aa118c.jpg - // http://s.heavenlynudes.net/085/279/085279556b1e0a7f645/1620146556b1e0aa118c.jpg - domain_nosub === "heavenlynudes.net" || - // http://s.nufap.com/194/953/194953594a03e39d850/thumbs/3222369594a03e3a023b.jpg - domain_nosub === "nufap.com" || - // https://s.fapsex.com/059/968/0599685567ec1e8bc31/thumbs/14936165567ec1f278d0.jpg - domain_nosub === "fapsex.com" || - // https://s.clickmyboobs.com/074/636/07463655752c4fa8e79/thumbs/172574455752c50169ea.jpg - domain_nosub === "clickmyboobs.com" || - // http://s.papajizz.com/227/096/22709658c972619c356/thumbs/353469058c972619efaa.jpg - domain_nosub === "papajizz.com" || - // https://s.babaporn.com/180/740/180740594bf165c6cd1/thumbs/3262186594bf165da740.jpg - // https://s.babaporn.com/180/740/180740594bf165c6cd1/3262186594bf165da740.jpg - domain_nosub === "babaporn.com") - && domain.match(/^s[0-9]*\./)) { + if (domain_nosub === "pictoa.com" || + // https://s.lilitube.com/068/695/0686955565570053c59/thumbs/137493255655700ac8bd.jpg + // https://s.lilitube.com/068/695/0686955565570053c59/137493255655700ac8bd.jpg + domain_nosub === "lilitube.com" || + // http://s.heavenlynudes.net/085/279/085279556b1e0a7f645/thumbs/1620146556b1e0aa118c.jpg + // http://s.heavenlynudes.net/085/279/085279556b1e0a7f645/1620146556b1e0aa118c.jpg + domain_nosub === "heavenlynudes.net" || + // http://s.nufap.com/194/953/194953594a03e39d850/thumbs/3222369594a03e3a023b.jpg + domain_nosub === "nufap.com" || + // https://s.fapsex.com/059/968/0599685567ec1e8bc31/thumbs/14936165567ec1f278d0.jpg + domain_nosub === "fapsex.com" || + // https://s.clickmyboobs.com/074/636/07463655752c4fa8e79/thumbs/172574455752c50169ea.jpg + domain_nosub === "clickmyboobs.com" || + // http://s.papajizz.com/227/096/22709658c972619c356/thumbs/353469058c972619efaa.jpg + domain_nosub === "papajizz.com" || + // https://s.babaporn.com/180/740/180740594bf165c6cd1/thumbs/3262186594bf165da740.jpg + // https://s.babaporn.com/180/740/180740594bf165c6cd1/3262186594bf165da740.jpg + domain_nosub === "babaporn.com") { // https://s2.pictoa.com/media/galleries/058/990/058990556bf9f7d10b8/thumbs/1650366556bf9f89826e.jpg // https://s2.pictoa.com/media/galleries/058/990/058990556bf9f7d10b8/1650366556bf9f89826e.jpg - return src.replace(/(\/[0-9a-f]{3}\/+[0-9a-f]{3}\/+[0-9a-f]+\/+)thumbs\/+([^/]*)(?:[?#].*)?$/, "$1$2"); + newsrc = src.replace(/(\/[0-9a-f]{3}\/+[0-9a-f]{3}\/+[0-9a-f]+\/+)thumbs\/+([^/]*)(?:[?#].*)?$/, "$1$2"); + if (newsrc !== src) + return newsrc; + + // thanks to anonymous for reporting: + // https://t1.pictoa.com/media/galleries/169/999/16999959423e419b4e7/302506959423e419e19d.jpg + // https://s1.pictoa.com/media/galleries/169/999/16999959423e419b4e7/302506959423e419e19d.jpg + newsrc = src.replace(/^([a-z]+:\/\/)t([0-9]*\.)/, "$1s$2"); + if (newsrc !== src) + return newsrc; //return src.replace(/\/thumbs\/([0-9a-f]+\.[^/.]*)$/, "/$1"); } @@ -70685,16 +70699,22 @@ var $$IMU_EXPORT$$; if (domain_nowww === "imx.to") { newsrc = website_query({ - website_regex: /^[a-z]+:\/\/[^/]+\/+img-([0-9a-f]{5,})\.html(?:[?#].*)?$/, - query_for_id: function(id) { + website_regex: [ + /^[a-z]+:\/\/[^/]+\/+img-([0-9a-f]{5,})\.html(?:[?#].*)?$/, + /^[a-z]+:\/\/[^/]+\/+i\/+([0-9a-z]{5,})(?:[?#].*)?$/, + ], + query_for_id: function(id, match) { + let url = "https://imx.to/img-" + id + ".html"; + if (/:\/\/[^/]+\/+i\//.test(match[0])) + url = "https://imx.to/i/" + id; return { method: "POST", - url: "https://imx.to/img-" + id + ".html", + url, imu_mode: "document", headers: { "content-type": "application/x-www-form-urlencoded", origin: "https://imx.to", - Referer: "https://imx.to/img-" + id + ".html" + Referer: url }, data: "imgContinue=Continue+to+your+image..." }; @@ -108231,7 +108251,10 @@ var $$IMU_EXPORT$$; // https://i11.bunkr.ru/002-YACPEm3Q.jpg newsrc = src.replace(/\/thumbs\/+/, "/"); if (newsrc !== src) { - let newsrcs = add_extensions(newsrc); + // thanks to anonymous for reporting: + // https://i-milkshake.bunkr.ru/thumbs/2_918-I2v4dD1g.png + // https://i-milkshake.bunkr.ru/2_918-I2v4dD1g.jpeg + let newsrcs = add_full_extensions(newsrc, ["png", "jpg", "jpeg"]); let videosrc = newsrc.replace(/^[a-z]+:\/\/i([0-9]*)\.[^/]+\/+([^/]+)\.[a-z]+$/, "https://media-files$1.bunkr.la/$2.mp4"); if (videosrc !== newsrc) { let match = parse_int(videosrc.match(/:\/\/media-files([0-9]*)\./)[1]); @@ -110760,6 +110783,41 @@ var $$IMU_EXPORT$$; } } + if (domain_nowww === "masterfap.net") { + // thanks to anonymous for reporting: + // https://www.masterfap.net/profile/corinna-kopf/photos/kdj0b3xmU2/corinna-kopf-thumbnail.webp + // https://www.masterfap.net/profile/corinna-kopf/photos/kdj0b3xmU2/corinna-kopf.webp + newsrc = src.replace(/(\/photos\/+[^/]+\/+[^/]+)-thumbnail\./, "$1."); + if (newsrc) { + return { + url: newsrc, + problems: { + watermark: true + } + }; + } + } + + if (amazon_container === "iibawards-prod") { + // thanks to anonymous for reporting: + // https://iibawards-prod.s3.amazonaws.com/projects/images/000/000/838/medium.jpg + // https://iibawards-prod.s3.amazonaws.com/projects/images/000/000/838/original.jpg + return src.replace(/(\/images\/+(?:[0-9]{3}\/+){3})[a-z]+\./, "$1original."); + } + + if (domain === "shop.miniscience.com") { + // thanks to anonymous for reporting: + // https://shop.miniscience.com/images/medium/UVCLMN.jpg + // https://shop.miniscience.com/images/large/UVCLMN.jpg + return src.replace(/(\/images\/+)medium\/+/, "$1large/"); + } + + if (domain_nosub === "svdcdn.com" && /\.transforms\./.test(domain)) { + // https://best-fit.transforms.svdcdn.com/production/images/Copy-of-GN_23_T_Borchardt_file-1.jpg?w=768&q=100&auto=format&fit=crop&dm=...&s=... + // https://best-fit.files.svdcdn.com/production/images/Copy-of-GN_23_T_Borchardt_file-1.jpg + return src.replace(/(:\/\/[^/]+)\.transforms(\.svdcdn\.com\/+[^?#].*?)(?:[?#].*)?$/, "$1.files$2"); + } + @@ -111366,6 +111424,10 @@ var $$IMU_EXPORT$$; // https://media.customon.com/unsafe/600x600/img.customon.com/img/26934547/93026,14,2,0,12,173,237,28.45,0,703c4a14441fbc231fdd3e63276d2ab7/merchantimagenew/tiktok-haters-men-s-t-shirt-black.jpg // https://img.customon.com/img/26934547/93026,14,2,0,12,173,237,28.45,0,703c4a14441fbc231fdd3e63276d2ab7/merchantimagenew/tiktok-haters-men-s-t-shirt-black.jpg domain === "media.customon.com" || + // thanks to sn3akyb3ar on github: https://github.com/qsniyg/maxurl/issues/1256 + // https://images.ecestaticos.com/9cgcsvmkyC8-YZ1q-gpt7oYLlmQ=/0x326:2275x3307/1440x1920/filters:fill(white):format(jpg)/f.elconfidencial.com%2Foriginal%2F16b%2Fde7%2F19e%2F16bde719e1cdf5bf5b75916dd34b02b7.jpg + // https://f.elconfidencial.com/original/16b/de7/19e/16bde719e1cdf5bf5b75916dd34b02b7.jpg + domain === "images.ecestaticos.com" || src.match(/:\/\/[^/]*\/thumbor\/[^/]*=\//) || // https://www.orlandosentinel.com/resizer/tREpzmUU7LJX1cbkAN-unm7wL0Y=/fit-in/800x600/top/filters:fill(black)/arc-anglerfish-arc2-prod-tronc.s3.amazonaws.com/public/XC6HBG2I4VHTJGGCOYVPLBGVSM.jpg // http://arc-anglerfish-arc2-prod-tronc.s3.amazonaws.com/public/XC6HBG2I4VHTJGGCOYVPLBGVSM.jpg diff --git a/userscript.user.js b/userscript.user.js index cdcdd378..ea61cae2 100644 --- a/userscript.user.js +++ b/userscript.user.js @@ -29753,6 +29753,9 @@ var $$IMU_EXPORT$$; // https://d1kq2dqeox7x40.cloudfront.net/images/posts/20230810_Ig2PxEY2ZEFTVlC.jpg?w=300 // https://d1kq2dqeox7x40.cloudfront.net/images/profile_images/20211214_M2CHl32roXp4kTn.png?h=48&w=48 (domain === "d1kq2dqeox7x40.cloudfront.net" && /\/images\//.test(src)) || + // thanks to anonymous for reporting: + // https://nouwcdn.com/v201/u/44/1353044/419/201908221517070611.jpg?version=202007&width=700 + domain_nowww === "nouwcdn.com" || // http://us.jimmychoo.com/dw/image/v2/AAWE_PRD/on/demandware.static/-/Sites-jch-master-product-catalog/default/dw70b1ebd2/images/rollover/LIZ100MPY_120004_MODEL.jpg?sw=245&sh=245&sm=fit // https://www.aritzia.com/on/demandware.static/-/Library-Sites-Aritzia_Shared/default/dw3a7fef87/seasonal/ss18/ss18-springsummercampaign/ss18-springsummercampaign-homepage/hptiles/tile-wilfred-lrg.jpg src.match(/\/demandware\.static\//) || @@ -29838,6 +29841,9 @@ var $$IMU_EXPORT$$; // https://mz.eastday.com/62506697.jpeg?imageView2/1/w/675/h/450 // https://mz.eastday.com/62506697.jpeg?imageslim domain === "mz.eastday.com" || + // thanks to anonymous for reporting: + // https://s.isanook.com/gu/0/pichistory/118112112007053654.jpg?ip/crop/w200/q90/webp + domain === "s.isanook.com" || // thanks to doio on github: https://github.com/qsniyg/maxurl/issues/1065 // https://att.fengimg.com/2022/10/01/180531wola29wdc80v3bq1.jpeg?imageMogr2/thumbnail/320x/format/jpg/interlace/0/quality/100 -- via https://www.feng.com/post/13618502 // https://att.fengimg.com/2022/10/01/180531wola29wdc80v3bq1.jpeg @@ -54537,7 +54543,7 @@ var $$IMU_EXPORT$$; }); } } - if ((domain_nosub === "pictoa.com" || + if (domain_nosub === "pictoa.com" || // https://s.lilitube.com/068/695/0686955565570053c59/thumbs/137493255655700ac8bd.jpg // https://s.lilitube.com/068/695/0686955565570053c59/137493255655700ac8bd.jpg domain_nosub === "lilitube.com" || @@ -54554,11 +54560,18 @@ var $$IMU_EXPORT$$; domain_nosub === "papajizz.com" || // https://s.babaporn.com/180/740/180740594bf165c6cd1/thumbs/3262186594bf165da740.jpg // https://s.babaporn.com/180/740/180740594bf165c6cd1/3262186594bf165da740.jpg - domain_nosub === "babaporn.com") - && domain.match(/^s[0-9]*\./)) { + domain_nosub === "babaporn.com") { // https://s2.pictoa.com/media/galleries/058/990/058990556bf9f7d10b8/thumbs/1650366556bf9f89826e.jpg // https://s2.pictoa.com/media/galleries/058/990/058990556bf9f7d10b8/1650366556bf9f89826e.jpg - return src.replace(/(\/[0-9a-f]{3}\/+[0-9a-f]{3}\/+[0-9a-f]+\/+)thumbs\/+([^/]*)(?:[?#].*)?$/, "$1$2"); + newsrc = src.replace(/(\/[0-9a-f]{3}\/+[0-9a-f]{3}\/+[0-9a-f]+\/+)thumbs\/+([^/]*)(?:[?#].*)?$/, "$1$2"); + if (newsrc !== src) + return newsrc; + // thanks to anonymous for reporting: + // https://t1.pictoa.com/media/galleries/169/999/16999959423e419b4e7/302506959423e419e19d.jpg + // https://s1.pictoa.com/media/galleries/169/999/16999959423e419b4e7/302506959423e419e19d.jpg + newsrc = src.replace(/^([a-z]+:\/\/)t([0-9]*\.)/, "$1s$2"); + if (newsrc !== src) + return newsrc; //return src.replace(/\/thumbs\/([0-9a-f]+\.[^/.]*)$/, "/$1"); } if (domain_nosub === "bbend.net" || @@ -63998,16 +64011,22 @@ var $$IMU_EXPORT$$; } if (domain_nowww === "imx.to") { newsrc = website_query({ - website_regex: /^[a-z]+:\/\/[^/]+\/+img-([0-9a-f]{5,})\.html(?:[?#].*)?$/, - query_for_id: function(id) { + website_regex: [ + /^[a-z]+:\/\/[^/]+\/+img-([0-9a-f]{5,})\.html(?:[?#].*)?$/, + /^[a-z]+:\/\/[^/]+\/+i\/+([0-9a-z]{5,})(?:[?#].*)?$/, + ], + query_for_id: function(id, match) { + var url = "https://imx.to/img-" + id + ".html"; + if (/:\/\/[^/]+\/+i\//.test(match[0])) + url = "https://imx.to/i/" + id; return { method: "POST", - url: "https://imx.to/img-" + id + ".html", + url: url, imu_mode: "document", headers: { "content-type": "application/x-www-form-urlencoded", origin: "https://imx.to", - Referer: "https://imx.to/img-" + id + ".html" + Referer: url }, data: "imgContinue=Continue+to+your+image..." }; @@ -97140,7 +97159,10 @@ var $$IMU_EXPORT$$; // https://i11.bunkr.ru/002-YACPEm3Q.jpg newsrc = src.replace(/\/thumbs\/+/, "/"); if (newsrc !== src) { - var newsrcs = add_extensions(newsrc); + // thanks to anonymous for reporting: + // https://i-milkshake.bunkr.ru/thumbs/2_918-I2v4dD1g.png + // https://i-milkshake.bunkr.ru/2_918-I2v4dD1g.jpeg + var newsrcs = add_full_extensions(newsrc, ["png", "jpg", "jpeg"]); var videosrc = newsrc.replace(/^[a-z]+:\/\/i([0-9]*)\.[^/]+\/+([^/]+)\.[a-z]+$/, "https://media-files$1.bunkr.la/$2.mp4"); if (videosrc !== newsrc) { var match_7 = parse_int(videosrc.match(/:\/\/media-files([0-9]*)\./)[1]); @@ -99398,6 +99420,37 @@ var $$IMU_EXPORT$$; return urls_3; } } + if (domain_nowww === "masterfap.net") { + // thanks to anonymous for reporting: + // https://www.masterfap.net/profile/corinna-kopf/photos/kdj0b3xmU2/corinna-kopf-thumbnail.webp + // https://www.masterfap.net/profile/corinna-kopf/photos/kdj0b3xmU2/corinna-kopf.webp + newsrc = src.replace(/(\/photos\/+[^/]+\/+[^/]+)-thumbnail\./, "$1."); + if (newsrc) { + return { + url: newsrc, + problems: { + watermark: true + } + }; + } + } + if (amazon_container === "iibawards-prod") { + // thanks to anonymous for reporting: + // https://iibawards-prod.s3.amazonaws.com/projects/images/000/000/838/medium.jpg + // https://iibawards-prod.s3.amazonaws.com/projects/images/000/000/838/original.jpg + return src.replace(/(\/images\/+(?:[0-9]{3}\/+){3})[a-z]+\./, "$1original."); + } + if (domain === "shop.miniscience.com") { + // thanks to anonymous for reporting: + // https://shop.miniscience.com/images/medium/UVCLMN.jpg + // https://shop.miniscience.com/images/large/UVCLMN.jpg + return src.replace(/(\/images\/+)medium\/+/, "$1large/"); + } + if (domain_nosub === "svdcdn.com" && /\.transforms\./.test(domain)) { + // https://best-fit.transforms.svdcdn.com/production/images/Copy-of-GN_23_T_Borchardt_file-1.jpg?w=768&q=100&auto=format&fit=crop&dm=...&s=... + // https://best-fit.files.svdcdn.com/production/images/Copy-of-GN_23_T_Borchardt_file-1.jpg + return src.replace(/(:\/\/[^/]+)\.transforms(\.svdcdn\.com\/+[^?#].*?)(?:[?#].*)?$/, "$1.files$2"); + } // -- 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 @@ -99808,6 +99861,10 @@ var $$IMU_EXPORT$$; // https://media.customon.com/unsafe/600x600/img.customon.com/img/26934547/93026,14,2,0,12,173,237,28.45,0,703c4a14441fbc231fdd3e63276d2ab7/merchantimagenew/tiktok-haters-men-s-t-shirt-black.jpg // https://img.customon.com/img/26934547/93026,14,2,0,12,173,237,28.45,0,703c4a14441fbc231fdd3e63276d2ab7/merchantimagenew/tiktok-haters-men-s-t-shirt-black.jpg domain === "media.customon.com" || + // thanks to sn3akyb3ar on github: https://github.com/qsniyg/maxurl/issues/1256 + // https://images.ecestaticos.com/9cgcsvmkyC8-YZ1q-gpt7oYLlmQ=/0x326:2275x3307/1440x1920/filters:fill(white):format(jpg)/f.elconfidencial.com%2Foriginal%2F16b%2Fde7%2F19e%2F16bde719e1cdf5bf5b75916dd34b02b7.jpg + // https://f.elconfidencial.com/original/16b/de7/19e/16bde719e1cdf5bf5b75916dd34b02b7.jpg + domain === "images.ecestaticos.com" || src.match(/:\/\/[^/]*\/thumbor\/[^/]*=\//) || // https://www.orlandosentinel.com/resizer/tREpzmUU7LJX1cbkAN-unm7wL0Y=/fit-in/800x600/top/filters:fill(black)/arc-anglerfish-arc2-prod-tronc.s3.amazonaws.com/public/XC6HBG2I4VHTJGGCOYVPLBGVSM.jpg // http://arc-anglerfish-arc2-prod-tronc.s3.amazonaws.com/public/XC6HBG2I4VHTJGGCOYVPLBGVSM.jpg