diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 83bb2e30..2183577b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -4,7 +4,7 @@ Improvements: * Various improvements/fixes to existing rules (including Discord) -Special thanks to roi, rEnr3n, beeznutsonly, f2005, Froktime for their contributions and reports for this release +Special thanks to roi, rEnr3n, beeznutsonly, f2005, Froktime, neckothy, nimbuz, fireattack for their contributions and reports for this release --- diff --git a/src/userscript.ts b/src/userscript.ts index 588550c7..d20ba7ab 100644 --- a/src/userscript.ts +++ b/src/userscript.ts @@ -70124,10 +70124,13 @@ var $$IMU_EXPORT$$; // https://www.gala.de/resource/blob/22036708/662fce616873c97e64415a69eeaa7604/a91z4760-20190331121737047-data.jpg // https://image.gala.de/21968034/large1x1-300-300/9eaf47021176b4bb141998386e94146f/yV/nelly-furtado-teaser.jpg // https://www.gala.de/resource/blob/21968034/9eaf47021176b4bb141998386e94146f/nelly-furtado-teaser-data.jpg + // thanks to anonymous for reporting: + // https://image.gala.de/22036884/t/-u/v4/w2048/r0.6667/-/goldene-kamera-katie-melua.jpg -- upscaled + // https://www.gala.de/resource/blob/22036884/-/goldene-kamera-katie-melua-data.jpg -- 1365x2048 return src .replace(/(:\/\/[^/]*\/v[0-9]*\/cms\/[^/]*\/[^/]*_[0-9]+-)[a-z]+[-_][^/]*(\.[^/.]*)$/, "$1original-lightbox$2") - .replace(/:\/\/[^/]*\/+([0-9]+)\/+(?:[a-z]+)?(?:uncropped|[0-9]+x[0-9]+)-[0-9]+-[0-9]+\/([0-9a-f]{20,})\/+[^/]*\/+([^/]*)(\.[^/.]*)(?:[?#].*)?$/, - "://www.gala.de/resource/blob/$1/$2/$3-data$4"); + .replace(/:\/\/[^/]*\/+([0-9]+)\/+(?:[a-z]+)?(?:uncropped|[0-9]+x[0-9]+)-[0-9]+-[0-9]+\/([0-9a-f]{20,})\/+[^/]*\/+([^/]*)(\.[^/.]*)(?:[?#].*)?$/, "://www.gala.de/resource/blob/$1/$2/$3-data$4") + .replace(/:\/\/[^/]+\/+([0-9]+)\/+.*?\/+([0-9a-f]{10,}|-)\/+([^/.?#]+)(\.[^/]+)(?:[?#].*)?$/, "://www.gala.de/resource/blob/$1/$2/$3-data$4"); } if (domain_nosub === "fashionwelike.com" && @@ -112335,6 +112338,18 @@ var $$IMU_EXPORT$$; } } + if (domain === "resource.lap.recochoku.jp") { + // thanks to fireattack on discord for reporting: + // https://recochoku.jp/artist/2000240013 + // https://resource.lap.recochoku.jp/rc-p1/front/common/b.png + if (/\/front\/+common\/+b\.png(?:[?#].*)?$/.test(src)) { + return { + url: src, + bad: "mask" + }; + } + } + diff --git a/userscript.user.js b/userscript.user.js index d888a3ef..6521303e 100644 --- a/userscript.user.js +++ b/userscript.user.js @@ -63535,9 +63535,13 @@ var $$IMU_EXPORT$$; // https://www.gala.de/resource/blob/22036708/662fce616873c97e64415a69eeaa7604/a91z4760-20190331121737047-data.jpg // https://image.gala.de/21968034/large1x1-300-300/9eaf47021176b4bb141998386e94146f/yV/nelly-furtado-teaser.jpg // https://www.gala.de/resource/blob/21968034/9eaf47021176b4bb141998386e94146f/nelly-furtado-teaser-data.jpg + // thanks to anonymous for reporting: + // https://image.gala.de/22036884/t/-u/v4/w2048/r0.6667/-/goldene-kamera-katie-melua.jpg -- upscaled + // https://www.gala.de/resource/blob/22036884/-/goldene-kamera-katie-melua-data.jpg -- 1365x2048 return src .replace(/(:\/\/[^/]*\/v[0-9]*\/cms\/[^/]*\/[^/]*_[0-9]+-)[a-z]+[-_][^/]*(\.[^/.]*)$/, "$1original-lightbox$2") - .replace(/:\/\/[^/]*\/+([0-9]+)\/+(?:[a-z]+)?(?:uncropped|[0-9]+x[0-9]+)-[0-9]+-[0-9]+\/([0-9a-f]{20,})\/+[^/]*\/+([^/]*)(\.[^/.]*)(?:[?#].*)?$/, "://www.gala.de/resource/blob/$1/$2/$3-data$4"); + .replace(/:\/\/[^/]*\/+([0-9]+)\/+(?:[a-z]+)?(?:uncropped|[0-9]+x[0-9]+)-[0-9]+-[0-9]+\/([0-9a-f]{20,})\/+[^/]*\/+([^/]*)(\.[^/.]*)(?:[?#].*)?$/, "://www.gala.de/resource/blob/$1/$2/$3-data$4") + .replace(/:\/\/[^/]+\/+([0-9]+)\/+.*?\/+([0-9a-f]{10,}|-)\/+([^/.?#]+)(\.[^/]+)(?:[?#].*)?$/, "://www.gala.de/resource/blob/$1/$2/$3-data$4"); } if (domain_nosub === "fashionwelike.com" && domain.match(/^static[0-9]*\./)) { @@ -100832,6 +100836,17 @@ var $$IMU_EXPORT$$; return newsrc.replace(/([?&]max_height=)[0-9]+/, "$12160"); } } + if (domain === "resource.lap.recochoku.jp") { + // thanks to fireattack on discord for reporting: + // https://recochoku.jp/artist/2000240013 + // https://resource.lap.recochoku.jp/rc-p1/front/common/b.png + if (/\/front\/+common\/+b\.png(?:[?#].*)?$/.test(src)) { + return { + url: src, + bad: "mask" + }; + } + } // -- 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