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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2021-07-07 20:58:02 -07:00
commit f0c7afeded
17 changed files with 35 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -4,6 +4,9 @@
### v1.14.21 ### v1.14.21
**v1.14.21.6** *(2021-07-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.6/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.6/builds/4chan-X-noupdate.crx)]
- Captcha related bugfixes.
**v1.14.21.5** *(2021-07-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.5/builds/4chan-X-noupdate.crx)] **v1.14.21.5** *(2021-07-07)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.5/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.21.5/builds/4chan-X-noupdate.crx)]
- Fix bug causing captcha to sometimes not work when replying from index. - Fix bug causing captcha to sometimes not work when replying from index.

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.14.21.5 // @version 1.14.21.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X beta // @name 4chan X beta
// @version 1.14.21.5 // @version 1.14.21.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -218,7 +218,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.21.5', VERSION: '1.14.21.6',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
sites: Object.create(null), sites: Object.create(null),
boards: Object.create(null) boards: Object.create(null)
@ -23805,7 +23805,10 @@ Captcha = {};
}, },
updateThread: function() { updateThread: function() {
var boardID, newThread, ref, threadID; var boardID, newThread, ref, threadID;
ref = Captcha.t.currentThread, boardID = ref.boardID, threadID = ref.threadID; if (!this.isEnabled) {
return;
}
ref = Captcha.t.currentThread || {}, boardID = ref.boardID, threadID = ref.threadID;
newThread = Captcha.t.getThread(); newThread = Captcha.t.getThread();
if (!(newThread.boardID === boardID && newThread.threadID === threadID)) { if (!(newThread.boardID === boardID && newThread.threadID === threadID)) {
Captcha.t.destroy(); Captcha.t.destroy();
@ -24295,7 +24298,7 @@ QR = (function() {
}, },
initReady: function() { initReady: function() {
var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop; var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop;
captchaVersion = $('#t-root') ? 't' : 'v2'; captchaVersion = $('#g-recaptcha, #captcha-forced-noscript') ? 'v2' : 't';
QR.captcha = Captcha[captchaVersion]; QR.captcha = Captcha[captchaVersion];
QR.postingIsEnabled = true; QR.postingIsEnabled = true;
config = g.BOARD.config; config = g.BOARD.config;

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

Binary file not shown.

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.21.5 // @version 1.14.21.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -218,7 +218,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.21.5', VERSION: '1.14.21.6',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
sites: Object.create(null), sites: Object.create(null),
boards: Object.create(null) boards: Object.create(null)
@ -23805,7 +23805,10 @@ Captcha = {};
}, },
updateThread: function() { updateThread: function() {
var boardID, newThread, ref, threadID; var boardID, newThread, ref, threadID;
ref = Captcha.t.currentThread, boardID = ref.boardID, threadID = ref.threadID; if (!this.isEnabled) {
return;
}
ref = Captcha.t.currentThread || {}, boardID = ref.boardID, threadID = ref.threadID;
newThread = Captcha.t.getThread(); newThread = Captcha.t.getThread();
if (!(newThread.boardID === boardID && newThread.threadID === threadID)) { if (!(newThread.boardID === boardID && newThread.threadID === threadID)) {
Captcha.t.destroy(); Captcha.t.destroy();
@ -24295,7 +24298,7 @@ QR = (function() {
}, },
initReady: function() { initReady: function() {
var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop; var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop;
captchaVersion = $('#t-root') ? 't' : 'v2'; captchaVersion = $('#g-recaptcha, #captcha-forced-noscript') ? 'v2' : 't';
QR.captcha = Captcha[captchaVersion]; QR.captcha = Captcha[captchaVersion];
QR.postingIsEnabled = true; QR.postingIsEnabled = true;
config = g.BOARD.config; config = g.BOARD.config;

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.14.21.5 // @version 1.14.21.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.21.5 // @version 1.14.21.6
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -218,7 +218,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.21.5', VERSION: '1.14.21.6',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
sites: Object.create(null), sites: Object.create(null),
boards: Object.create(null) boards: Object.create(null)
@ -23805,7 +23805,10 @@ Captcha = {};
}, },
updateThread: function() { updateThread: function() {
var boardID, newThread, ref, threadID; var boardID, newThread, ref, threadID;
ref = Captcha.t.currentThread, boardID = ref.boardID, threadID = ref.threadID; if (!this.isEnabled) {
return;
}
ref = Captcha.t.currentThread || {}, boardID = ref.boardID, threadID = ref.threadID;
newThread = Captcha.t.getThread(); newThread = Captcha.t.getThread();
if (!(newThread.boardID === boardID && newThread.threadID === threadID)) { if (!(newThread.boardID === boardID && newThread.threadID === threadID)) {
Captcha.t.destroy(); Captcha.t.destroy();
@ -24295,7 +24298,7 @@ QR = (function() {
}, },
initReady: function() { initReady: function() {
var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop; var captchaVersion, config, link, linkBot, navLinksBot, origToggle, prop;
captchaVersion = $('#t-root') ? 't' : 'v2'; captchaVersion = $('#g-recaptcha, #captcha-forced-noscript') ? 'v2' : 't';
QR.captcha = Captcha[captchaVersion]; QR.captcha = Captcha[captchaVersion];
QR.postingIsEnabled = true; QR.postingIsEnabled = true;
config = g.BOARD.config; config = g.BOARD.config;

BIN
builds/4chan-X.zip
View File

Binary file not shown.

2
builds/updates-beta.json
View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": { "4chan-x@4chan-x.net": {
"updates": [ "updates": [
{ {
"version": "1.14.21.5", "version": "1.14.21.6",
"update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx" "update_link": "https://www.4chan-x.net/builds/4chan-X-beta.crx"
} }
] ]

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.14.21.5' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.14.21.6' />
</app> </app>
</gupdate> </gupdate>

2
builds/updates.json
View File

@ -3,7 +3,7 @@
"4chan-x@4chan-x.net": { "4chan-x@4chan-x.net": {
"updates": [ "updates": [
{ {
"version": "1.14.21.5", "version": "1.14.21.6",
"update_link": "https://www.4chan-x.net/builds/4chan-X.crx" "update_link": "https://www.4chan-x.net/builds/4chan-X.crx"
} }
] ]

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.14.21.5' /> <updatecheck codebase='https://www.4chan-x.net/builds/4chan-X.crx' version='1.14.21.6' />
</app> </app>
</gupdate> </gupdate>

3
src/Posting/Captcha.t.coffee
View File

@ -48,7 +48,8 @@ Captcha.t =
delete @nodes.container delete @nodes.container
updateThread: -> updateThread: ->
{boardID, threadID} = Captcha.t.currentThread return unless @isEnabled
{boardID, threadID} = (Captcha.t.currentThread or {})
newThread = Captcha.t.getThread() newThread = Captcha.t.getThread()
unless newThread.boardID is boardID and newThread.threadID is threadID unless newThread.boardID is boardID and newThread.threadID is threadID
Captcha.t.destroy() Captcha.t.destroy()

2
src/Posting/QR.coffee
View File

@ -48,7 +48,7 @@ QR =
Header.addShortcut 'qr', sc, 540 Header.addShortcut 'qr', sc, 540
initReady: -> initReady: ->
captchaVersion = if $('#t-root') then 't' else 'v2' captchaVersion = if $('#g-recaptcha, #captcha-forced-noscript') then 'v2' else 't'
QR.captcha = Captcha[captchaVersion] QR.captcha = Captcha[captchaVersion]
QR.postingIsEnabled = true QR.postingIsEnabled = true

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.14.21.5", "version": "1.14.21.6",
"date": "2021-07-07T06:16:45.892Z" "date": "2021-07-08T03:54:56.178Z"
} }