diff --git a/CHANGELOG.md b/CHANGELOG.md index 5fb10a38f..a6232b332 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,10 @@ ### v1.14.22 +**v1.14.22.4** *(2023-02-28)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.22.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.22.4/builds/4chan-X-noupdate.crx)] +- Recognize JPEG files with .jfif extensions as images for purposes of Image Hover etc.; also recognize .avif and .jxl files as images. +- Avoid breaking sauce settings of people with links to original Google Images and Google Lens, provided they didn't already update to v1.14.22.3. + **v1.14.22.3** *(2023-02-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.22.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.22.3/builds/4chan-X-noupdate.crx)] - Switch Google image search back to old version, thanks to https://boards.4channel.org/g/thread/91737566#p91789527 and others. diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index 4d8dd19a2..1439282ab 100644 Binary files a/builds/4chan-X-beta.crx and b/builds/4chan-X-beta.crx differ diff --git a/builds/4chan-X-beta.meta.js b/builds/4chan-X-beta.meta.js index 856bb80bd..15afd1f83 100644 --- a/builds/4chan-X-beta.meta.js +++ b/builds/4chan-X-beta.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.22.3 +// @version 1.14.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X-beta.user.js b/builds/4chan-X-beta.user.js index aa5a8128f..37d9c5c40 100644 --- a/builds/4chan-X-beta.user.js +++ b/builds/4chan-X-beta.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X beta -// @version 1.14.22.3 +// @version 1.14.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -211,7 +211,7 @@ docSet = function() { }; g = { - VERSION: '1.14.22.3', + VERSION: '1.14.22.4', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -5369,7 +5369,7 @@ $ = (function() { }; $.isImage = function(url) { - return /\.(jpe?g|png|gif|bmp|webp)$/i.test(url); + return /\.(jpe?g|jfif|png|gif|bmp|webp|avif|jxl)$/i.test(url); }; $.isVideo = function(url) { @@ -13500,14 +13500,12 @@ Settings = (function() { set('archiveLists', data['archiveLists'].replace('https://nstepien.github.io/archives.json/archives.json', 'https://4chenz.github.io/archives.json/archives.json')); } } - if (compareString < '00001.00014.00022.00002') { - if (data['sauces'] != null) { - set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(IMG|T?URL)&safe=off(?=$|;)/mg, 'https://lens.google.com/uploadbyurl?url=%$1')); - } - } if (compareString < '00001.00014.00022.00003') { if (data['sauces'] != null) { - set('sauces', data['sauces'].replace(/^#?\s*https:\/\/lens\.google\.com\/uploadbyurl\?url=%(IMG|T?URL)(?=$|;)/mg, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(IMG|T?URL)&safe=off(?=$|;)/mg, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + if (compareString === '00001.00014.00022.00002' && !/\bsbisrc=/.test(data['sauces'])) { + set('sauces', data['sauces'].replace(/^#?\s*https:\/\/lens\.google\.com\/uploadbyurl\?url=%(IMG|T?URL)(?=$|;)/m, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + } } addSauces(['#https://lens.google.com/uploadbyurl?url=%IMG;text:lens']); } diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index ac4183ac1..d10688ad6 100644 Binary files a/builds/4chan-X-noupdate.crx and b/builds/4chan-X-noupdate.crx differ diff --git a/builds/4chan-X-noupdate.user.js b/builds/4chan-X-noupdate.user.js index 3ee6616c3..829078892 100644 --- a/builds/4chan-X-noupdate.user.js +++ b/builds/4chan-X-noupdate.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.22.3 +// @version 1.14.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -211,7 +211,7 @@ docSet = function() { }; g = { - VERSION: '1.14.22.3', + VERSION: '1.14.22.4', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -5369,7 +5369,7 @@ $ = (function() { }; $.isImage = function(url) { - return /\.(jpe?g|png|gif|bmp|webp)$/i.test(url); + return /\.(jpe?g|jfif|png|gif|bmp|webp|avif|jxl)$/i.test(url); }; $.isVideo = function(url) { @@ -13500,14 +13500,12 @@ Settings = (function() { set('archiveLists', data['archiveLists'].replace('https://nstepien.github.io/archives.json/archives.json', 'https://4chenz.github.io/archives.json/archives.json')); } } - if (compareString < '00001.00014.00022.00002') { - if (data['sauces'] != null) { - set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(IMG|T?URL)&safe=off(?=$|;)/mg, 'https://lens.google.com/uploadbyurl?url=%$1')); - } - } if (compareString < '00001.00014.00022.00003') { if (data['sauces'] != null) { - set('sauces', data['sauces'].replace(/^#?\s*https:\/\/lens\.google\.com\/uploadbyurl\?url=%(IMG|T?URL)(?=$|;)/mg, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(IMG|T?URL)&safe=off(?=$|;)/mg, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + if (compareString === '00001.00014.00022.00002' && !/\bsbisrc=/.test(data['sauces'])) { + set('sauces', data['sauces'].replace(/^#?\s*https:\/\/lens\.google\.com\/uploadbyurl\?url=%(IMG|T?URL)(?=$|;)/m, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + } } addSauces(['#https://lens.google.com/uploadbyurl?url=%IMG;text:lens']); } diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index 897983a2f..d6deffe5a 100644 Binary files a/builds/4chan-X.crx and b/builds/4chan-X.crx differ diff --git a/builds/4chan-X.meta.js b/builds/4chan-X.meta.js index 71b2378bc..1e2bf8e71 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.22.3 +// @version 1.14.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 130355c0e..2cbbe7fb1 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.22.3 +// @version 1.14.22.4 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -211,7 +211,7 @@ docSet = function() { }; g = { - VERSION: '1.14.22.3', + VERSION: '1.14.22.4', NAMESPACE: '4chan X.', sites: Object.create(null), boards: Object.create(null) @@ -5369,7 +5369,7 @@ $ = (function() { }; $.isImage = function(url) { - return /\.(jpe?g|png|gif|bmp|webp)$/i.test(url); + return /\.(jpe?g|jfif|png|gif|bmp|webp|avif|jxl)$/i.test(url); }; $.isVideo = function(url) { @@ -13500,14 +13500,12 @@ Settings = (function() { set('archiveLists', data['archiveLists'].replace('https://nstepien.github.io/archives.json/archives.json', 'https://4chenz.github.io/archives.json/archives.json')); } } - if (compareString < '00001.00014.00022.00002') { - if (data['sauces'] != null) { - set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(IMG|T?URL)&safe=off(?=$|;)/mg, 'https://lens.google.com/uploadbyurl?url=%$1')); - } - } if (compareString < '00001.00014.00022.00003') { if (data['sauces'] != null) { - set('sauces', data['sauces'].replace(/^#?\s*https:\/\/lens\.google\.com\/uploadbyurl\?url=%(IMG|T?URL)(?=$|;)/mg, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(IMG|T?URL)&safe=off(?=$|;)/mg, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + if (compareString === '00001.00014.00022.00002' && !/\bsbisrc=/.test(data['sauces'])) { + set('sauces', data['sauces'].replace(/^#?\s*https:\/\/lens\.google\.com\/uploadbyurl\?url=%(IMG|T?URL)(?=$|;)/m, 'https://www.google.com/searchbyimage?sbisrc=4chanx&image_url=%$1&safe=off')); + } } addSauces(['#https://lens.google.com/uploadbyurl?url=%IMG;text:lens']); } diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index 01c609e91..b927d4fc9 100644 Binary files a/builds/4chan-X.zip and b/builds/4chan-X.zip differ diff --git a/builds/updates-beta.json b/builds/updates-beta.json index b35e81e24..e44a53c3f 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.22.3", + "version": "1.14.22.4", "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx" } ] diff --git a/builds/updates-beta.xml b/builds/updates-beta.xml index 422129ce6..47d99b4f1 100644 --- a/builds/updates-beta.xml +++ b/builds/updates-beta.xml @@ -1,7 +1,7 @@ - + diff --git a/builds/updates.json b/builds/updates.json index 1ab97a746..a8d58a6b0 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.22.3", + "version": "1.14.22.4", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 4fbefee53..aa53067e2 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index edd92eb92..2de64c652 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.22.3", - "date": "2023-02-27T07:10:21.264Z" + "version": "1.14.22.4", + "date": "2023-02-28T22:19:57.872Z" } \ No newline at end of file