diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 09bc7814..65dab92a 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -1,6 +1,10 @@ 2023.4.0 (in-dev) -Special thanks to fireattack, nimbuz, Froktime, fyhtma, SakalliTavernaci, TheLastZombie, oifj34f34f, Solus, sn3akyb3ar for their contributions and reports for this release +Improvements: + + * Various improvements/fixes to existing rules (including iTunes) + +Special thanks to fireattack, nimbuz, Froktime, fyhtma, SakalliTavernaci, TheLastZombie, oifj34f34f, Solus, sn3akyb3ar, n0stal6ic for their contributions and reports for this release --- diff --git a/src/userscript.ts b/src/userscript.ts index a703265c..2fca3d5f 100644 --- a/src/userscript.ts +++ b/src/userscript.ts @@ -36016,6 +36016,9 @@ var $$IMU_EXPORT$$; // http://a4.mzstatic.com/us/r30/Music62/v4/fe/61/54/fe6154f6-b064-d788-d114-4b544def3d30/cover1400x1400.jpeg // thanks to jonestly on discord: // http://is5.mzstatic.com/image/thumb/Music123/v4/6b/07/f3/6b07f378-9ec6-a46f-f742-9a8491336245/source/999999999x0w-999.png -- 6000x6000 + // thanks to n0stal6ic on matrix: + // https://is1-ssl.mzstatic.com/image/thumb/AMCArtistImages112/v4/15/76/5d/15765d98-4aed-ec39-c630-91679ee9e082/44d44a01-da23-4c1e-ac76-7d761ee9cc3e_file_cropped.png/999999999x0w-999.png + // https://is1-ssl.mzstatic.com/image/thumb/AMCArtistImages112/v4/15/76/5d/15765d98-4aed-ec39-c630-91679ee9e082/44d44a01-da23-4c1e-ac76-7d761ee9cc3e_file.png/999999999x0w-999.png -- 4385x6612 // add -999 to always set the quality to the max value (https://github.com/qsniyg/maxurl/issues/164) obj = { can_head: false // GET can return 502, but HEAD is ok @@ -36028,6 +36031,12 @@ var $$IMU_EXPORT$$; obj.filename = match[1]; obj.url = src.replace(/\/[0-9]*x[0-9]*[a-z]*(?:-[0-9]+)?(\.[^/.]*)$/, "/999999999x0w-999$1"); + if (obj.url !== src) + return obj; + + obj.url = src.replace(/(_file)_cropped(\.[a-z]+\/+999999999x0w[^/]+)$/, "$1$2"); + if (obj.url !== src) + return obj; if (/\.png(?:[?#].*)?$/i.test(obj.url)) { // thanks to lrcn80 on reddit: https://github.com/qsniyg/maxurl/issues/962 @@ -94468,7 +94477,13 @@ var $$IMU_EXPORT$$; // https://d27csu38upkiqd.cloudfront.net/eyJidWNrZXQiOiJmZGMtc2l0ZXB1YmxpYy1tZWRpYS1wcm9kIiwia2V5IjoidXBsb2Fkcy8yMDIzLzAzLzgwNDk0LmpwZyJ9 // atob: // = {"bucket":"fdc-sitepublic-media-prod","key":"uploads\/2023\/03\/80494.jpg","edits":{"resize":{"width":296,"fit":"cover"},"toFormat":"webp"}} - domain === "d27csu38upkiqd.cloudfront.net") { + domain === "d27csu38upkiqd.cloudfront.net" || + // thanks to anonymous for reporting: + // https://images.ams-prd.blv.cloud/eyJidWNrZXQiOiJpbWFnZXMtcHJkLTFvNHV6OXpieHd6cDF1Ym0iLCJrZXkiOiJkYTkwNjE5Yy0yOGVkLTRjMDYtOTkzNi03Y2EzNGE1NjI1MzQiLCJlZGl0cyI6eyJyZXNpemUiOnsid2lkdGgiOjM2MCwiaGVpZ2h0IjozNjB9fX0= + // https://images.ams-prd.blv.cloud/eyJidWNrZXQiOiJpbWFnZXMtcHJkLTFvNHV6OXpieHd6cDF1Ym0iLCJrZXkiOiJkYTkwNjE5Yy0yOGVkLTRjMDYtOTkzNi03Y2EzNGE1NjI1MzQifQ== + // atob: + // = {"bucket":"images-prd-1o4uz9zbxwzp1ubm","key":"da90619c-28ed-4c06-9936-7ca34a562534"} + domain === "images.ams-prd.blv.cloud") { // https://d1iiivw74516uk.cloudfront.net/eyJidWNrZXQiOiJwcmVzdG8tY292ZXItaW1hZ2VzIiwia2V5IjoiODE3OTQzMy4xLmpwZyIsImVkaXRzIjp7InJlc2l6ZSI6eyJ3aWR0aCI6MzAwfSwianBlZyI6eyJxdWFsaXR5Ijo2NX0sInRvRm9ybWF0IjoianBlZyJ9LCJ0aW1lc3RhbXAiOjE0NzYxMDUxMjR9 // https://d1iiivw74516uk.cloudfront.net/eyJidWNrZXQiOiJwcmVzdG8tY292ZXItaW1hZ2VzIiwia2V5IjoiODE3OTQzMy4xLmpwZyIsInRpbWVzdGFtcCI6MTQ3NjEwNTEyNH0= // atob: @@ -113539,6 +113554,13 @@ var $$IMU_EXPORT$$; }; } + if (domain_nowww === "azertag.az") { + // thanks to anonymous for reporting: + // https://azertag.az/files/2022/1/1200x630/1648649183590816801_1200x630.jpg + // https://azertag.az/files/2022/1/1648649183590816801.jpg + return src.replace(/(\/files\/+[0-9]{4}\/+[0-9]+\/+)[0-9]+x[0-9]+\/+([0-9]+)_[0-9]+x[0-9]+\./, "$1$2."); + } + diff --git a/userscript.user.js b/userscript.user.js index f605ae80..18105395 100644 --- a/userscript.user.js +++ b/userscript.user.js @@ -32988,6 +32988,9 @@ var $$IMU_EXPORT$$; // http://a4.mzstatic.com/us/r30/Music62/v4/fe/61/54/fe6154f6-b064-d788-d114-4b544def3d30/cover1400x1400.jpeg // thanks to jonestly on discord: // http://is5.mzstatic.com/image/thumb/Music123/v4/6b/07/f3/6b07f378-9ec6-a46f-f742-9a8491336245/source/999999999x0w-999.png -- 6000x6000 + // thanks to n0stal6ic on matrix: + // https://is1-ssl.mzstatic.com/image/thumb/AMCArtistImages112/v4/15/76/5d/15765d98-4aed-ec39-c630-91679ee9e082/44d44a01-da23-4c1e-ac76-7d761ee9cc3e_file_cropped.png/999999999x0w-999.png + // https://is1-ssl.mzstatic.com/image/thumb/AMCArtistImages112/v4/15/76/5d/15765d98-4aed-ec39-c630-91679ee9e082/44d44a01-da23-4c1e-ac76-7d761ee9cc3e_file.png/999999999x0w-999.png -- 4385x6612 // add -999 to always set the quality to the max value (https://github.com/qsniyg/maxurl/issues/164) obj = { can_head: false // GET can return 502, but HEAD is ok @@ -32998,6 +33001,11 @@ var $$IMU_EXPORT$$; if (match) obj.filename = match[1]; obj.url = src.replace(/\/[0-9]*x[0-9]*[a-z]*(?:-[0-9]+)?(\.[^/.]*)$/, "/999999999x0w-999$1"); + if (obj.url !== src) + return obj; + obj.url = src.replace(/(_file)_cropped(\.[a-z]+\/+999999999x0w[^/]+)$/, "$1$2"); + if (obj.url !== src) + return obj; if (/\.png(?:[?#].*)?$/i.test(obj.url)) { // thanks to lrcn80 on reddit: https://github.com/qsniyg/maxurl/issues/962 // http://is4.mzstatic.com/image/thumb/Music6/v4/4e/92/37/4e923792-948a-ae3a-dc5b-b7416c23807a/source/999999999x0w-999.png @@ -84906,7 +84914,13 @@ var $$IMU_EXPORT$$; // https://d27csu38upkiqd.cloudfront.net/eyJidWNrZXQiOiJmZGMtc2l0ZXB1YmxpYy1tZWRpYS1wcm9kIiwia2V5IjoidXBsb2Fkcy8yMDIzLzAzLzgwNDk0LmpwZyJ9 // atob: // = {"bucket":"fdc-sitepublic-media-prod","key":"uploads\/2023\/03\/80494.jpg","edits":{"resize":{"width":296,"fit":"cover"},"toFormat":"webp"}} - domain === "d27csu38upkiqd.cloudfront.net") { + domain === "d27csu38upkiqd.cloudfront.net" || + // thanks to anonymous for reporting: + // https://images.ams-prd.blv.cloud/eyJidWNrZXQiOiJpbWFnZXMtcHJkLTFvNHV6OXpieHd6cDF1Ym0iLCJrZXkiOiJkYTkwNjE5Yy0yOGVkLTRjMDYtOTkzNi03Y2EzNGE1NjI1MzQiLCJlZGl0cyI6eyJyZXNpemUiOnsid2lkdGgiOjM2MCwiaGVpZ2h0IjozNjB9fX0= + // https://images.ams-prd.blv.cloud/eyJidWNrZXQiOiJpbWFnZXMtcHJkLTFvNHV6OXpieHd6cDF1Ym0iLCJrZXkiOiJkYTkwNjE5Yy0yOGVkLTRjMDYtOTkzNi03Y2EzNGE1NjI1MzQifQ== + // atob: + // = {"bucket":"images-prd-1o4uz9zbxwzp1ubm","key":"da90619c-28ed-4c06-9936-7ca34a562534"} + domain === "images.ams-prd.blv.cloud") { // https://d1iiivw74516uk.cloudfront.net/eyJidWNrZXQiOiJwcmVzdG8tY292ZXItaW1hZ2VzIiwia2V5IjoiODE3OTQzMy4xLmpwZyIsImVkaXRzIjp7InJlc2l6ZSI6eyJ3aWR0aCI6MzAwfSwianBlZyI6eyJxdWFsaXR5Ijo2NX0sInRvRm9ybWF0IjoianBlZyJ9LCJ0aW1lc3RhbXAiOjE0NzYxMDUxMjR9 // https://d1iiivw74516uk.cloudfront.net/eyJidWNrZXQiOiJwcmVzdG8tY292ZXItaW1hZ2VzIiwia2V5IjoiODE3OTQzMy4xLmpwZyIsInRpbWVzdGFtcCI6MTQ3NjEwNTEyNH0= // atob: @@ -101929,6 +101943,12 @@ var $$IMU_EXPORT$$; can_head: false // 400 }; } + if (domain_nowww === "azertag.az") { + // thanks to anonymous for reporting: + // https://azertag.az/files/2022/1/1200x630/1648649183590816801_1200x630.jpg + // https://azertag.az/files/2022/1/1648649183590816801.jpg + return src.replace(/(\/files\/+[0-9]{4}\/+[0-9]+\/+)[0-9]+x[0-9]+\/+([0-9]+)_[0-9]+x[0-9]+\./, "$1$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