From 758a5eeb01549b0a41f593dc0537714829ea83a0 Mon Sep 17 00:00:00 2001 From: qsniyg Date: Mon, 21 Aug 2023 18:16:02 +0000 Subject: [PATCH] More websites/rules (fixes #1203) --- CHANGELOG.txt | 4 ++-- src/userscript.ts | 20 +++++++++++++++++++- userscript.user.js | 19 ++++++++++++++++++- 3 files changed, 39 insertions(+), 4 deletions(-) diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 4cb96c86..8de9096b 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -2,9 +2,9 @@ Improvements: - * Various improvements/fixes to existing rules (including Instagram) + * Various improvements/fixes to existing rules (including Flickr, Instagram) -Special thanks to Flame, TheOne for their contributions and reports for this release +Special thanks to Flame, TheOne, fyhtma for their contributions and reports for this release --- diff --git a/src/userscript.ts b/src/userscript.ts index ab072d7d..f98eee25 100644 --- a/src/userscript.ts +++ b/src/userscript.ts @@ -46321,6 +46321,13 @@ var $$IMU_EXPORT$$; // https://image.underdusken.no/151158.jpg?imageId=151158&width=480&height=719 // https://image.underdusken.no/151158.jpg?width=-1&height=-1 domain === "image.underdusken.no" || + // thanks to fyhtma on github: https://github.com/qsniyg/maxurl/issues/1203 + // https://image.seiska.fi/1112138.webp?imageId=1112138&width=710&format=webp + // https://image.seiska.fi/1112138.webp?width=-1&height=-1 -- 2500x1668 + // https://image.seiska.fi/1112138.webp?width=-1&height=-1&format=jpg + // https://image.seiska.fi/834926.webp?imageId=834926&x=0.00&y=0.00&cropw=100.00&croph=100.00&width=960&height=960&format=jpg + // https://image.seiska.fi/834926.webp?width=-1&height=-1 -- 625x484 + domain === "image.seiska.fi" || // https://www.dbstatic.no/68267011.jpg?imageId=68267011&x=0&y=0&cropw=100&croph=100&width=1024&height=1539 // https://www.dbstatic.no/68267011.jpg -- 100x150 // https://www.dbstatic.no/68267011.jpg?width=-1&height=-1 -- 1664x2500 @@ -46333,7 +46340,8 @@ var $$IMU_EXPORT$$; //return src.replace(/(:\/\/[^/]*\/[0-9]+\.[^/.]*?)(?:\?.*)?$/, "$1?width=-1&height=-1"); newsrc = src .replace(/(:\/\/[^/]+\/+(?:images\/+)?[0-9]+\.[^/.?#]*)(?:[?#].*)?$/, "$1?width=-1&height=-1") - .replace(/\/(?:images)?\?(?:.*&)?imageId=([0-9]+).*/, "/?imageId=$1&height=-1"); + .replace(/\/(?:images)?\?(?:.*&)?imageId=([0-9]+).*/, "/?imageId=$1&height=-1") + .replace(/(\/[0-9]+\.webp\?width=-1&height=-1)$/, "$1&format=jpg"); if (newsrc !== src) return newsrc; } @@ -48987,6 +48995,7 @@ var $$IMU_EXPORT$$; } if ((domain_nosub === "staticflickr.com" || + domain === "static.flickr.com" || (domain_nosub === "flickr.com" && string_indexof(domain, ".static.flickr.com") >= 0)) && (src.match(/\/[0-9]+_[0-9a-f]+(?:_[a-z0-9]*)?\.[a-z]+.*$/) || /\/video\/+[0-9]+\/+[0-9a-f]+\/+/.test(src)) && options && options.do_request && options.cb) { @@ -106449,6 +106458,15 @@ var $$IMU_EXPORT$$; } } + if (domain_nowww === "absolutearts.com") { + // thanks to anonymous for reporting: + // https://www.absolutearts.com/portfolio3/l/lonvig/V_for_Venice-1058737172st.jpg + // https://www.absolutearts.com/portfolio3/l/lonvig/V_for_Venice-1058737172m.jpg -- 640x419, upscaled? + // https://www.absolutearts.com/portfolio3/l/lonvig/V_for_Venice-1058737172l.jpg -- 500x327 + // https://www.absolutearts.com/portfolio3/j/johnsojt/deject__Selected_as_Best_in_show-1687291708l.jpg - 1557x1376 + return src.replace(/(\/portfolio3\/+.\/+[^/]+\/+[^/.]+-[0-9]{5,})(?:st|mt?|lt)?\./, "$1l."); + } + diff --git a/userscript.user.js b/userscript.user.js index 6fe61a83..bd65ba9d 100644 --- a/userscript.user.js +++ b/userscript.user.js @@ -42258,6 +42258,13 @@ var $$IMU_EXPORT$$; // https://image.underdusken.no/151158.jpg?imageId=151158&width=480&height=719 // https://image.underdusken.no/151158.jpg?width=-1&height=-1 domain === "image.underdusken.no" || + // thanks to fyhtma on github: https://github.com/qsniyg/maxurl/issues/1203 + // https://image.seiska.fi/1112138.webp?imageId=1112138&width=710&format=webp + // https://image.seiska.fi/1112138.webp?width=-1&height=-1 -- 2500x1668 + // https://image.seiska.fi/1112138.webp?width=-1&height=-1&format=jpg + // https://image.seiska.fi/834926.webp?imageId=834926&x=0.00&y=0.00&cropw=100.00&croph=100.00&width=960&height=960&format=jpg + // https://image.seiska.fi/834926.webp?width=-1&height=-1 -- 625x484 + domain === "image.seiska.fi" || // https://www.dbstatic.no/68267011.jpg?imageId=68267011&x=0&y=0&cropw=100&croph=100&width=1024&height=1539 // https://www.dbstatic.no/68267011.jpg -- 100x150 // https://www.dbstatic.no/68267011.jpg?width=-1&height=-1 -- 1664x2500 @@ -42270,7 +42277,8 @@ var $$IMU_EXPORT$$; //return src.replace(/(:\/\/[^/]*\/[0-9]+\.[^/.]*?)(?:\?.*)?$/, "$1?width=-1&height=-1"); newsrc = src .replace(/(:\/\/[^/]+\/+(?:images\/+)?[0-9]+\.[^/.?#]*)(?:[?#].*)?$/, "$1?width=-1&height=-1") - .replace(/\/(?:images)?\?(?:.*&)?imageId=([0-9]+).*/, "/?imageId=$1&height=-1"); + .replace(/\/(?:images)?\?(?:.*&)?imageId=([0-9]+).*/, "/?imageId=$1&height=-1") + .replace(/(\/[0-9]+\.webp\?width=-1&height=-1)$/, "$1&format=jpg"); if (newsrc !== src) return newsrc; } @@ -44673,6 +44681,7 @@ var $$IMU_EXPORT$$; return newsrc; } if ((domain_nosub === "staticflickr.com" || + domain === "static.flickr.com" || (domain_nosub === "flickr.com" && string_indexof(domain, ".static.flickr.com") >= 0)) && (src.match(/\/[0-9]+_[0-9a-f]+(?:_[a-z0-9]*)?\.[a-z]+.*$/) || /\/video\/+[0-9]+\/+[0-9a-f]+\/+/.test(src)) && options && options.do_request && options.cb) { @@ -95459,6 +95468,14 @@ var $$IMU_EXPORT$$; return add_full_extensions(newsrc); } } + if (domain_nowww === "absolutearts.com") { + // thanks to anonymous for reporting: + // https://www.absolutearts.com/portfolio3/l/lonvig/V_for_Venice-1058737172st.jpg + // https://www.absolutearts.com/portfolio3/l/lonvig/V_for_Venice-1058737172m.jpg -- 640x419, upscaled? + // https://www.absolutearts.com/portfolio3/l/lonvig/V_for_Venice-1058737172l.jpg -- 500x327 + // https://www.absolutearts.com/portfolio3/j/johnsojt/deject__Selected_as_Best_in_show-1687291708l.jpg - 1557x1376 + return src.replace(/(\/portfolio3\/+.\/+[^/]+\/+[^/.]+-[0-9]{5,})(?:st|mt?|lt)?\./, "$1l."); + } // -- 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