diff --git a/CHANGELOG.md b/CHANGELOG.md index 87cbaa010..7f72f2da3 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,9 @@ ## v1.14.0 +**v1.14.0.5** *(2018-02-01)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.5/builds/4chan-X-noupdate.crx)] +- Merge branch v1.13.15.8: Captcha bypass cookie does not work for starting threads. Updating to treat this case correctly. + **v1.14.0.4** *(2018-01-27)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.0.4/builds/4chan-X-noupdate.crx)] - Merge v1.13.15.7: Show video contract button unconditionally for now due to changes in Firefox. - Merge v1.13.15.7: Fix webm_audio undefined error shown on first install of script. #1778 diff --git a/builds/4chan-X-beta.crx b/builds/4chan-X-beta.crx index be44d27d5..f51c62ca9 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 9b127a473..0c223e0e2 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.0.4 +// @version 1.14.0.5 // @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 0fc477956..4d3f33421 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.0.4 +// @version 1.14.0.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.4', + VERSION: '1.14.0.5', NAMESPACE: '4chan X.', boards: {} }; @@ -20592,7 +20592,7 @@ Captcha = {}; return this.captchas.length; }, needed: function() { - return !(/\b_ct=/.test(d.cookie) || this.captchas.length || QR.req) && (QR.posts.length > 1 || Conf['Auto-load captcha'] || QR.posts[0].com || QR.posts[0].file); + return !((/\b_ct=/.test(d.cookie) && QR.posts[0].thread !== 'new') || this.captchas.length || QR.req) && (QR.posts.length > 1 || Conf['Auto-load captcha'] || QR.posts[0].com || QR.posts[0].file); }, getOne: function(isReply) { var captcha, i; @@ -22066,7 +22066,7 @@ QR = (function() { if (g.BOARD.ID === 'r9k' && !((ref = post.com) != null ? ref.match(/[a-z-]/i) : void 0)) { err || (err = 'Original comment required.'); } - if (QR.captcha.isEnabled && !/\b_ct=/.test(d.cookie) && !err) { + if (QR.captcha.isEnabled && !(/\b_ct=/.test(d.cookie) && threadID) && !err) { captcha = QR.captcha.getOne(!!threadID); if (!captcha) { err = 'No valid captcha.'; diff --git a/builds/4chan-X-noupdate.crx b/builds/4chan-X-noupdate.crx index ffd59c98e..b3c9a03d9 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 5c2e67b48..bb716957b 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.0.4 +// @version 1.14.0.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.4', + VERSION: '1.14.0.5', NAMESPACE: '4chan X.', boards: {} }; @@ -20592,7 +20592,7 @@ Captcha = {}; return this.captchas.length; }, needed: function() { - return !(/\b_ct=/.test(d.cookie) || this.captchas.length || QR.req) && (QR.posts.length > 1 || Conf['Auto-load captcha'] || QR.posts[0].com || QR.posts[0].file); + return !((/\b_ct=/.test(d.cookie) && QR.posts[0].thread !== 'new') || this.captchas.length || QR.req) && (QR.posts.length > 1 || Conf['Auto-load captcha'] || QR.posts[0].com || QR.posts[0].file); }, getOne: function(isReply) { var captcha, i; @@ -22066,7 +22066,7 @@ QR = (function() { if (g.BOARD.ID === 'r9k' && !((ref = post.com) != null ? ref.match(/[a-z-]/i) : void 0)) { err || (err = 'Original comment required.'); } - if (QR.captcha.isEnabled && !/\b_ct=/.test(d.cookie) && !err) { + if (QR.captcha.isEnabled && !(/\b_ct=/.test(d.cookie) && threadID) && !err) { captcha = QR.captcha.getOne(!!threadID); if (!captcha) { err = 'No valid captcha.'; diff --git a/builds/4chan-X.crx b/builds/4chan-X.crx index e332f3762..336147fec 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 aaef3142e..3abffe902 100644 --- a/builds/4chan-X.meta.js +++ b/builds/4chan-X.meta.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.4 +// @version 1.14.0.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X diff --git a/builds/4chan-X.user.js b/builds/4chan-X.user.js index 711ea5c41..2b592ed62 100644 --- a/builds/4chan-X.user.js +++ b/builds/4chan-X.user.js @@ -1,6 +1,6 @@ // ==UserScript== // @name 4chan X -// @version 1.14.0.4 +// @version 1.14.0.5 // @minGMVer 1.14 // @minFFVer 26 // @namespace 4chan-X @@ -157,7 +157,7 @@ docSet = function() { }; g = { - VERSION: '1.14.0.4', + VERSION: '1.14.0.5', NAMESPACE: '4chan X.', boards: {} }; @@ -20592,7 +20592,7 @@ Captcha = {}; return this.captchas.length; }, needed: function() { - return !(/\b_ct=/.test(d.cookie) || this.captchas.length || QR.req) && (QR.posts.length > 1 || Conf['Auto-load captcha'] || QR.posts[0].com || QR.posts[0].file); + return !((/\b_ct=/.test(d.cookie) && QR.posts[0].thread !== 'new') || this.captchas.length || QR.req) && (QR.posts.length > 1 || Conf['Auto-load captcha'] || QR.posts[0].com || QR.posts[0].file); }, getOne: function(isReply) { var captcha, i; @@ -22066,7 +22066,7 @@ QR = (function() { if (g.BOARD.ID === 'r9k' && !((ref = post.com) != null ? ref.match(/[a-z-]/i) : void 0)) { err || (err = 'Original comment required.'); } - if (QR.captcha.isEnabled && !/\b_ct=/.test(d.cookie) && !err) { + if (QR.captcha.isEnabled && !(/\b_ct=/.test(d.cookie) && threadID) && !err) { captcha = QR.captcha.getOne(!!threadID); if (!captcha) { err = 'No valid captcha.'; diff --git a/builds/4chan-X.zip b/builds/4chan-X.zip index e0f7f3629..d52166bef 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 e73aed911..7256c185c 100644 --- a/builds/updates-beta.json +++ b/builds/updates-beta.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.4", + "version": "1.14.0.5", "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 6a853880f..fa719fa08 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 d0ea98c31..b1ea0dc79 100644 --- a/builds/updates.json +++ b/builds/updates.json @@ -3,7 +3,7 @@ "4chan-x@4chan-x.net": { "updates": [ { - "version": "1.14.0.4", + "version": "1.14.0.5", "update_link": "https://www.4chan-x.net/builds/4chan-X.crx" } ] diff --git a/builds/updates.xml b/builds/updates.xml index 4c84e563c..fa75f9e7b 100644 --- a/builds/updates.xml +++ b/builds/updates.xml @@ -1,7 +1,7 @@ - + diff --git a/version.json b/version.json index 2a0d77790..673101232 100644 --- a/version.json +++ b/version.json @@ -1,4 +1,4 @@ { - "version": "1.14.0.4", - "date": "2018-01-27T06:38:45.123Z" + "version": "1.14.0.5", + "date": "2018-02-01T04:44:09.500Z" } \ No newline at end of file