Goyslop/4chan-x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Release 4chan X v1.11.17.7.

Browse Source
This commit is contained in:
ccd0 2015-11-20 12:42:13 -08:00
parent 013562cdbe
commit 6254601b5d
13 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.17 ### v1.11.17
**v1.11.17.7** *(2015-11-20)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.7/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.7/builds/4chan-X-noupdate.crx "Chromium version")]
- More captcha tweaks / fixes.
**v1.11.17.6** *(2015-11-19)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.6/builds/4chan-X-noupdate.crx "Chromium version")] **v1.11.17.6** *(2015-11-19)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.17.6/builds/4chan-X-noupdate.crx "Chromium version")]
- Make use of new HTTPS support on iqdb.org. - Make use of new HTTPS support on iqdb.org.

BIN
builds/4chan-X-beta.crx
View File

Binary file not shown.

2
builds/4chan-X-beta.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.11.17.6 // @version 1.11.17.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

18
builds/4chan-X-beta.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.11.17.6 // @version 1.11.17.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.11.17.6', VERSION: '1.11.17.7',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -7838,10 +7838,10 @@
} else if (/expired/i.test(err.textContent)) { } else if (/expired/i.test(err.textContent)) {
err = 'This CAPTCHA is no longer valid because it has expired.'; err = 'This CAPTCHA is no longer valid because it has expired.';
} }
QR.cooldown.auto = QR.captcha.isEnabled ? !!QR.captcha.captchas.length : err === 'Connection error with sys.4chan.org.' ? true : false; QR.cooldown.auto = QR.captcha.isEnabled || err === 'Connection error with sys.4chan.org.';
QR.cooldown.addDelay(post, 2); QR.cooldown.addDelay(post, 2);
} else if (err.textContent && (m = err.textContent.match(/(?:(\d+)\s+minutes?\s+)?(\d+)\s+second/i)) && !/duplicate|hour/i.test(err.textContent)) { } else if (err.textContent && (m = err.textContent.match(/(?:(\d+)\s+minutes?\s+)?(\d+)\s+second/i)) && !/duplicate|hour/i.test(err.textContent)) {
QR.cooldown.auto = (!QR.captcha.isEnabled || !!QR.captcha.captchas.length) && !/have\s+been\s+muted/i.test(err.textContent); QR.cooldown.auto = !/have\s+been\s+muted/i.test(err.textContent);
seconds = 60 * (+(m[1] || 0)) + (+m[2]); seconds = 60 * (+(m[1] || 0)) + (+m[2]);
if (/muted/i.test(err.textContent)) { if (/muted/i.test(err.textContent)) {
QR.cooldown.addMute(seconds); QR.cooldown.addMute(seconds);
@ -7851,9 +7851,12 @@
} else { } else {
QR.cooldown.auto = false; QR.cooldown.auto = false;
} }
QR.captcha.setup(QR.cooldown.auto);
if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
QR.cooldown.auto = false;
}
QR.status(); QR.status();
QR.error(err); QR.error(err);
QR.captcha.setup(true);
return; return;
} }
h1 = $('h1', resDoc); h1 = $('h1', resDoc);
@ -7899,7 +7902,7 @@
QR.close(); QR.close();
} else { } else {
post.rm(); post.rm();
QR.captcha.setup(true); QR.captcha.setup(d.activeElement === QR.nodes.status);
} }
QR.cooldown.add(threadID, postID); QR.cooldown.add(threadID, postID);
URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
@ -8782,6 +8785,9 @@
reload: function() { reload: function() {
if (this.noscript) { if (this.noscript) {
return $('iframe', this.nodes.container).src = this.noscriptURL(); return $('iframe', this.nodes.container).src = this.noscriptURL();
} else if ($('iframe[src^="https://www.google.com/recaptcha/api/fallback?"]', this.nodes.container)) {
this.destroy();
return this.setup(false, true);
} else { } else {
return $.globalEval('(function() {\n var container = document.querySelector("#qr .captcha-container");\n window.grecaptcha.reset(container.dataset.widgetID);\n})();'); return $.globalEval('(function() {\n var container = document.querySelector("#qr .captcha-container");\n window.grecaptcha.reset(container.dataset.widgetID);\n})();');
} }

BIN
builds/4chan-X-noupdate.crx
View File

Binary file not shown.

18
builds/4chan-X-noupdate.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.11.17.6 // @version 1.11.17.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.11.17.6', VERSION: '1.11.17.7',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -7838,10 +7838,10 @@
} else if (/expired/i.test(err.textContent)) { } else if (/expired/i.test(err.textContent)) {
err = 'This CAPTCHA is no longer valid because it has expired.'; err = 'This CAPTCHA is no longer valid because it has expired.';
} }
QR.cooldown.auto = QR.captcha.isEnabled ? !!QR.captcha.captchas.length : err === 'Connection error with sys.4chan.org.' ? true : false; QR.cooldown.auto = QR.captcha.isEnabled || err === 'Connection error with sys.4chan.org.';
QR.cooldown.addDelay(post, 2); QR.cooldown.addDelay(post, 2);
} else if (err.textContent && (m = err.textContent.match(/(?:(\d+)\s+minutes?\s+)?(\d+)\s+second/i)) && !/duplicate|hour/i.test(err.textContent)) { } else if (err.textContent && (m = err.textContent.match(/(?:(\d+)\s+minutes?\s+)?(\d+)\s+second/i)) && !/duplicate|hour/i.test(err.textContent)) {
QR.cooldown.auto = (!QR.captcha.isEnabled || !!QR.captcha.captchas.length) && !/have\s+been\s+muted/i.test(err.textContent); QR.cooldown.auto = !/have\s+been\s+muted/i.test(err.textContent);
seconds = 60 * (+(m[1] || 0)) + (+m[2]); seconds = 60 * (+(m[1] || 0)) + (+m[2]);
if (/muted/i.test(err.textContent)) { if (/muted/i.test(err.textContent)) {
QR.cooldown.addMute(seconds); QR.cooldown.addMute(seconds);
@ -7851,9 +7851,12 @@
} else { } else {
QR.cooldown.auto = false; QR.cooldown.auto = false;
} }
QR.captcha.setup(QR.cooldown.auto);
if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
QR.cooldown.auto = false;
}
QR.status(); QR.status();
QR.error(err); QR.error(err);
QR.captcha.setup(true);
return; return;
} }
h1 = $('h1', resDoc); h1 = $('h1', resDoc);
@ -7899,7 +7902,7 @@
QR.close(); QR.close();
} else { } else {
post.rm(); post.rm();
QR.captcha.setup(true); QR.captcha.setup(d.activeElement === QR.nodes.status);
} }
QR.cooldown.add(threadID, postID); QR.cooldown.add(threadID, postID);
URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
@ -8782,6 +8785,9 @@
reload: function() { reload: function() {
if (this.noscript) { if (this.noscript) {
return $('iframe', this.nodes.container).src = this.noscriptURL(); return $('iframe', this.nodes.container).src = this.noscriptURL();
} else if ($('iframe[src^="https://www.google.com/recaptcha/api/fallback?"]', this.nodes.container)) {
this.destroy();
return this.setup(false, true);
} else { } else {
return $.globalEval('(function() {\n var container = document.querySelector("#qr .captcha-container");\n window.grecaptcha.reset(container.dataset.widgetID);\n})();'); return $.globalEval('(function() {\n var container = document.querySelector("#qr .captcha-container");\n window.grecaptcha.reset(container.dataset.widgetID);\n})();');
} }

BIN
builds/4chan-X.crx
View File

Binary file not shown.

2
builds/4chan-X.meta.js
View File

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.11.17.6 // @version 1.11.17.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

18
builds/4chan-X.user.js
View File

@ -1,7 +1,7 @@
// Generated by CoffeeScript // Generated by CoffeeScript
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.11.17.6 // @version 1.11.17.7
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -433,7 +433,7 @@
doc = d.documentElement; doc = d.documentElement;
g = { g = {
VERSION: '1.11.17.6', VERSION: '1.11.17.7',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -7838,10 +7838,10 @@
} else if (/expired/i.test(err.textContent)) { } else if (/expired/i.test(err.textContent)) {
err = 'This CAPTCHA is no longer valid because it has expired.'; err = 'This CAPTCHA is no longer valid because it has expired.';
} }
QR.cooldown.auto = QR.captcha.isEnabled ? !!QR.captcha.captchas.length : err === 'Connection error with sys.4chan.org.' ? true : false; QR.cooldown.auto = QR.captcha.isEnabled || err === 'Connection error with sys.4chan.org.';
QR.cooldown.addDelay(post, 2); QR.cooldown.addDelay(post, 2);
} else if (err.textContent && (m = err.textContent.match(/(?:(\d+)\s+minutes?\s+)?(\d+)\s+second/i)) && !/duplicate|hour/i.test(err.textContent)) { } else if (err.textContent && (m = err.textContent.match(/(?:(\d+)\s+minutes?\s+)?(\d+)\s+second/i)) && !/duplicate|hour/i.test(err.textContent)) {
QR.cooldown.auto = (!QR.captcha.isEnabled || !!QR.captcha.captchas.length) && !/have\s+been\s+muted/i.test(err.textContent); QR.cooldown.auto = !/have\s+been\s+muted/i.test(err.textContent);
seconds = 60 * (+(m[1] || 0)) + (+m[2]); seconds = 60 * (+(m[1] || 0)) + (+m[2]);
if (/muted/i.test(err.textContent)) { if (/muted/i.test(err.textContent)) {
QR.cooldown.addMute(seconds); QR.cooldown.addMute(seconds);
@ -7851,9 +7851,12 @@
} else { } else {
QR.cooldown.auto = false; QR.cooldown.auto = false;
} }
QR.captcha.setup(QR.cooldown.auto);
if (QR.captcha.isEnabled && !QR.captcha.captchas.length) {
QR.cooldown.auto = false;
}
QR.status(); QR.status();
QR.error(err); QR.error(err);
QR.captcha.setup(true);
return; return;
} }
h1 = $('h1', resDoc); h1 = $('h1', resDoc);
@ -7899,7 +7902,7 @@
QR.close(); QR.close();
} else { } else {
post.rm(); post.rm();
QR.captcha.setup(true); QR.captcha.setup(d.activeElement === QR.nodes.status);
} }
QR.cooldown.add(threadID, postID); QR.cooldown.add(threadID, postID);
URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0; URL = threadID === postID ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID : g.VIEW === 'index' && lastPostToThread && Conf['Open Post in New Tab'] ? window.location.origin + "/" + g.BOARD + "/thread/" + threadID + "#p" + postID : void 0;
@ -8782,6 +8785,9 @@
reload: function() { reload: function() {
if (this.noscript) { if (this.noscript) {
return $('iframe', this.nodes.container).src = this.noscriptURL(); return $('iframe', this.nodes.container).src = this.noscriptURL();
} else if ($('iframe[src^="https://www.google.com/recaptcha/api/fallback?"]', this.nodes.container)) {
this.destroy();
return this.setup(false, true);
} else { } else {
return $.globalEval('(function() {\n var container = document.querySelector("#qr .captcha-container");\n window.grecaptcha.reset(container.dataset.widgetID);\n})();'); return $.globalEval('(function() {\n var container = document.querySelector("#qr .captcha-container");\n window.grecaptcha.reset(container.dataset.widgetID);\n})();');
} }

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.17.6' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.17.7' />
</app> </app>
</gupdate> </gupdate>

2
builds/updates.xml
View File

@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?> <?xml version='1.0' encoding='UTF-8'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'> <gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'> <app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.17.6' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.11.17.7' />
</app> </app>
</gupdate> </gupdate>

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.11.17.6", "version": "1.11.17.7",
"date": "2015-11-19T22:42:22.721Z" "date": "2015-11-20T20:41:27.482Z"
} }