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

Release 4chan X v1.11.22.2.

Browse Source
This commit is contained in:
ccd0 2016-01-18 08:38:39 -08:00
parent dded519aa1
commit eec61b3ba7
13 changed files with 60 additions and 135 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.22
**v1.11.22.2** *(2016-01-18)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.2/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.2/builds/4chan-X-noupdate.crx "Chromium version")]
- Update due to 4chan changing to Recaptcha v2 on report form.
**v1.11.22.1** *(2016-01-12)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.1/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.22.1/builds/4chan-X-noupdate.crx "Chromium version")]
- Update archive image search URL, avoiding problem with image search on fireden.net.
- Add `%sMD5` (MD5 in URL-safe base64) and `%hMD5` (MD5 in hexadecimal) to available sauce parameters.

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==
// @name 4chan X beta
// @version 1.11.22.1
// @version 1.11.22.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X beta
// @version 1.11.22.1
// @version 1.11.22.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -245,8 +245,8 @@
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha in the post form.'],
'Use Recaptcha v1 in Reports': [false, 'Use the text captcha in the report window.'],
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
},
@ -434,7 +434,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.22.1',
VERSION: '1.11.22.2',
NAMESPACE: '4chan X.',
boards: {}
};
@ -8158,18 +8158,10 @@
Captcha.replace = {
init: function() {
var type;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return;
}
if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
if (Conf['Use Recaptcha v2 in Reports']) {
type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
$.ready(Captcha.replace[type]);
}
return;
}
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
if (((Conf['Use Recaptcha v1'] && location.hostname === 'boards.4chan.org') || (Conf['Use Recaptcha v1 in Reports'] && location.hostname === 'sys.4chan.org')) && Main.jsEnabled) {
$.ready(Captcha.replace.v1);
return;
}
@ -8226,29 +8218,6 @@
return Captcha.v1.create();
}
},
v2: function() {
var container, lang, old, script, url;
if (!(old = $.id('captchaContainerAlt'))) {
return;
}
container = $.el('div', {
className: 'g-recaptcha'
});
$.extend(container.dataset, {
sitekey: '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
tabindex: 3
});
$.replace(old, container);
url = 'https://www.google.com/recaptcha/api.js';
if ((lang = Conf['captchaLanguage'].trim())) {
url += "?hl=" + (encodeURIComponent(lang));
}
script = $.el('script', {
src: url
});
$.add(d.head, script);
return $.onExists(d.body, 'iframe', Captcha.replace.autocopy);
},
iframe: function(iframe) {
var lang, src;
if ((lang = Conf['captchaLanguage'].trim())) {
@ -12880,14 +12849,14 @@
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
a.textContent = 'Report';
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
ReportLink.height = 180;
ReportLink.dims = 'width=400,height=550';
} else if (Conf['Archive Report']) {
a.textContent = 'Report to archive';
ReportLink.url = Redirect.to('report', {
boardID: post.board.ID,
postID: post.ID
});
ReportLink.height = 350;
ReportLink.dims = 'width=700,height=475';
} else {
ReportLink.url = '';
}
@ -12896,10 +12865,10 @@
});
},
report: function() {
var height, id, set, url;
url = ReportLink.url, height = ReportLink.height;
var dims, id, set, url;
url = ReportLink.url, dims = ReportLink.dims;
id = Date.now();
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1," + dims;
return window.open(url, id, set);
}
};
@ -16647,7 +16616,7 @@
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
if (location.hash === '#redirect') {
$.globalEval('self.close = function(){};');
window.resizeBy(0, 350 - doc.clientHeight);
window.resizeTo(700, 475);
location.replace(url);
}
return;
@ -16658,7 +16627,7 @@
});
$.on(link, 'click', function(e) {
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
return window.resizeBy(0, 350 - doc.clientHeight);
return window.resizeTo(700, 475);
}
});
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
@ -17310,6 +17279,11 @@
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
}
}
if (compareString < '00001.00011.00022.00002') {
if ((data['Use Recaptcha v1 in Reports'] == null) && data['Use Recaptcha v1'] && !data['Use Recaptcha v2 in Reports']) {
set('Use Recaptcha v1 in Reports', true);
}
}
return changes;
},
loadSettings: function(data, cb) {

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

Binary file not shown.

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.11.22.1
// @version 1.11.22.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -245,8 +245,8 @@
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha in the post form.'],
'Use Recaptcha v1 in Reports': [false, 'Use the text captcha in the report window.'],
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
},
@ -434,7 +434,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.22.1',
VERSION: '1.11.22.2',
NAMESPACE: '4chan X.',
boards: {}
};
@ -8158,18 +8158,10 @@
Captcha.replace = {
init: function() {
var type;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return;
}
if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
if (Conf['Use Recaptcha v2 in Reports']) {
type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
$.ready(Captcha.replace[type]);
}
return;
}
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
if (((Conf['Use Recaptcha v1'] && location.hostname === 'boards.4chan.org') || (Conf['Use Recaptcha v1 in Reports'] && location.hostname === 'sys.4chan.org')) && Main.jsEnabled) {
$.ready(Captcha.replace.v1);
return;
}
@ -8226,29 +8218,6 @@
return Captcha.v1.create();
}
},
v2: function() {
var container, lang, old, script, url;
if (!(old = $.id('captchaContainerAlt'))) {
return;
}
container = $.el('div', {
className: 'g-recaptcha'
});
$.extend(container.dataset, {
sitekey: '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
tabindex: 3
});
$.replace(old, container);
url = 'https://www.google.com/recaptcha/api.js';
if ((lang = Conf['captchaLanguage'].trim())) {
url += "?hl=" + (encodeURIComponent(lang));
}
script = $.el('script', {
src: url
});
$.add(d.head, script);
return $.onExists(d.body, 'iframe', Captcha.replace.autocopy);
},
iframe: function(iframe) {
var lang, src;
if ((lang = Conf['captchaLanguage'].trim())) {
@ -12880,14 +12849,14 @@
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
a.textContent = 'Report';
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
ReportLink.height = 180;
ReportLink.dims = 'width=400,height=550';
} else if (Conf['Archive Report']) {
a.textContent = 'Report to archive';
ReportLink.url = Redirect.to('report', {
boardID: post.board.ID,
postID: post.ID
});
ReportLink.height = 350;
ReportLink.dims = 'width=700,height=475';
} else {
ReportLink.url = '';
}
@ -12896,10 +12865,10 @@
});
},
report: function() {
var height, id, set, url;
url = ReportLink.url, height = ReportLink.height;
var dims, id, set, url;
url = ReportLink.url, dims = ReportLink.dims;
id = Date.now();
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1," + dims;
return window.open(url, id, set);
}
};
@ -16647,7 +16616,7 @@
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
if (location.hash === '#redirect') {
$.globalEval('self.close = function(){};');
window.resizeBy(0, 350 - doc.clientHeight);
window.resizeTo(700, 475);
location.replace(url);
}
return;
@ -16658,7 +16627,7 @@
});
$.on(link, 'click', function(e) {
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
return window.resizeBy(0, 350 - doc.clientHeight);
return window.resizeTo(700, 475);
}
});
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
@ -17310,6 +17279,11 @@
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
}
}
if (compareString < '00001.00011.00022.00002') {
if ((data['Use Recaptcha v1 in Reports'] == null) && data['Use Recaptcha v1'] && !data['Use Recaptcha v2 in Reports']) {
set('Use Recaptcha v1 in Reports', true);
}
}
return changes;
},
loadSettings: function(data, cb) {

BIN
builds/4chan-X.crx
View File

Binary file not shown.

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

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

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

@ -1,7 +1,7 @@
// Generated by CoffeeScript
// ==UserScript==
// @name 4chan X
// @version 1.11.22.1
// @version 1.11.22.2
// @minGMVer 1.14
// @minFFVer 26
// @namespace 4chan-X
@ -245,8 +245,8 @@
'Post on Captcha Completion': [false, 'Submit the post immediately when the captcha is completed.', 1],
'Bottom QR Link': [true, 'Places a link on the bottom of threads to open the QR.', 1],
'Captcha Fixes': [true, 'Make captcha easier to use, especially with the keyboard.'],
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha where possible.'],
'Use Recaptcha v2 in Reports': [false, 'Use the image selection captcha in the report window.'],
'Use Recaptcha v1': [false, 'Use the old text version of Recaptcha in the post form.'],
'Use Recaptcha v1 in Reports': [false, 'Use the text captcha in the report window.'],
'Force Noscript Captcha': [false, 'Use the non-Javascript fallback captcha even if Javascript is enabled (Recaptcha v2 only).'],
'Pass Link': [false, 'Add a 4chan Pass login link to the bottom of the page.']
},
@ -434,7 +434,7 @@
doc = d.documentElement;
g = {
VERSION: '1.11.22.1',
VERSION: '1.11.22.2',
NAMESPACE: '4chan X.',
boards: {}
};
@ -8158,18 +8158,10 @@
Captcha.replace = {
init: function() {
var type;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return;
}
if (location.hostname === 'sys.4chan.org' && Main.jsEnabled) {
if (Conf['Use Recaptcha v2 in Reports']) {
type = Conf['Force Noscript Captcha'] ? 'noscript' : 'v2';
$.ready(Captcha.replace[type]);
}
return;
}
if (Conf['Use Recaptcha v1'] && Main.jsEnabled && location.hostname !== 'www.4chan.org') {
if (((Conf['Use Recaptcha v1'] && location.hostname === 'boards.4chan.org') || (Conf['Use Recaptcha v1 in Reports'] && location.hostname === 'sys.4chan.org')) && Main.jsEnabled) {
$.ready(Captcha.replace.v1);
return;
}
@ -8226,29 +8218,6 @@
return Captcha.v1.create();
}
},
v2: function() {
var container, lang, old, script, url;
if (!(old = $.id('captchaContainerAlt'))) {
return;
}
container = $.el('div', {
className: 'g-recaptcha'
});
$.extend(container.dataset, {
sitekey: '6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc',
tabindex: 3
});
$.replace(old, container);
url = 'https://www.google.com/recaptcha/api.js';
if ((lang = Conf['captchaLanguage'].trim())) {
url += "?hl=" + (encodeURIComponent(lang));
}
script = $.el('script', {
src: url
});
$.add(d.head, script);
return $.onExists(d.body, 'iframe', Captcha.replace.autocopy);
},
iframe: function(iframe) {
var lang, src;
if ((lang = Conf['captchaLanguage'].trim())) {
@ -12880,14 +12849,14 @@
if (!(post.isDead || (post.thread.isDead && !post.thread.isArchived))) {
a.textContent = 'Report';
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post;
ReportLink.height = 180;
ReportLink.dims = 'width=400,height=550';
} else if (Conf['Archive Report']) {
a.textContent = 'Report to archive';
ReportLink.url = Redirect.to('report', {
boardID: post.board.ID,
postID: post.ID
});
ReportLink.height = 350;
ReportLink.dims = 'width=700,height=475';
} else {
ReportLink.url = '';
}
@ -12896,10 +12865,10 @@
});
},
report: function() {
var height, id, set, url;
url = ReportLink.url, height = ReportLink.height;
var dims, id, set, url;
url = ReportLink.url, dims = ReportLink.dims;
id = Date.now();
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1,width=700,height=" + height;
set = "toolbar=0,scrollbars=1,location=0,status=1,menubar=0,resizable=1," + dims;
return window.open(url, id, set);
}
};
@ -16647,7 +16616,7 @@
if ((message = $('h3')) && /Report submitted!/.test(message.textContent)) {
if (location.hash === '#redirect') {
$.globalEval('self.close = function(){};');
window.resizeBy(0, 350 - doc.clientHeight);
window.resizeTo(700, 475);
location.replace(url);
}
return;
@ -16658,7 +16627,7 @@
});
$.on(link, 'click', function(e) {
if (!(e.shiftKey || e.altKey || e.ctrlKey || e.metaKey || e.button !== 0)) {
return window.resizeBy(0, 350 - doc.clientHeight);
return window.resizeTo(700, 475);
}
});
$.add(d.body, [$.tn(' ['), link, $.tn(']')]);
@ -17310,6 +17279,11 @@
set('sauces', data['sauces'].replace(/^#?\s*https:\/\/www\.google\.com\/searchbyimage\?image_url=%(?:IMG|T?URL)(?=$|;)/mg, '$&&safe=off'));
}
}
if (compareString < '00001.00011.00022.00002') {
if ((data['Use Recaptcha v1 in Reports'] == null) && data['Use Recaptcha v1'] && !data['Use Recaptcha v2 in Reports']) {
set('Use Recaptcha v1 in Reports', true);
}
}
return changes;
},
loadSettings: function(data, cb) {

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'?>
<gupdate xmlns='http://www.google.com/update2/response' protocol='2.0'>
<app appid='lacclbnghgdicfifcamcmcnilckjamag'>
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.22.1' />
<updatecheck codebase='https://www.4chan-x.net/builds/4chan-X-beta.crx' version='1.11.22.2' />
</app>
</gupdate>

2
builds/updates.xml
View File

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

4
version.json
View File

@ -1,4 +1,4 @@
{
"version": "1.11.22.1",
"date": "2016-01-12T10:18:55.491Z"
"version": "1.11.22.2",
"date": "2016-01-18T16:37:54.258Z"
}