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

Release 4chan X v1.14.4.4.

Browse Source
This commit is contained in:
ccd0 2018-11-23 14:45:05 -08:00
parent 0fe78ee0fa
commit b74431cfba
15 changed files with 337 additions and 155 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -4,6 +4,10 @@
### v1.14.4 ### v1.14.4
**v1.14.4.4** *(2018-11-23)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.4.4/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.4.4/builds/4chan-X-noupdate.crx)]
- Update for 4channel.org
- Don't remove code paste field if the captcha is refusing to serve a challenge.
**v1.14.4.3** *(2018-11-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.4.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.4.3/builds/4chan-X-noupdate.crx)] **v1.14.4.3** *(2018-11-08)* - [[Userscript](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.4.3/builds/4chan-X-noupdate.user.js)] [[Chrome extension](https://raw.githubusercontent.com/ccd0/4chan-x/1.14.4.3/builds/4chan-X-noupdate.crx)]
- Add extra collapse link at bottom of expanded threads. - Add extra collapse link at bottom of expanded threads.
- Add option `Expand thread only` in `Image Expansion` menu; makes expanding all images when in index only operate within current thread. - Add option `Expand thread only` in `Image Expansion` menu; makes expanding all images when in index only operate within current thread.

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

Binary file not shown.

25
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.4.3 // @version 1.14.4.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -12,12 +12,22 @@
// @include https://sys.4chan.org/* // @include https://sys.4chan.org/*
// @include http://www.4chan.org/* // @include http://www.4chan.org/*
// @include https://www.4chan.org/* // @include https://www.4chan.org/*
// @include http://boards.4channel.org/*
// @include https://boards.4channel.org/*
// @include http://sys.4channel.org/*
// @include https://sys.4channel.org/*
// @include http://www.4channel.org/*
// @include https://www.4channel.org/*
// @include http://i.4cdn.org/* // @include http://i.4cdn.org/*
// @include https://i.4cdn.org/* // @include https://i.4cdn.org/*
// @include http://is.4chan.org/* // @include http://is.4chan.org/*
// @include https://is.4chan.org/* // @include https://is.4chan.org/*
// @include http://is2.4chan.org/* // @include http://is2.4chan.org/*
// @include https://is2.4chan.org/* // @include https://is2.4chan.org/*
// @include http://is.4channel.org/*
// @include https://is.4channel.org/*
// @include http://is2.4channel.org/*
// @include https://is2.4channel.org/*
// @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&* // @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&*
@ -36,7 +46,20 @@
// @exclude https://www.4chan.org/donate // @exclude https://www.4chan.org/donate
// @exclude http://www.4chan.org/donate?* // @exclude http://www.4chan.org/donate?*
// @exclude https://www.4chan.org/donate?* // @exclude https://www.4chan.org/donate?*
// @exclude http://www.4channel.org/pass
// @exclude https://www.4channel.org/pass
// @exclude http://www.4channel.org/pass?*
// @exclude https://www.4channel.org/pass?*
// @exclude http://www.4channel.org/advertise
// @exclude https://www.4channel.org/advertise
// @exclude http://www.4channel.org/advertise?*
// @exclude https://www.4channel.org/advertise?*
// @exclude http://www.4channel.org/donate
// @exclude https://www.4channel.org/donate
// @exclude http://www.4channel.org/donate?*
// @exclude https://www.4channel.org/donate?*
// @connect 4chan.org // @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org // @connect 4cdn.org
// @connect mayhemydg.github.io // @connect mayhemydg.github.io
// @connect archive.4plebs.org // @connect archive.4plebs.org

142
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.4.3 // @version 1.14.4.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -12,12 +12,22 @@
// @include https://sys.4chan.org/* // @include https://sys.4chan.org/*
// @include http://www.4chan.org/* // @include http://www.4chan.org/*
// @include https://www.4chan.org/* // @include https://www.4chan.org/*
// @include http://boards.4channel.org/*
// @include https://boards.4channel.org/*
// @include http://sys.4channel.org/*
// @include https://sys.4channel.org/*
// @include http://www.4channel.org/*
// @include https://www.4channel.org/*
// @include http://i.4cdn.org/* // @include http://i.4cdn.org/*
// @include https://i.4cdn.org/* // @include https://i.4cdn.org/*
// @include http://is.4chan.org/* // @include http://is.4chan.org/*
// @include https://is.4chan.org/* // @include https://is.4chan.org/*
// @include http://is2.4chan.org/* // @include http://is2.4chan.org/*
// @include https://is2.4chan.org/* // @include https://is2.4chan.org/*
// @include http://is.4channel.org/*
// @include https://is.4channel.org/*
// @include http://is2.4channel.org/*
// @include https://is2.4channel.org/*
// @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&* // @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&*
@ -36,7 +46,20 @@
// @exclude https://www.4chan.org/donate // @exclude https://www.4chan.org/donate
// @exclude http://www.4chan.org/donate?* // @exclude http://www.4chan.org/donate?*
// @exclude https://www.4chan.org/donate?* // @exclude https://www.4chan.org/donate?*
// @exclude http://www.4channel.org/pass
// @exclude https://www.4channel.org/pass
// @exclude http://www.4channel.org/pass?*
// @exclude https://www.4channel.org/pass?*
// @exclude http://www.4channel.org/advertise
// @exclude https://www.4channel.org/advertise
// @exclude http://www.4channel.org/advertise?*
// @exclude https://www.4channel.org/advertise?*
// @exclude http://www.4channel.org/donate
// @exclude https://www.4channel.org/donate
// @exclude http://www.4channel.org/donate?*
// @exclude https://www.4channel.org/donate?*
// @connect 4chan.org // @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org // @connect 4cdn.org
// @connect mayhemydg.github.io // @connect mayhemydg.github.io
// @connect archive.4plebs.org // @connect archive.4plebs.org
@ -175,7 +198,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.4.3', VERSION: '1.14.4.4',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -531,7 +554,7 @@ Config = (function() {
'thread-watcher.position': 'top: 50px; left: 0px;', 'thread-watcher.position': 'top: 50px; left: 0px;',
'qr.position': 'top: 50px; right: 0px;' 'qr.position': 'top: 50px; right: 0px;'
}, },
siteSoftware: "4chan.org yotsuba\n4cdn.org yotsuba" siteSoftware: "4chan.org yotsuba\n4channel.org yotsuba\n4cdn.org yotsuba"
}; };
return Config; return Config;
@ -7404,7 +7427,7 @@ SW = {};
postContainer: 'div[contains(@class,"postContainer")]' postContainer: 'div[contains(@class,"postContainer")]'
}, },
regexp: { regexp: {
quotelink: /^https?:\/\/boards\.4chan\.org\/+([^\/]+)\/+thread\/+(\d+)(?:[\/?][^#]*)?(?:#p(\d+))?$/ quotelink: /^https?:\/\/boards\.4chan(?:nel)?\.org\/+([^\/]+)\/+thread\/+(\d+)(?:[\/?][^#]*)?(?:#p(\d+))?$/
}, },
bgColoredEl: function() { bgColoredEl: function() {
return $.el('div', { return $.el('div', {
@ -7412,8 +7435,8 @@ SW = {};
}); });
}, },
isThisPageLegit: function() { isThisPageLegit: function() {
var ref; var ref, ref1;
return location.hostname === 'boards.4chan.org' && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out' && ref !== 'MathJax Equation Source'); return ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref1 = d.title) !== '4chan - Temporarily Offline' && ref1 !== '4chan - Error' && ref1 !== '504 Gateway Time-out' && ref1 !== 'MathJax Equation Source');
}, },
is404: function() { is404: function() {
var ref; var ref;
@ -7424,7 +7447,8 @@ SW = {};
return ((ref = g.VIEW) === 'index' || ref === 'thread') && !$('.board + *'); return ((ref = g.VIEW) === 'index' || ref === 'thread') && !$('.board + *');
}, },
isAuxiliaryPage: function() { isAuxiliaryPage: function() {
return location.hostname !== 'boards.4chan.org'; var ref;
return (ref = location.hostname) !== 'boards.4chan.org' && ref !== 'boards.4channel.org';
}, },
scriptData: function() { scriptData: function() {
var j, len, ref, script; var j, len, ref, script;
@ -8986,6 +9010,13 @@ BoardConfig = (function() {
} }
return results; return results;
}, },
isSFW: function(board) {
var ref;
return !!((ref = (this.boards || Conf['boardConfig'].boards)[board]) != null ? ref.ws_board : void 0);
},
domain: function(board) {
return "boards." + (BoardConfig.isSFW(board) ? '4channel' : '4chan') + ".org";
},
noAudio: function(boardID) { noAudio: function(boardID) {
var boards; var boards;
if (Site.software !== 'yotsuba') { if (Site.software !== 'yotsuba') {
@ -9650,7 +9681,7 @@ Header = (function() {
return CatalogLinks.setLinks(list); return CatalogLinks.setLinks(list);
}, },
mapCustomNavigation: function(t) { mapCustomNavigation: function(t) {
var a, boardID, href, indexOptions, m, text, url; var a, boardID, href, indexOptions, m, ref, ref1, text, url;
if (/^[^\w@]/.test(t)) { if (/^[^\w@]/.test(t)) {
return $.tn(t); return $.tn(t);
} }
@ -9685,7 +9716,7 @@ Header = (function() {
} }
boardID = t.split('-')[0]; boardID = t.split('-')[0];
if (boardID === 'current') { if (boardID === 'current') {
if (location.hostname === 'boards.4chan.org') { if ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
boardID = g.BOARD.ID; boardID = g.BOARD.ID;
} else { } else {
a = $.el('a', { a = $.el('a', {
@ -9700,7 +9731,7 @@ Header = (function() {
} }
} }
a = (function() { a = (function() {
var ref; var ref1;
if (boardID === '@') { if (boardID === '@') {
return $.el('a', { return $.el('a', {
href: 'https://twitter.com/4chan', href: 'https://twitter.com/4chan',
@ -9709,11 +9740,11 @@ Header = (function() {
}); });
} }
a = $.el('a', { a = $.el('a', {
href: "//boards.4chan.org/" + boardID + "/", href: "//" + (BoardConfig.domain(boardID)) + "/" + boardID + "/",
textContent: boardID, textContent: boardID,
title: BoardConfig.title(boardID) title: BoardConfig.title(boardID)
}); });
if ((ref = g.VIEW) === 'catalog' || ref === 'archive') { if ((ref1 = g.VIEW) === 'catalog' || ref1 === 'archive') {
a.href += g.VIEW; a.href += g.VIEW;
} }
if (a.hostname === location.hostname && boardID === g.BOARD.ID) { if (a.hostname === location.hostname && boardID === g.BOARD.ID) {
@ -9735,7 +9766,7 @@ Header = (function() {
} }
if (Conf['JSON Index'] && indexOptions) { if (Conf['JSON Index'] && indexOptions) {
a.dataset.indexOptions = indexOptions; a.dataset.indexOptions = indexOptions;
if (a.hostname === 'boards.4chan.org' && a.pathname.split('/')[2] === '') { if (((ref1 = a.hostname) === 'boards.4chan.org' || ref1 === 'boards.4channel.org') && a.pathname.split('/')[2] === '') {
a.href += (a.hash ? '/' : '#') + indexOptions; a.href += (a.hash ? '/' : '#') + indexOptions;
} }
} }
@ -9750,7 +9781,7 @@ Header = (function() {
} }
if (/-expired/.test(t)) { if (/-expired/.test(t)) {
if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash' && boardID !== 'bant') { if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash' && boardID !== 'bant') {
a.href = "//boards.4chan.org/" + boardID + "/archive"; a.href = "//" + (BoardConfig.domain(boardID)) + "/" + boardID + "/archive";
} else { } else {
return a.firstChild; return a.firstChild;
} }
@ -11578,7 +11609,7 @@ Settings = (function() {
if ($.cantSync) { if ($.cantSync) {
why = $.cantSet ? 'save your settings' : 'synchronize settings between tabs'; why = $.cantSet ? 'save your settings' : 'synchronize settings between tabs';
return cb($.el('li', { return cb($.el('li', {
textContent: "4chan X needs local storage to " + why + ".\nEnable it on boards.4chan.org in your browser's privacy settings (may be listed as part of \"local data\" or \"cookies\")." textContent: "4chan X needs local storage to " + why + ".\nEnable it on boards." + (location.hostname.split('.')[1]) + ".org in your browser's privacy settings (may be listed as part of \"local data\" or \"cookies\")."
})); }));
} }
}, },
@ -12155,6 +12186,11 @@ Settings = (function() {
set('sauces', data['sauces'].replace(/^(#?\s*)https:\/\/whatanime\.ga\//mg, '$1https://trace.moe/')); set('sauces', data['sauces'].replace(/^(#?\s*)https:\/\/whatanime\.ga\//mg, '$1https://trace.moe/'));
} }
} }
if (compareString < '00001.00014.00004.00004') {
if ((data['siteSoftware'] != null) && !/^4channel\.org yotsuba$/m.test(data['siteSoftware'])) {
set('siteSoftware', data['siteSoftware'] + '\n4channel.org yotsuba');
}
}
return changes; return changes;
}, },
loadSettings: function(data, cb) { loadSettings: function(data, cb) {
@ -14185,7 +14221,7 @@ ImageHost = (function() {
test: function(hostname) { test: function(hostname) {
return hostname === 'i.4cdn.org' || ImageHost.regex.test(hostname); return hostname === 'i.4cdn.org' || ImageHost.regex.test(hostname);
}, },
regex: /^is\d*\.4chan\.org$/, regex: /^is\d*\.4chan(?:nel)?\.org$/,
node: function() { node: function() {
var host; var host;
if (this.isClone) { if (this.isClone) {
@ -16334,7 +16370,7 @@ ReportLink = (function() {
el: a, el: a,
order: 10, order: 10,
open: function(post) { open: function(post) {
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post; ReportLink.url = "//sys." + (location.hostname.split('.')[1]) + ".org/" + post.board + "/imgboard.php?mode=report&no=" + post;
if (d.cookie.indexOf('pass_enabled=1') >= 0) { if (d.cookie.indexOf('pass_enabled=1') >= 0) {
ReportLink.dims = 'width=350,height=275'; ReportLink.dims = 'width=350,height=275';
} else { } else {
@ -16642,8 +16678,8 @@ CatalogLinks = (function() {
ref = $$('a', this.nodes.comment); ref = $$('a', this.nodes.comment);
for (i = 0, len = ref.length; i < len; i++) { for (i = 0, len = ref.length; i < len; i++) {
a = ref[i]; a = ref[i];
if (m = a.href.match(/^https?:\/\/boards\.4chan\.org\/([^\/]+)\/catalog(#s=.*)?/)) { if (m = a.href.match(/^https?:\/\/boards\.4chan(?:nel)?\.org\/([^\/]+)\/catalog(#s=.*)?/)) {
a.href = "//boards.4chan.org/" + m[1] + "/" + (m[2] || '#catalog'); a.href = "//boards.4chan(?:nel)?.org/" + m[1] + "/" + (m[2] || '#catalog');
} }
} }
}, },
@ -16660,50 +16696,52 @@ CatalogLinks = (function() {
return $('input', CatalogLinks.el).checked = useCatalog; return $('input', CatalogLinks.el).checked = useCatalog;
}, },
setLinks: function(list) { setLinks: function(list) {
var a, board, i, len, ref, ref1, ref2; var a, board, i, len, ref, ref1, ref2, ref3;
if (!(((ref = CatalogLinks.enabled) != null ? ref : Conf['Catalog Links']) && list)) { if (!(((ref = CatalogLinks.enabled) != null ? ref : Conf['Catalog Links']) && list)) {
return; return;
} }
ref1 = $$('a:not([data-only])', list); ref1 = $$('a:not([data-only])', list);
for (i = 0, len = ref1.length; i < len; i++) { for (i = 0, len = ref1.length; i < len; i++) {
a = ref1[i]; a = ref1[i];
if (((ref2 = a.hostname) !== 'boards.4chan.org' && ref2 !== 'catalog.neet.tv') || !(board = a.pathname.split('/')[1]) || (board === 'f' || board === 'status' || board === '4chan') || a.pathname.split('/')[2] === 'archive' || $.hasClass(a, 'external')) { if (((ref2 = a.hostname) !== 'boards.4chan.org' && ref2 !== 'boards.4channel.org' && ref2 !== 'catalog.neet.tv') || !(board = a.pathname.split('/')[1]) || (board === 'f' || board === 'status' || board === '4chan') || a.pathname.split('/')[2] === 'archive' || $.hasClass(a, 'external')) {
continue; continue;
} }
a.href = Conf['Header catalog links'] ? CatalogLinks.catalog(board) : "//boards.4chan.org/" + board + "/"; a.href = Conf['Header catalog links'] ? CatalogLinks.catalog(board) : "//" + (BoardConfig.domain(board)) + "/" + board + "/";
if (a.dataset.indexOptions && a.hostname === 'boards.4chan.org' && a.pathname.split('/')[2] === '') { if (a.dataset.indexOptions && ((ref3 = a.hostname) === 'boards.4chan.org' || ref3 === 'boards.4channel.org') && a.pathname.split('/')[2] === '') {
a.href += (a.hash ? '/' : '#') + a.dataset.indexOptions; a.href += (a.hash ? '/' : '#') + a.dataset.indexOptions;
} }
} }
}, },
catalog: function(board) { catalog: function(board) {
var ref;
if (board == null) { if (board == null) {
board = g.BOARD.ID; board = g.BOARD.ID;
} }
if (Conf['External Catalog'] && (board === 'a' || board === 'c' || board === 'g' || board === 'biz' || board === 'k' || board === 'm' || board === 'o' || board === 'p' || board === 'v' || board === 'vg' || board === 'vr' || board === 'w' || board === 'wg' || board === 'cm' || board === '3' || board === 'adv' || board === 'an' || board === 'asp' || board === 'cgl' || board === 'ck' || board === 'co' || board === 'diy' || board === 'fa' || board === 'fit' || board === 'gd' || board === 'int' || board === 'jp' || board === 'lit' || board === 'mlp' || board === 'mu' || board === 'n' || board === 'out' || board === 'po' || board === 'sci' || board === 'sp' || board === 'tg' || board === 'toy' || board === 'trv' || board === 'tv' || board === 'vp' || board === 'wsg' || board === 'x' || board === 'f' || board === 'pol' || board === 's4s' || board === 'lgbt')) { if (Conf['External Catalog'] && (board === 'a' || board === 'c' || board === 'g' || board === 'biz' || board === 'k' || board === 'm' || board === 'o' || board === 'p' || board === 'v' || board === 'vg' || board === 'vr' || board === 'w' || board === 'wg' || board === 'cm' || board === '3' || board === 'adv' || board === 'an' || board === 'asp' || board === 'cgl' || board === 'ck' || board === 'co' || board === 'diy' || board === 'fa' || board === 'fit' || board === 'gd' || board === 'int' || board === 'jp' || board === 'lit' || board === 'mlp' || board === 'mu' || board === 'n' || board === 'out' || board === 'po' || board === 'sci' || board === 'sp' || board === 'tg' || board === 'toy' || board === 'trv' || board === 'tv' || board === 'vp' || board === 'wsg' || board === 'x' || board === 'f' || board === 'pol' || board === 's4s' || board === 'lgbt')) {
return "//catalog.neet.tv/" + board + "/"; return "//catalog.neet.tv/" + board + "/";
} else if (Conf['JSON Index'] && Conf['Use 4chan X Catalog']) { } else if (Conf['JSON Index'] && Conf['Use 4chan X Catalog']) {
if (location.hostname === 'boards.4chan.org' && g.BOARD.ID === board && g.VIEW === 'index') { if (((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && g.BOARD.ID === board && g.VIEW === 'index') {
return '#catalog'; return '#catalog';
} else { } else {
return "//boards.4chan.org/" + board + "/#catalog"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/#catalog";
} }
} else { } else {
return "//boards.4chan.org/" + board + "/catalog"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/catalog";
} }
}, },
index: function(board) { index: function(board) {
var ref;
if (board == null) { if (board == null) {
board = g.BOARD.ID; board = g.BOARD.ID;
} }
if (Conf['JSON Index'] && board !== 'f') { if (Conf['JSON Index'] && board !== 'f') {
if (location.hostname === 'boards.4chan.org' && g.BOARD.ID === board && g.VIEW === 'index') { if (((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && g.BOARD.ID === board && g.VIEW === 'index') {
return '#index'; return '#index';
} else { } else {
return "//boards.4chan.org/" + board + "/#index"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/#index";
} }
} else { } else {
return "//boards.4chan.org/" + board + "/"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/";
} }
} }
}; };
@ -21013,14 +21051,17 @@ Captcha = {};
return $.on(d, 'keydown', this.keybinds.bind(this)); return $.on(d, 'keydown', this.keybinds.bind(this));
}, },
initNoscript: function() { initNoscript: function() {
var data, ref, token; var data, form, ref, token;
this.noscript = true; this.noscript = true;
form = $('.fbc-imageselect-challenge > form');
data = (token = (ref = $('.fbc-verification-token > textarea')) != null ? ref.value : void 0) ? { data = (token = (ref = $('.fbc-verification-token > textarea')) != null ? ref.value : void 0) ? {
token: token token: token
} : { } : $('.fbc-imageselect-challenge > form') ? {
working: true working: true
}; } : null;
new Connection(window.parent, '*').send(data); if (data) {
new Connection(window.parent, '*').send(data);
}
d.body.classList.toggle('focus', d.hasFocus()); d.body.classList.toggle('focus', d.hasFocus());
$.on(window, 'focus blur', function() { $.on(window, 'focus blur', function() {
return d.body.classList.toggle('focus', d.hasFocus()); return d.body.classList.toggle('focus', d.hasFocus());
@ -21033,7 +21074,7 @@ Captcha = {};
$.addStyle(this.cssNoscript); $.addStyle(this.cssNoscript);
this.addLabels(); this.addLabels();
$.on(d, 'keydown', this.keybinds.bind(this)); $.on(d, 'keydown', this.keybinds.bind(this));
return $.on($('.fbc-imageselect-challenge > form'), 'submit', this.checkForm.bind(this)); return $.on(form, 'submit', this.checkForm.bind(this));
}, },
fixImages: function() { fixImages: function() {
var img, j, len, ref; var img, j, len, ref;
@ -21153,6 +21194,7 @@ Captcha = {};
(function() { (function() {
Captcha.replace = { Captcha.replace = {
init: function() { init: function() {
var ref;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) { if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return; return;
} }
@ -21161,7 +21203,7 @@ Captcha = {};
return; return;
} }
if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) { if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) {
if (location.hostname === 'boards.4chan.org') { if ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
return $.onExists(doc, '#captchaFormPart', function(node) { return $.onExists(doc, '#captchaFormPart', function(node) {
return $.onExists(node, 'iframe', Captcha.replace.iframe); return $.onExists(node, 'iframe', Captcha.replace.iframe);
}); });
@ -21534,7 +21576,7 @@ PassLink = (function() {
innerHTML: "<a href=\"javascript:;\">4chan Pass</a>" innerHTML: "<a href=\"javascript:;\">4chan Pass</a>"
}); });
$.on(passLink.firstElementChild, 'click', function() { $.on(passLink.firstElementChild, 'click', function() {
return window.open('//sys.4chan.org/auth', Date.now(), 'width=500,height=280,toolbar=0'); return window.open("//sys." + (location.hostname.split('.')[1]) + ".org/auth", Date.now(), 'width=500,height=280,toolbar=0');
}); });
return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]); return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]);
} }
@ -24703,11 +24745,11 @@ Quotify = (function() {
} }
}, },
parseArchivelink: function(link) { parseArchivelink: function(link) {
var boardID, m, postID, threadID; var boardID, m, postID, ref, threadID;
if (!(m = link.pathname.match(/^\/([^\/]+)\/thread\/S?(\d+)\/?$/))) { if (!(m = link.pathname.match(/^\/([^\/]+)\/thread\/S?(\d+)\/?$/))) {
return; return;
} }
if (link.hostname === 'boards.4chan.org') { if ((ref = link.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
return; return;
} }
boardID = m[1]; boardID = m[1];
@ -24823,7 +24865,7 @@ Main = (function() {
Main = { Main = {
init: function() { init: function() {
var db, flatten, i, items, j, k, key, len, ref, ref1, w; var db, flatten, i, items, j, k, key, len, ref, ref1, ref2, w;
if (d.body && !$('title', d.head)) { if (d.body && !$('title', d.head)) {
return; return;
} }
@ -24884,7 +24926,7 @@ Main = (function() {
Conf[parent] = obj; Conf[parent] = obj;
} }
}; };
if (location.hostname === 'boards.4chan.org') { if ((ref1 = location.hostname) === 'boards.4chan.org' || ref1 === 'boards.4channel.org') {
$.global(function() { $.global(function() {
var fromCharCode0; var fromCharCode0;
fromCharCode0 = String.fromCharCode; fromCharCode0 = String.fromCharCode;
@ -24902,9 +24944,9 @@ Main = (function() {
}); });
} }
flatten(null, Config); flatten(null, Config);
ref1 = DataBoard.keys; ref2 = DataBoard.keys;
for (j = 0, len = ref1.length; j < len; j++) { for (j = 0, len = ref2.length; j < len; j++) {
db = ref1[j]; db = ref2[j];
Conf[db] = {}; Conf[db] = {};
} }
Conf['boardConfig'] = { Conf['boardConfig'] = {
@ -24924,7 +24966,7 @@ Main = (function() {
Conf['QR Shortcut'] = true; Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true; Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true; Conf['Toggleable Thread Watcher'] = true;
if (/\.4chan\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) { if (/\.4chan(?:nel)?\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) {
return /this\[/.test(s.textContent); return /this\[/.test(s.textContent);
}).length) { }).length) {
($.getSync || $.get)({ ($.getSync || $.get)({
@ -24941,13 +24983,13 @@ Main = (function() {
} }
items['previousversion'] = void 0; items['previousversion'] = void 0;
return ($.getSync || $.get)(items, function(items) { return ($.getSync || $.get)(items, function(items) {
var ref2; var ref3;
if (!$.perProtocolSettings && /\.4chan\.org$/.test(location.hostname) && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { if (!$.perProtocolSettings && /\.4chan(?:nel)?\.org$/.test(location.hostname) && ((ref3 = items['Redirect to HTTPS']) != null ? ref3 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
location.replace('https://' + location.host + location.pathname + location.search + location.hash); location.replace('https://' + location.host + location.pathname + location.search + location.hash);
return; return;
} }
return $.asap(docSet, function() { return $.asap(docSet, function() {
var ref3, val; var ref4, val;
if ($.cantSet) { if ($.cantSet) {
} else if (items.previousversion == null) { } else if (items.previousversion == null) {
@ -24960,7 +25002,7 @@ Main = (function() {
} }
for (key in Conf) { for (key in Conf) {
val = Conf[key]; val = Conf[key];
Conf[key] = (ref3 = items[key]) != null ? ref3 : val; Conf[key] = (ref4 = items[key]) != null ? ref4 : val;
} }
return Site.init(Main.initFeatures); return Site.init(Main.initFeatures);
}); });
@ -24985,7 +25027,7 @@ Main = (function() {
var err, feature, hostname, j, len, match, name, pathname, ref, ref1, ref2, search; var err, feature, hostname, j, len, match, name, pathname, ref, ref1, ref2, search;
hostname = location.hostname, search = location.search; hostname = location.hostname, search = location.search;
pathname = location.pathname.split(/\/+/); pathname = location.pathname.split(/\/+/);
if (hostname !== 'www.4chan.org') { if (hostname !== 'www.4chan.org' && hostname !== 'www.4channel.org') {
g.BOARD = new Board(pathname[1]); g.BOARD = new Board(pathname[1]);
} }
$.global(function() { $.global(function() {
@ -24995,12 +25037,14 @@ Main = (function() {
Main.jsEnabled = $.hasClass(doc, 'js-enabled'); Main.jsEnabled = $.hasClass(doc, 'js-enabled');
switch (hostname) { switch (hostname) {
case 'www.4chan.org': case 'www.4chan.org':
case 'www.4channel.org':
$.onExists(doc, 'body', function() { $.onExists(doc, 'body', function() {
return $.addStyle(CSS.www); return $.addStyle(CSS.www);
}); });
Captcha.replace.init(); Captcha.replace.init();
return; return;
case 'sys.4chan.org': case 'sys.4chan.org':
case 'sys.4channel.org':
if (pathname[2] === 'imgboard.php') { if (pathname[2] === 'imgboard.php') {
if (/\bmode=report\b/.test(search)) { if (/\bmode=report\b/.test(search)) {
Report.init(); Report.init();

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

Binary file not shown.

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.4.3 // @version 1.14.4.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -12,12 +12,22 @@
// @include https://sys.4chan.org/* // @include https://sys.4chan.org/*
// @include http://www.4chan.org/* // @include http://www.4chan.org/*
// @include https://www.4chan.org/* // @include https://www.4chan.org/*
// @include http://boards.4channel.org/*
// @include https://boards.4channel.org/*
// @include http://sys.4channel.org/*
// @include https://sys.4channel.org/*
// @include http://www.4channel.org/*
// @include https://www.4channel.org/*
// @include http://i.4cdn.org/* // @include http://i.4cdn.org/*
// @include https://i.4cdn.org/* // @include https://i.4cdn.org/*
// @include http://is.4chan.org/* // @include http://is.4chan.org/*
// @include https://is.4chan.org/* // @include https://is.4chan.org/*
// @include http://is2.4chan.org/* // @include http://is2.4chan.org/*
// @include https://is2.4chan.org/* // @include https://is2.4chan.org/*
// @include http://is.4channel.org/*
// @include https://is.4channel.org/*
// @include http://is2.4channel.org/*
// @include https://is2.4channel.org/*
// @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&* // @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&*
@ -36,7 +46,20 @@
// @exclude https://www.4chan.org/donate // @exclude https://www.4chan.org/donate
// @exclude http://www.4chan.org/donate?* // @exclude http://www.4chan.org/donate?*
// @exclude https://www.4chan.org/donate?* // @exclude https://www.4chan.org/donate?*
// @exclude http://www.4channel.org/pass
// @exclude https://www.4channel.org/pass
// @exclude http://www.4channel.org/pass?*
// @exclude https://www.4channel.org/pass?*
// @exclude http://www.4channel.org/advertise
// @exclude https://www.4channel.org/advertise
// @exclude http://www.4channel.org/advertise?*
// @exclude https://www.4channel.org/advertise?*
// @exclude http://www.4channel.org/donate
// @exclude https://www.4channel.org/donate
// @exclude http://www.4channel.org/donate?*
// @exclude https://www.4channel.org/donate?*
// @connect 4chan.org // @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org // @connect 4cdn.org
// @connect mayhemydg.github.io // @connect mayhemydg.github.io
// @connect archive.4plebs.org // @connect archive.4plebs.org
@ -175,7 +198,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.4.3', VERSION: '1.14.4.4',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -531,7 +554,7 @@ Config = (function() {
'thread-watcher.position': 'top: 50px; left: 0px;', 'thread-watcher.position': 'top: 50px; left: 0px;',
'qr.position': 'top: 50px; right: 0px;' 'qr.position': 'top: 50px; right: 0px;'
}, },
siteSoftware: "4chan.org yotsuba\n4cdn.org yotsuba" siteSoftware: "4chan.org yotsuba\n4channel.org yotsuba\n4cdn.org yotsuba"
}; };
return Config; return Config;
@ -7404,7 +7427,7 @@ SW = {};
postContainer: 'div[contains(@class,"postContainer")]' postContainer: 'div[contains(@class,"postContainer")]'
}, },
regexp: { regexp: {
quotelink: /^https?:\/\/boards\.4chan\.org\/+([^\/]+)\/+thread\/+(\d+)(?:[\/?][^#]*)?(?:#p(\d+))?$/ quotelink: /^https?:\/\/boards\.4chan(?:nel)?\.org\/+([^\/]+)\/+thread\/+(\d+)(?:[\/?][^#]*)?(?:#p(\d+))?$/
}, },
bgColoredEl: function() { bgColoredEl: function() {
return $.el('div', { return $.el('div', {
@ -7412,8 +7435,8 @@ SW = {};
}); });
}, },
isThisPageLegit: function() { isThisPageLegit: function() {
var ref; var ref, ref1;
return location.hostname === 'boards.4chan.org' && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out' && ref !== 'MathJax Equation Source'); return ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref1 = d.title) !== '4chan - Temporarily Offline' && ref1 !== '4chan - Error' && ref1 !== '504 Gateway Time-out' && ref1 !== 'MathJax Equation Source');
}, },
is404: function() { is404: function() {
var ref; var ref;
@ -7424,7 +7447,8 @@ SW = {};
return ((ref = g.VIEW) === 'index' || ref === 'thread') && !$('.board + *'); return ((ref = g.VIEW) === 'index' || ref === 'thread') && !$('.board + *');
}, },
isAuxiliaryPage: function() { isAuxiliaryPage: function() {
return location.hostname !== 'boards.4chan.org'; var ref;
return (ref = location.hostname) !== 'boards.4chan.org' && ref !== 'boards.4channel.org';
}, },
scriptData: function() { scriptData: function() {
var j, len, ref, script; var j, len, ref, script;
@ -8986,6 +9010,13 @@ BoardConfig = (function() {
} }
return results; return results;
}, },
isSFW: function(board) {
var ref;
return !!((ref = (this.boards || Conf['boardConfig'].boards)[board]) != null ? ref.ws_board : void 0);
},
domain: function(board) {
return "boards." + (BoardConfig.isSFW(board) ? '4channel' : '4chan') + ".org";
},
noAudio: function(boardID) { noAudio: function(boardID) {
var boards; var boards;
if (Site.software !== 'yotsuba') { if (Site.software !== 'yotsuba') {
@ -9650,7 +9681,7 @@ Header = (function() {
return CatalogLinks.setLinks(list); return CatalogLinks.setLinks(list);
}, },
mapCustomNavigation: function(t) { mapCustomNavigation: function(t) {
var a, boardID, href, indexOptions, m, text, url; var a, boardID, href, indexOptions, m, ref, ref1, text, url;
if (/^[^\w@]/.test(t)) { if (/^[^\w@]/.test(t)) {
return $.tn(t); return $.tn(t);
} }
@ -9685,7 +9716,7 @@ Header = (function() {
} }
boardID = t.split('-')[0]; boardID = t.split('-')[0];
if (boardID === 'current') { if (boardID === 'current') {
if (location.hostname === 'boards.4chan.org') { if ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
boardID = g.BOARD.ID; boardID = g.BOARD.ID;
} else { } else {
a = $.el('a', { a = $.el('a', {
@ -9700,7 +9731,7 @@ Header = (function() {
} }
} }
a = (function() { a = (function() {
var ref; var ref1;
if (boardID === '@') { if (boardID === '@') {
return $.el('a', { return $.el('a', {
href: 'https://twitter.com/4chan', href: 'https://twitter.com/4chan',
@ -9709,11 +9740,11 @@ Header = (function() {
}); });
} }
a = $.el('a', { a = $.el('a', {
href: "//boards.4chan.org/" + boardID + "/", href: "//" + (BoardConfig.domain(boardID)) + "/" + boardID + "/",
textContent: boardID, textContent: boardID,
title: BoardConfig.title(boardID) title: BoardConfig.title(boardID)
}); });
if ((ref = g.VIEW) === 'catalog' || ref === 'archive') { if ((ref1 = g.VIEW) === 'catalog' || ref1 === 'archive') {
a.href += g.VIEW; a.href += g.VIEW;
} }
if (a.hostname === location.hostname && boardID === g.BOARD.ID) { if (a.hostname === location.hostname && boardID === g.BOARD.ID) {
@ -9735,7 +9766,7 @@ Header = (function() {
} }
if (Conf['JSON Index'] && indexOptions) { if (Conf['JSON Index'] && indexOptions) {
a.dataset.indexOptions = indexOptions; a.dataset.indexOptions = indexOptions;
if (a.hostname === 'boards.4chan.org' && a.pathname.split('/')[2] === '') { if (((ref1 = a.hostname) === 'boards.4chan.org' || ref1 === 'boards.4channel.org') && a.pathname.split('/')[2] === '') {
a.href += (a.hash ? '/' : '#') + indexOptions; a.href += (a.hash ? '/' : '#') + indexOptions;
} }
} }
@ -9750,7 +9781,7 @@ Header = (function() {
} }
if (/-expired/.test(t)) { if (/-expired/.test(t)) {
if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash' && boardID !== 'bant') { if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash' && boardID !== 'bant') {
a.href = "//boards.4chan.org/" + boardID + "/archive"; a.href = "//" + (BoardConfig.domain(boardID)) + "/" + boardID + "/archive";
} else { } else {
return a.firstChild; return a.firstChild;
} }
@ -11578,7 +11609,7 @@ Settings = (function() {
if ($.cantSync) { if ($.cantSync) {
why = $.cantSet ? 'save your settings' : 'synchronize settings between tabs'; why = $.cantSet ? 'save your settings' : 'synchronize settings between tabs';
return cb($.el('li', { return cb($.el('li', {
textContent: "4chan X needs local storage to " + why + ".\nEnable it on boards.4chan.org in your browser's privacy settings (may be listed as part of \"local data\" or \"cookies\")." textContent: "4chan X needs local storage to " + why + ".\nEnable it on boards." + (location.hostname.split('.')[1]) + ".org in your browser's privacy settings (may be listed as part of \"local data\" or \"cookies\")."
})); }));
} }
}, },
@ -12155,6 +12186,11 @@ Settings = (function() {
set('sauces', data['sauces'].replace(/^(#?\s*)https:\/\/whatanime\.ga\//mg, '$1https://trace.moe/')); set('sauces', data['sauces'].replace(/^(#?\s*)https:\/\/whatanime\.ga\//mg, '$1https://trace.moe/'));
} }
} }
if (compareString < '00001.00014.00004.00004') {
if ((data['siteSoftware'] != null) && !/^4channel\.org yotsuba$/m.test(data['siteSoftware'])) {
set('siteSoftware', data['siteSoftware'] + '\n4channel.org yotsuba');
}
}
return changes; return changes;
}, },
loadSettings: function(data, cb) { loadSettings: function(data, cb) {
@ -14185,7 +14221,7 @@ ImageHost = (function() {
test: function(hostname) { test: function(hostname) {
return hostname === 'i.4cdn.org' || ImageHost.regex.test(hostname); return hostname === 'i.4cdn.org' || ImageHost.regex.test(hostname);
}, },
regex: /^is\d*\.4chan\.org$/, regex: /^is\d*\.4chan(?:nel)?\.org$/,
node: function() { node: function() {
var host; var host;
if (this.isClone) { if (this.isClone) {
@ -16334,7 +16370,7 @@ ReportLink = (function() {
el: a, el: a,
order: 10, order: 10,
open: function(post) { open: function(post) {
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post; ReportLink.url = "//sys." + (location.hostname.split('.')[1]) + ".org/" + post.board + "/imgboard.php?mode=report&no=" + post;
if (d.cookie.indexOf('pass_enabled=1') >= 0) { if (d.cookie.indexOf('pass_enabled=1') >= 0) {
ReportLink.dims = 'width=350,height=275'; ReportLink.dims = 'width=350,height=275';
} else { } else {
@ -16642,8 +16678,8 @@ CatalogLinks = (function() {
ref = $$('a', this.nodes.comment); ref = $$('a', this.nodes.comment);
for (i = 0, len = ref.length; i < len; i++) { for (i = 0, len = ref.length; i < len; i++) {
a = ref[i]; a = ref[i];
if (m = a.href.match(/^https?:\/\/boards\.4chan\.org\/([^\/]+)\/catalog(#s=.*)?/)) { if (m = a.href.match(/^https?:\/\/boards\.4chan(?:nel)?\.org\/([^\/]+)\/catalog(#s=.*)?/)) {
a.href = "//boards.4chan.org/" + m[1] + "/" + (m[2] || '#catalog'); a.href = "//boards.4chan(?:nel)?.org/" + m[1] + "/" + (m[2] || '#catalog');
} }
} }
}, },
@ -16660,50 +16696,52 @@ CatalogLinks = (function() {
return $('input', CatalogLinks.el).checked = useCatalog; return $('input', CatalogLinks.el).checked = useCatalog;
}, },
setLinks: function(list) { setLinks: function(list) {
var a, board, i, len, ref, ref1, ref2; var a, board, i, len, ref, ref1, ref2, ref3;
if (!(((ref = CatalogLinks.enabled) != null ? ref : Conf['Catalog Links']) && list)) { if (!(((ref = CatalogLinks.enabled) != null ? ref : Conf['Catalog Links']) && list)) {
return; return;
} }
ref1 = $$('a:not([data-only])', list); ref1 = $$('a:not([data-only])', list);
for (i = 0, len = ref1.length; i < len; i++) { for (i = 0, len = ref1.length; i < len; i++) {
a = ref1[i]; a = ref1[i];
if (((ref2 = a.hostname) !== 'boards.4chan.org' && ref2 !== 'catalog.neet.tv') || !(board = a.pathname.split('/')[1]) || (board === 'f' || board === 'status' || board === '4chan') || a.pathname.split('/')[2] === 'archive' || $.hasClass(a, 'external')) { if (((ref2 = a.hostname) !== 'boards.4chan.org' && ref2 !== 'boards.4channel.org' && ref2 !== 'catalog.neet.tv') || !(board = a.pathname.split('/')[1]) || (board === 'f' || board === 'status' || board === '4chan') || a.pathname.split('/')[2] === 'archive' || $.hasClass(a, 'external')) {
continue; continue;
} }
a.href = Conf['Header catalog links'] ? CatalogLinks.catalog(board) : "//boards.4chan.org/" + board + "/"; a.href = Conf['Header catalog links'] ? CatalogLinks.catalog(board) : "//" + (BoardConfig.domain(board)) + "/" + board + "/";
if (a.dataset.indexOptions && a.hostname === 'boards.4chan.org' && a.pathname.split('/')[2] === '') { if (a.dataset.indexOptions && ((ref3 = a.hostname) === 'boards.4chan.org' || ref3 === 'boards.4channel.org') && a.pathname.split('/')[2] === '') {
a.href += (a.hash ? '/' : '#') + a.dataset.indexOptions; a.href += (a.hash ? '/' : '#') + a.dataset.indexOptions;
} }
} }
}, },
catalog: function(board) { catalog: function(board) {
var ref;
if (board == null) { if (board == null) {
board = g.BOARD.ID; board = g.BOARD.ID;
} }
if (Conf['External Catalog'] && (board === 'a' || board === 'c' || board === 'g' || board === 'biz' || board === 'k' || board === 'm' || board === 'o' || board === 'p' || board === 'v' || board === 'vg' || board === 'vr' || board === 'w' || board === 'wg' || board === 'cm' || board === '3' || board === 'adv' || board === 'an' || board === 'asp' || board === 'cgl' || board === 'ck' || board === 'co' || board === 'diy' || board === 'fa' || board === 'fit' || board === 'gd' || board === 'int' || board === 'jp' || board === 'lit' || board === 'mlp' || board === 'mu' || board === 'n' || board === 'out' || board === 'po' || board === 'sci' || board === 'sp' || board === 'tg' || board === 'toy' || board === 'trv' || board === 'tv' || board === 'vp' || board === 'wsg' || board === 'x' || board === 'f' || board === 'pol' || board === 's4s' || board === 'lgbt')) { if (Conf['External Catalog'] && (board === 'a' || board === 'c' || board === 'g' || board === 'biz' || board === 'k' || board === 'm' || board === 'o' || board === 'p' || board === 'v' || board === 'vg' || board === 'vr' || board === 'w' || board === 'wg' || board === 'cm' || board === '3' || board === 'adv' || board === 'an' || board === 'asp' || board === 'cgl' || board === 'ck' || board === 'co' || board === 'diy' || board === 'fa' || board === 'fit' || board === 'gd' || board === 'int' || board === 'jp' || board === 'lit' || board === 'mlp' || board === 'mu' || board === 'n' || board === 'out' || board === 'po' || board === 'sci' || board === 'sp' || board === 'tg' || board === 'toy' || board === 'trv' || board === 'tv' || board === 'vp' || board === 'wsg' || board === 'x' || board === 'f' || board === 'pol' || board === 's4s' || board === 'lgbt')) {
return "//catalog.neet.tv/" + board + "/"; return "//catalog.neet.tv/" + board + "/";
} else if (Conf['JSON Index'] && Conf['Use 4chan X Catalog']) { } else if (Conf['JSON Index'] && Conf['Use 4chan X Catalog']) {
if (location.hostname === 'boards.4chan.org' && g.BOARD.ID === board && g.VIEW === 'index') { if (((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && g.BOARD.ID === board && g.VIEW === 'index') {
return '#catalog'; return '#catalog';
} else { } else {
return "//boards.4chan.org/" + board + "/#catalog"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/#catalog";
} }
} else { } else {
return "//boards.4chan.org/" + board + "/catalog"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/catalog";
} }
}, },
index: function(board) { index: function(board) {
var ref;
if (board == null) { if (board == null) {
board = g.BOARD.ID; board = g.BOARD.ID;
} }
if (Conf['JSON Index'] && board !== 'f') { if (Conf['JSON Index'] && board !== 'f') {
if (location.hostname === 'boards.4chan.org' && g.BOARD.ID === board && g.VIEW === 'index') { if (((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && g.BOARD.ID === board && g.VIEW === 'index') {
return '#index'; return '#index';
} else { } else {
return "//boards.4chan.org/" + board + "/#index"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/#index";
} }
} else { } else {
return "//boards.4chan.org/" + board + "/"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/";
} }
} }
}; };
@ -21013,14 +21051,17 @@ Captcha = {};
return $.on(d, 'keydown', this.keybinds.bind(this)); return $.on(d, 'keydown', this.keybinds.bind(this));
}, },
initNoscript: function() { initNoscript: function() {
var data, ref, token; var data, form, ref, token;
this.noscript = true; this.noscript = true;
form = $('.fbc-imageselect-challenge > form');
data = (token = (ref = $('.fbc-verification-token > textarea')) != null ? ref.value : void 0) ? { data = (token = (ref = $('.fbc-verification-token > textarea')) != null ? ref.value : void 0) ? {
token: token token: token
} : { } : $('.fbc-imageselect-challenge > form') ? {
working: true working: true
}; } : null;
new Connection(window.parent, '*').send(data); if (data) {
new Connection(window.parent, '*').send(data);
}
d.body.classList.toggle('focus', d.hasFocus()); d.body.classList.toggle('focus', d.hasFocus());
$.on(window, 'focus blur', function() { $.on(window, 'focus blur', function() {
return d.body.classList.toggle('focus', d.hasFocus()); return d.body.classList.toggle('focus', d.hasFocus());
@ -21033,7 +21074,7 @@ Captcha = {};
$.addStyle(this.cssNoscript); $.addStyle(this.cssNoscript);
this.addLabels(); this.addLabels();
$.on(d, 'keydown', this.keybinds.bind(this)); $.on(d, 'keydown', this.keybinds.bind(this));
return $.on($('.fbc-imageselect-challenge > form'), 'submit', this.checkForm.bind(this)); return $.on(form, 'submit', this.checkForm.bind(this));
}, },
fixImages: function() { fixImages: function() {
var img, j, len, ref; var img, j, len, ref;
@ -21153,6 +21194,7 @@ Captcha = {};
(function() { (function() {
Captcha.replace = { Captcha.replace = {
init: function() { init: function() {
var ref;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) { if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return; return;
} }
@ -21161,7 +21203,7 @@ Captcha = {};
return; return;
} }
if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) { if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) {
if (location.hostname === 'boards.4chan.org') { if ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
return $.onExists(doc, '#captchaFormPart', function(node) { return $.onExists(doc, '#captchaFormPart', function(node) {
return $.onExists(node, 'iframe', Captcha.replace.iframe); return $.onExists(node, 'iframe', Captcha.replace.iframe);
}); });
@ -21534,7 +21576,7 @@ PassLink = (function() {
innerHTML: "<a href=\"javascript:;\">4chan Pass</a>" innerHTML: "<a href=\"javascript:;\">4chan Pass</a>"
}); });
$.on(passLink.firstElementChild, 'click', function() { $.on(passLink.firstElementChild, 'click', function() {
return window.open('//sys.4chan.org/auth', Date.now(), 'width=500,height=280,toolbar=0'); return window.open("//sys." + (location.hostname.split('.')[1]) + ".org/auth", Date.now(), 'width=500,height=280,toolbar=0');
}); });
return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]); return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]);
} }
@ -24703,11 +24745,11 @@ Quotify = (function() {
} }
}, },
parseArchivelink: function(link) { parseArchivelink: function(link) {
var boardID, m, postID, threadID; var boardID, m, postID, ref, threadID;
if (!(m = link.pathname.match(/^\/([^\/]+)\/thread\/S?(\d+)\/?$/))) { if (!(m = link.pathname.match(/^\/([^\/]+)\/thread\/S?(\d+)\/?$/))) {
return; return;
} }
if (link.hostname === 'boards.4chan.org') { if ((ref = link.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
return; return;
} }
boardID = m[1]; boardID = m[1];
@ -24823,7 +24865,7 @@ Main = (function() {
Main = { Main = {
init: function() { init: function() {
var db, flatten, i, items, j, k, key, len, ref, ref1, w; var db, flatten, i, items, j, k, key, len, ref, ref1, ref2, w;
if (d.body && !$('title', d.head)) { if (d.body && !$('title', d.head)) {
return; return;
} }
@ -24884,7 +24926,7 @@ Main = (function() {
Conf[parent] = obj; Conf[parent] = obj;
} }
}; };
if (location.hostname === 'boards.4chan.org') { if ((ref1 = location.hostname) === 'boards.4chan.org' || ref1 === 'boards.4channel.org') {
$.global(function() { $.global(function() {
var fromCharCode0; var fromCharCode0;
fromCharCode0 = String.fromCharCode; fromCharCode0 = String.fromCharCode;
@ -24902,9 +24944,9 @@ Main = (function() {
}); });
} }
flatten(null, Config); flatten(null, Config);
ref1 = DataBoard.keys; ref2 = DataBoard.keys;
for (j = 0, len = ref1.length; j < len; j++) { for (j = 0, len = ref2.length; j < len; j++) {
db = ref1[j]; db = ref2[j];
Conf[db] = {}; Conf[db] = {};
} }
Conf['boardConfig'] = { Conf['boardConfig'] = {
@ -24924,7 +24966,7 @@ Main = (function() {
Conf['QR Shortcut'] = true; Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true; Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true; Conf['Toggleable Thread Watcher'] = true;
if (/\.4chan\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) { if (/\.4chan(?:nel)?\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) {
return /this\[/.test(s.textContent); return /this\[/.test(s.textContent);
}).length) { }).length) {
($.getSync || $.get)({ ($.getSync || $.get)({
@ -24941,13 +24983,13 @@ Main = (function() {
} }
items['previousversion'] = void 0; items['previousversion'] = void 0;
return ($.getSync || $.get)(items, function(items) { return ($.getSync || $.get)(items, function(items) {
var ref2; var ref3;
if (!$.perProtocolSettings && /\.4chan\.org$/.test(location.hostname) && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { if (!$.perProtocolSettings && /\.4chan(?:nel)?\.org$/.test(location.hostname) && ((ref3 = items['Redirect to HTTPS']) != null ? ref3 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
location.replace('https://' + location.host + location.pathname + location.search + location.hash); location.replace('https://' + location.host + location.pathname + location.search + location.hash);
return; return;
} }
return $.asap(docSet, function() { return $.asap(docSet, function() {
var ref3, val; var ref4, val;
if ($.cantSet) { if ($.cantSet) {
} else if (items.previousversion == null) { } else if (items.previousversion == null) {
@ -24960,7 +25002,7 @@ Main = (function() {
} }
for (key in Conf) { for (key in Conf) {
val = Conf[key]; val = Conf[key];
Conf[key] = (ref3 = items[key]) != null ? ref3 : val; Conf[key] = (ref4 = items[key]) != null ? ref4 : val;
} }
return Site.init(Main.initFeatures); return Site.init(Main.initFeatures);
}); });
@ -24985,7 +25027,7 @@ Main = (function() {
var err, feature, hostname, j, len, match, name, pathname, ref, ref1, ref2, search; var err, feature, hostname, j, len, match, name, pathname, ref, ref1, ref2, search;
hostname = location.hostname, search = location.search; hostname = location.hostname, search = location.search;
pathname = location.pathname.split(/\/+/); pathname = location.pathname.split(/\/+/);
if (hostname !== 'www.4chan.org') { if (hostname !== 'www.4chan.org' && hostname !== 'www.4channel.org') {
g.BOARD = new Board(pathname[1]); g.BOARD = new Board(pathname[1]);
} }
$.global(function() { $.global(function() {
@ -24995,12 +25037,14 @@ Main = (function() {
Main.jsEnabled = $.hasClass(doc, 'js-enabled'); Main.jsEnabled = $.hasClass(doc, 'js-enabled');
switch (hostname) { switch (hostname) {
case 'www.4chan.org': case 'www.4chan.org':
case 'www.4channel.org':
$.onExists(doc, 'body', function() { $.onExists(doc, 'body', function() {
return $.addStyle(CSS.www); return $.addStyle(CSS.www);
}); });
Captcha.replace.init(); Captcha.replace.init();
return; return;
case 'sys.4chan.org': case 'sys.4chan.org':
case 'sys.4channel.org':
if (pathname[2] === 'imgboard.php') { if (pathname[2] === 'imgboard.php') {
if (/\bmode=report\b/.test(search)) { if (/\bmode=report\b/.test(search)) {
Report.init(); Report.init();

BIN
builds/4chan-X.crx
View File

Binary file not shown.

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.4.3 // @version 1.14.4.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -12,12 +12,22 @@
// @include https://sys.4chan.org/* // @include https://sys.4chan.org/*
// @include http://www.4chan.org/* // @include http://www.4chan.org/*
// @include https://www.4chan.org/* // @include https://www.4chan.org/*
// @include http://boards.4channel.org/*
// @include https://boards.4channel.org/*
// @include http://sys.4channel.org/*
// @include https://sys.4channel.org/*
// @include http://www.4channel.org/*
// @include https://www.4channel.org/*
// @include http://i.4cdn.org/* // @include http://i.4cdn.org/*
// @include https://i.4cdn.org/* // @include https://i.4cdn.org/*
// @include http://is.4chan.org/* // @include http://is.4chan.org/*
// @include https://is.4chan.org/* // @include https://is.4chan.org/*
// @include http://is2.4chan.org/* // @include http://is2.4chan.org/*
// @include https://is2.4chan.org/* // @include https://is2.4chan.org/*
// @include http://is.4channel.org/*
// @include https://is.4channel.org/*
// @include http://is2.4channel.org/*
// @include https://is2.4channel.org/*
// @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&* // @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&*
@ -36,7 +46,20 @@
// @exclude https://www.4chan.org/donate // @exclude https://www.4chan.org/donate
// @exclude http://www.4chan.org/donate?* // @exclude http://www.4chan.org/donate?*
// @exclude https://www.4chan.org/donate?* // @exclude https://www.4chan.org/donate?*
// @exclude http://www.4channel.org/pass
// @exclude https://www.4channel.org/pass
// @exclude http://www.4channel.org/pass?*
// @exclude https://www.4channel.org/pass?*
// @exclude http://www.4channel.org/advertise
// @exclude https://www.4channel.org/advertise
// @exclude http://www.4channel.org/advertise?*
// @exclude https://www.4channel.org/advertise?*
// @exclude http://www.4channel.org/donate
// @exclude https://www.4channel.org/donate
// @exclude http://www.4channel.org/donate?*
// @exclude https://www.4channel.org/donate?*
// @connect 4chan.org // @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org // @connect 4cdn.org
// @connect mayhemydg.github.io // @connect mayhemydg.github.io
// @connect archive.4plebs.org // @connect archive.4plebs.org

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

@ -1,6 +1,6 @@
// ==UserScript== // ==UserScript==
// @name 4chan X // @name 4chan X
// @version 1.14.4.3 // @version 1.14.4.4
// @minGMVer 1.14 // @minGMVer 1.14
// @minFFVer 26 // @minFFVer 26
// @namespace 4chan-X // @namespace 4chan-X
@ -12,12 +12,22 @@
// @include https://sys.4chan.org/* // @include https://sys.4chan.org/*
// @include http://www.4chan.org/* // @include http://www.4chan.org/*
// @include https://www.4chan.org/* // @include https://www.4chan.org/*
// @include http://boards.4channel.org/*
// @include https://boards.4channel.org/*
// @include http://sys.4channel.org/*
// @include https://sys.4channel.org/*
// @include http://www.4channel.org/*
// @include https://www.4channel.org/*
// @include http://i.4cdn.org/* // @include http://i.4cdn.org/*
// @include https://i.4cdn.org/* // @include https://i.4cdn.org/*
// @include http://is.4chan.org/* // @include http://is.4chan.org/*
// @include https://is.4chan.org/* // @include https://is.4chan.org/*
// @include http://is2.4chan.org/* // @include http://is2.4chan.org/*
// @include https://is2.4chan.org/* // @include https://is2.4chan.org/*
// @include http://is.4channel.org/*
// @include https://is.4channel.org/*
// @include http://is2.4channel.org/*
// @include https://is2.4channel.org/*
// @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/anchor?k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc* // @include https://www.google.com/recaptcha/api2/frame?*&k=6Ldp2bsSAAAAAAJ5uyx_lx34lJeEpTLVkP5k04qc*
// @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&* // @include https://www.google.com/recaptcha/api2/frame?*&k=887877714&*
@ -36,7 +46,20 @@
// @exclude https://www.4chan.org/donate // @exclude https://www.4chan.org/donate
// @exclude http://www.4chan.org/donate?* // @exclude http://www.4chan.org/donate?*
// @exclude https://www.4chan.org/donate?* // @exclude https://www.4chan.org/donate?*
// @exclude http://www.4channel.org/pass
// @exclude https://www.4channel.org/pass
// @exclude http://www.4channel.org/pass?*
// @exclude https://www.4channel.org/pass?*
// @exclude http://www.4channel.org/advertise
// @exclude https://www.4channel.org/advertise
// @exclude http://www.4channel.org/advertise?*
// @exclude https://www.4channel.org/advertise?*
// @exclude http://www.4channel.org/donate
// @exclude https://www.4channel.org/donate
// @exclude http://www.4channel.org/donate?*
// @exclude https://www.4channel.org/donate?*
// @connect 4chan.org // @connect 4chan.org
// @connect 4channel.org
// @connect 4cdn.org // @connect 4cdn.org
// @connect mayhemydg.github.io // @connect mayhemydg.github.io
// @connect archive.4plebs.org // @connect archive.4plebs.org
@ -175,7 +198,7 @@ docSet = function() {
}; };
g = { g = {
VERSION: '1.14.4.3', VERSION: '1.14.4.4',
NAMESPACE: '4chan X.', NAMESPACE: '4chan X.',
boards: {} boards: {}
}; };
@ -531,7 +554,7 @@ Config = (function() {
'thread-watcher.position': 'top: 50px; left: 0px;', 'thread-watcher.position': 'top: 50px; left: 0px;',
'qr.position': 'top: 50px; right: 0px;' 'qr.position': 'top: 50px; right: 0px;'
}, },
siteSoftware: "4chan.org yotsuba\n4cdn.org yotsuba" siteSoftware: "4chan.org yotsuba\n4channel.org yotsuba\n4cdn.org yotsuba"
}; };
return Config; return Config;
@ -7404,7 +7427,7 @@ SW = {};
postContainer: 'div[contains(@class,"postContainer")]' postContainer: 'div[contains(@class,"postContainer")]'
}, },
regexp: { regexp: {
quotelink: /^https?:\/\/boards\.4chan\.org\/+([^\/]+)\/+thread\/+(\d+)(?:[\/?][^#]*)?(?:#p(\d+))?$/ quotelink: /^https?:\/\/boards\.4chan(?:nel)?\.org\/+([^\/]+)\/+thread\/+(\d+)(?:[\/?][^#]*)?(?:#p(\d+))?$/
}, },
bgColoredEl: function() { bgColoredEl: function() {
return $.el('div', { return $.el('div', {
@ -7412,8 +7435,8 @@ SW = {};
}); });
}, },
isThisPageLegit: function() { isThisPageLegit: function() {
var ref; var ref, ref1;
return location.hostname === 'boards.4chan.org' && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref = d.title) !== '4chan - Temporarily Offline' && ref !== '4chan - Error' && ref !== '504 Gateway Time-out' && ref !== 'MathJax Equation Source'); return ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && d.doctype && !$('link[href*="favicon-status.ico"]', d.head) && ((ref1 = d.title) !== '4chan - Temporarily Offline' && ref1 !== '4chan - Error' && ref1 !== '504 Gateway Time-out' && ref1 !== 'MathJax Equation Source');
}, },
is404: function() { is404: function() {
var ref; var ref;
@ -7424,7 +7447,8 @@ SW = {};
return ((ref = g.VIEW) === 'index' || ref === 'thread') && !$('.board + *'); return ((ref = g.VIEW) === 'index' || ref === 'thread') && !$('.board + *');
}, },
isAuxiliaryPage: function() { isAuxiliaryPage: function() {
return location.hostname !== 'boards.4chan.org'; var ref;
return (ref = location.hostname) !== 'boards.4chan.org' && ref !== 'boards.4channel.org';
}, },
scriptData: function() { scriptData: function() {
var j, len, ref, script; var j, len, ref, script;
@ -8986,6 +9010,13 @@ BoardConfig = (function() {
} }
return results; return results;
}, },
isSFW: function(board) {
var ref;
return !!((ref = (this.boards || Conf['boardConfig'].boards)[board]) != null ? ref.ws_board : void 0);
},
domain: function(board) {
return "boards." + (BoardConfig.isSFW(board) ? '4channel' : '4chan') + ".org";
},
noAudio: function(boardID) { noAudio: function(boardID) {
var boards; var boards;
if (Site.software !== 'yotsuba') { if (Site.software !== 'yotsuba') {
@ -9650,7 +9681,7 @@ Header = (function() {
return CatalogLinks.setLinks(list); return CatalogLinks.setLinks(list);
}, },
mapCustomNavigation: function(t) { mapCustomNavigation: function(t) {
var a, boardID, href, indexOptions, m, text, url; var a, boardID, href, indexOptions, m, ref, ref1, text, url;
if (/^[^\w@]/.test(t)) { if (/^[^\w@]/.test(t)) {
return $.tn(t); return $.tn(t);
} }
@ -9685,7 +9716,7 @@ Header = (function() {
} }
boardID = t.split('-')[0]; boardID = t.split('-')[0];
if (boardID === 'current') { if (boardID === 'current') {
if (location.hostname === 'boards.4chan.org') { if ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
boardID = g.BOARD.ID; boardID = g.BOARD.ID;
} else { } else {
a = $.el('a', { a = $.el('a', {
@ -9700,7 +9731,7 @@ Header = (function() {
} }
} }
a = (function() { a = (function() {
var ref; var ref1;
if (boardID === '@') { if (boardID === '@') {
return $.el('a', { return $.el('a', {
href: 'https://twitter.com/4chan', href: 'https://twitter.com/4chan',
@ -9709,11 +9740,11 @@ Header = (function() {
}); });
} }
a = $.el('a', { a = $.el('a', {
href: "//boards.4chan.org/" + boardID + "/", href: "//" + (BoardConfig.domain(boardID)) + "/" + boardID + "/",
textContent: boardID, textContent: boardID,
title: BoardConfig.title(boardID) title: BoardConfig.title(boardID)
}); });
if ((ref = g.VIEW) === 'catalog' || ref === 'archive') { if ((ref1 = g.VIEW) === 'catalog' || ref1 === 'archive') {
a.href += g.VIEW; a.href += g.VIEW;
} }
if (a.hostname === location.hostname && boardID === g.BOARD.ID) { if (a.hostname === location.hostname && boardID === g.BOARD.ID) {
@ -9735,7 +9766,7 @@ Header = (function() {
} }
if (Conf['JSON Index'] && indexOptions) { if (Conf['JSON Index'] && indexOptions) {
a.dataset.indexOptions = indexOptions; a.dataset.indexOptions = indexOptions;
if (a.hostname === 'boards.4chan.org' && a.pathname.split('/')[2] === '') { if (((ref1 = a.hostname) === 'boards.4chan.org' || ref1 === 'boards.4channel.org') && a.pathname.split('/')[2] === '') {
a.href += (a.hash ? '/' : '#') + indexOptions; a.href += (a.hash ? '/' : '#') + indexOptions;
} }
} }
@ -9750,7 +9781,7 @@ Header = (function() {
} }
if (/-expired/.test(t)) { if (/-expired/.test(t)) {
if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash' && boardID !== 'bant') { if (boardID !== 'b' && boardID !== 'f' && boardID !== 'trash' && boardID !== 'bant') {
a.href = "//boards.4chan.org/" + boardID + "/archive"; a.href = "//" + (BoardConfig.domain(boardID)) + "/" + boardID + "/archive";
} else { } else {
return a.firstChild; return a.firstChild;
} }
@ -11578,7 +11609,7 @@ Settings = (function() {
if ($.cantSync) { if ($.cantSync) {
why = $.cantSet ? 'save your settings' : 'synchronize settings between tabs'; why = $.cantSet ? 'save your settings' : 'synchronize settings between tabs';
return cb($.el('li', { return cb($.el('li', {
textContent: "4chan X needs local storage to " + why + ".\nEnable it on boards.4chan.org in your browser's privacy settings (may be listed as part of \"local data\" or \"cookies\")." textContent: "4chan X needs local storage to " + why + ".\nEnable it on boards." + (location.hostname.split('.')[1]) + ".org in your browser's privacy settings (may be listed as part of \"local data\" or \"cookies\")."
})); }));
} }
}, },
@ -12155,6 +12186,11 @@ Settings = (function() {
set('sauces', data['sauces'].replace(/^(#?\s*)https:\/\/whatanime\.ga\//mg, '$1https://trace.moe/')); set('sauces', data['sauces'].replace(/^(#?\s*)https:\/\/whatanime\.ga\//mg, '$1https://trace.moe/'));
} }
} }
if (compareString < '00001.00014.00004.00004') {
if ((data['siteSoftware'] != null) && !/^4channel\.org yotsuba$/m.test(data['siteSoftware'])) {
set('siteSoftware', data['siteSoftware'] + '\n4channel.org yotsuba');
}
}
return changes; return changes;
}, },
loadSettings: function(data, cb) { loadSettings: function(data, cb) {
@ -14185,7 +14221,7 @@ ImageHost = (function() {
test: function(hostname) { test: function(hostname) {
return hostname === 'i.4cdn.org' || ImageHost.regex.test(hostname); return hostname === 'i.4cdn.org' || ImageHost.regex.test(hostname);
}, },
regex: /^is\d*\.4chan\.org$/, regex: /^is\d*\.4chan(?:nel)?\.org$/,
node: function() { node: function() {
var host; var host;
if (this.isClone) { if (this.isClone) {
@ -16334,7 +16370,7 @@ ReportLink = (function() {
el: a, el: a,
order: 10, order: 10,
open: function(post) { open: function(post) {
ReportLink.url = "//sys.4chan.org/" + post.board + "/imgboard.php?mode=report&no=" + post; ReportLink.url = "//sys." + (location.hostname.split('.')[1]) + ".org/" + post.board + "/imgboard.php?mode=report&no=" + post;
if (d.cookie.indexOf('pass_enabled=1') >= 0) { if (d.cookie.indexOf('pass_enabled=1') >= 0) {
ReportLink.dims = 'width=350,height=275'; ReportLink.dims = 'width=350,height=275';
} else { } else {
@ -16642,8 +16678,8 @@ CatalogLinks = (function() {
ref = $$('a', this.nodes.comment); ref = $$('a', this.nodes.comment);
for (i = 0, len = ref.length; i < len; i++) { for (i = 0, len = ref.length; i < len; i++) {
a = ref[i]; a = ref[i];
if (m = a.href.match(/^https?:\/\/boards\.4chan\.org\/([^\/]+)\/catalog(#s=.*)?/)) { if (m = a.href.match(/^https?:\/\/boards\.4chan(?:nel)?\.org\/([^\/]+)\/catalog(#s=.*)?/)) {
a.href = "//boards.4chan.org/" + m[1] + "/" + (m[2] || '#catalog'); a.href = "//boards.4chan(?:nel)?.org/" + m[1] + "/" + (m[2] || '#catalog');
} }
} }
}, },
@ -16660,50 +16696,52 @@ CatalogLinks = (function() {
return $('input', CatalogLinks.el).checked = useCatalog; return $('input', CatalogLinks.el).checked = useCatalog;
}, },
setLinks: function(list) { setLinks: function(list) {
var a, board, i, len, ref, ref1, ref2; var a, board, i, len, ref, ref1, ref2, ref3;
if (!(((ref = CatalogLinks.enabled) != null ? ref : Conf['Catalog Links']) && list)) { if (!(((ref = CatalogLinks.enabled) != null ? ref : Conf['Catalog Links']) && list)) {
return; return;
} }
ref1 = $$('a:not([data-only])', list); ref1 = $$('a:not([data-only])', list);
for (i = 0, len = ref1.length; i < len; i++) { for (i = 0, len = ref1.length; i < len; i++) {
a = ref1[i]; a = ref1[i];
if (((ref2 = a.hostname) !== 'boards.4chan.org' && ref2 !== 'catalog.neet.tv') || !(board = a.pathname.split('/')[1]) || (board === 'f' || board === 'status' || board === '4chan') || a.pathname.split('/')[2] === 'archive' || $.hasClass(a, 'external')) { if (((ref2 = a.hostname) !== 'boards.4chan.org' && ref2 !== 'boards.4channel.org' && ref2 !== 'catalog.neet.tv') || !(board = a.pathname.split('/')[1]) || (board === 'f' || board === 'status' || board === '4chan') || a.pathname.split('/')[2] === 'archive' || $.hasClass(a, 'external')) {
continue; continue;
} }
a.href = Conf['Header catalog links'] ? CatalogLinks.catalog(board) : "//boards.4chan.org/" + board + "/"; a.href = Conf['Header catalog links'] ? CatalogLinks.catalog(board) : "//" + (BoardConfig.domain(board)) + "/" + board + "/";
if (a.dataset.indexOptions && a.hostname === 'boards.4chan.org' && a.pathname.split('/')[2] === '') { if (a.dataset.indexOptions && ((ref3 = a.hostname) === 'boards.4chan.org' || ref3 === 'boards.4channel.org') && a.pathname.split('/')[2] === '') {
a.href += (a.hash ? '/' : '#') + a.dataset.indexOptions; a.href += (a.hash ? '/' : '#') + a.dataset.indexOptions;
} }
} }
}, },
catalog: function(board) { catalog: function(board) {
var ref;
if (board == null) { if (board == null) {
board = g.BOARD.ID; board = g.BOARD.ID;
} }
if (Conf['External Catalog'] && (board === 'a' || board === 'c' || board === 'g' || board === 'biz' || board === 'k' || board === 'm' || board === 'o' || board === 'p' || board === 'v' || board === 'vg' || board === 'vr' || board === 'w' || board === 'wg' || board === 'cm' || board === '3' || board === 'adv' || board === 'an' || board === 'asp' || board === 'cgl' || board === 'ck' || board === 'co' || board === 'diy' || board === 'fa' || board === 'fit' || board === 'gd' || board === 'int' || board === 'jp' || board === 'lit' || board === 'mlp' || board === 'mu' || board === 'n' || board === 'out' || board === 'po' || board === 'sci' || board === 'sp' || board === 'tg' || board === 'toy' || board === 'trv' || board === 'tv' || board === 'vp' || board === 'wsg' || board === 'x' || board === 'f' || board === 'pol' || board === 's4s' || board === 'lgbt')) { if (Conf['External Catalog'] && (board === 'a' || board === 'c' || board === 'g' || board === 'biz' || board === 'k' || board === 'm' || board === 'o' || board === 'p' || board === 'v' || board === 'vg' || board === 'vr' || board === 'w' || board === 'wg' || board === 'cm' || board === '3' || board === 'adv' || board === 'an' || board === 'asp' || board === 'cgl' || board === 'ck' || board === 'co' || board === 'diy' || board === 'fa' || board === 'fit' || board === 'gd' || board === 'int' || board === 'jp' || board === 'lit' || board === 'mlp' || board === 'mu' || board === 'n' || board === 'out' || board === 'po' || board === 'sci' || board === 'sp' || board === 'tg' || board === 'toy' || board === 'trv' || board === 'tv' || board === 'vp' || board === 'wsg' || board === 'x' || board === 'f' || board === 'pol' || board === 's4s' || board === 'lgbt')) {
return "//catalog.neet.tv/" + board + "/"; return "//catalog.neet.tv/" + board + "/";
} else if (Conf['JSON Index'] && Conf['Use 4chan X Catalog']) { } else if (Conf['JSON Index'] && Conf['Use 4chan X Catalog']) {
if (location.hostname === 'boards.4chan.org' && g.BOARD.ID === board && g.VIEW === 'index') { if (((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && g.BOARD.ID === board && g.VIEW === 'index') {
return '#catalog'; return '#catalog';
} else { } else {
return "//boards.4chan.org/" + board + "/#catalog"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/#catalog";
} }
} else { } else {
return "//boards.4chan.org/" + board + "/catalog"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/catalog";
} }
}, },
index: function(board) { index: function(board) {
var ref;
if (board == null) { if (board == null) {
board = g.BOARD.ID; board = g.BOARD.ID;
} }
if (Conf['JSON Index'] && board !== 'f') { if (Conf['JSON Index'] && board !== 'f') {
if (location.hostname === 'boards.4chan.org' && g.BOARD.ID === board && g.VIEW === 'index') { if (((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') && g.BOARD.ID === board && g.VIEW === 'index') {
return '#index'; return '#index';
} else { } else {
return "//boards.4chan.org/" + board + "/#index"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/#index";
} }
} else { } else {
return "//boards.4chan.org/" + board + "/"; return "//" + (BoardConfig.domain(board)) + "/" + board + "/";
} }
} }
}; };
@ -21013,14 +21051,17 @@ Captcha = {};
return $.on(d, 'keydown', this.keybinds.bind(this)); return $.on(d, 'keydown', this.keybinds.bind(this));
}, },
initNoscript: function() { initNoscript: function() {
var data, ref, token; var data, form, ref, token;
this.noscript = true; this.noscript = true;
form = $('.fbc-imageselect-challenge > form');
data = (token = (ref = $('.fbc-verification-token > textarea')) != null ? ref.value : void 0) ? { data = (token = (ref = $('.fbc-verification-token > textarea')) != null ? ref.value : void 0) ? {
token: token token: token
} : { } : $('.fbc-imageselect-challenge > form') ? {
working: true working: true
}; } : null;
new Connection(window.parent, '*').send(data); if (data) {
new Connection(window.parent, '*').send(data);
}
d.body.classList.toggle('focus', d.hasFocus()); d.body.classList.toggle('focus', d.hasFocus());
$.on(window, 'focus blur', function() { $.on(window, 'focus blur', function() {
return d.body.classList.toggle('focus', d.hasFocus()); return d.body.classList.toggle('focus', d.hasFocus());
@ -21033,7 +21074,7 @@ Captcha = {};
$.addStyle(this.cssNoscript); $.addStyle(this.cssNoscript);
this.addLabels(); this.addLabels();
$.on(d, 'keydown', this.keybinds.bind(this)); $.on(d, 'keydown', this.keybinds.bind(this));
return $.on($('.fbc-imageselect-challenge > form'), 'submit', this.checkForm.bind(this)); return $.on(form, 'submit', this.checkForm.bind(this));
}, },
fixImages: function() { fixImages: function() {
var img, j, len, ref; var img, j, len, ref;
@ -21153,6 +21194,7 @@ Captcha = {};
(function() { (function() {
Captcha.replace = { Captcha.replace = {
init: function() { init: function() {
var ref;
if (!(d.cookie.indexOf('pass_enabled=1') < 0)) { if (!(d.cookie.indexOf('pass_enabled=1') < 0)) {
return; return;
} }
@ -21161,7 +21203,7 @@ Captcha = {};
return; return;
} }
if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) { if (Conf['captchaLanguage'].trim() || Conf['Captcha Fixes']) {
if (location.hostname === 'boards.4chan.org') { if ((ref = location.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
return $.onExists(doc, '#captchaFormPart', function(node) { return $.onExists(doc, '#captchaFormPart', function(node) {
return $.onExists(node, 'iframe', Captcha.replace.iframe); return $.onExists(node, 'iframe', Captcha.replace.iframe);
}); });
@ -21534,7 +21576,7 @@ PassLink = (function() {
innerHTML: "<a href=\"javascript:;\">4chan Pass</a>" innerHTML: "<a href=\"javascript:;\">4chan Pass</a>"
}); });
$.on(passLink.firstElementChild, 'click', function() { $.on(passLink.firstElementChild, 'click', function() {
return window.open('//sys.4chan.org/auth', Date.now(), 'width=500,height=280,toolbar=0'); return window.open("//sys." + (location.hostname.split('.')[1]) + ".org/auth", Date.now(), 'width=500,height=280,toolbar=0');
}); });
return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]); return $.before(styleSelector.previousSibling, [passLink, $.tn('\u00A0\u00A0')]);
} }
@ -24703,11 +24745,11 @@ Quotify = (function() {
} }
}, },
parseArchivelink: function(link) { parseArchivelink: function(link) {
var boardID, m, postID, threadID; var boardID, m, postID, ref, threadID;
if (!(m = link.pathname.match(/^\/([^\/]+)\/thread\/S?(\d+)\/?$/))) { if (!(m = link.pathname.match(/^\/([^\/]+)\/thread\/S?(\d+)\/?$/))) {
return; return;
} }
if (link.hostname === 'boards.4chan.org') { if ((ref = link.hostname) === 'boards.4chan.org' || ref === 'boards.4channel.org') {
return; return;
} }
boardID = m[1]; boardID = m[1];
@ -24823,7 +24865,7 @@ Main = (function() {
Main = { Main = {
init: function() { init: function() {
var db, flatten, i, items, j, k, key, len, ref, ref1, w; var db, flatten, i, items, j, k, key, len, ref, ref1, ref2, w;
if (d.body && !$('title', d.head)) { if (d.body && !$('title', d.head)) {
return; return;
} }
@ -24884,7 +24926,7 @@ Main = (function() {
Conf[parent] = obj; Conf[parent] = obj;
} }
}; };
if (location.hostname === 'boards.4chan.org') { if ((ref1 = location.hostname) === 'boards.4chan.org' || ref1 === 'boards.4channel.org') {
$.global(function() { $.global(function() {
var fromCharCode0; var fromCharCode0;
fromCharCode0 = String.fromCharCode; fromCharCode0 = String.fromCharCode;
@ -24902,9 +24944,9 @@ Main = (function() {
}); });
} }
flatten(null, Config); flatten(null, Config);
ref1 = DataBoard.keys; ref2 = DataBoard.keys;
for (j = 0, len = ref1.length; j < len; j++) { for (j = 0, len = ref2.length; j < len; j++) {
db = ref1[j]; db = ref2[j];
Conf[db] = {}; Conf[db] = {};
} }
Conf['boardConfig'] = { Conf['boardConfig'] = {
@ -24924,7 +24966,7 @@ Main = (function() {
Conf['QR Shortcut'] = true; Conf['QR Shortcut'] = true;
Conf['Bottom QR Link'] = true; Conf['Bottom QR Link'] = true;
Conf['Toggleable Thread Watcher'] = true; Conf['Toggleable Thread Watcher'] = true;
if (/\.4chan\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) { if (/\.4chan(?:nel)?\.org$/.test(location.hostname) && !$$('script:not([src])', d).filter(function(s) {
return /this\[/.test(s.textContent); return /this\[/.test(s.textContent);
}).length) { }).length) {
($.getSync || $.get)({ ($.getSync || $.get)({
@ -24941,13 +24983,13 @@ Main = (function() {
} }
items['previousversion'] = void 0; items['previousversion'] = void 0;
return ($.getSync || $.get)(items, function(items) { return ($.getSync || $.get)(items, function(items) {
var ref2; var ref3;
if (!$.perProtocolSettings && /\.4chan\.org$/.test(location.hostname) && ((ref2 = items['Redirect to HTTPS']) != null ? ref2 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') { if (!$.perProtocolSettings && /\.4chan(?:nel)?\.org$/.test(location.hostname) && ((ref3 = items['Redirect to HTTPS']) != null ? ref3 : Conf['Redirect to HTTPS']) && location.protocol !== 'https:') {
location.replace('https://' + location.host + location.pathname + location.search + location.hash); location.replace('https://' + location.host + location.pathname + location.search + location.hash);
return; return;
} }
return $.asap(docSet, function() { return $.asap(docSet, function() {
var ref3, val; var ref4, val;
if ($.cantSet) { if ($.cantSet) {
} else if (items.previousversion == null) { } else if (items.previousversion == null) {
@ -24960,7 +25002,7 @@ Main = (function() {
} }
for (key in Conf) { for (key in Conf) {
val = Conf[key]; val = Conf[key];
Conf[key] = (ref3 = items[key]) != null ? ref3 : val; Conf[key] = (ref4 = items[key]) != null ? ref4 : val;
} }
return Site.init(Main.initFeatures); return Site.init(Main.initFeatures);
}); });
@ -24985,7 +25027,7 @@ Main = (function() {
var err, feature, hostname, j, len, match, name, pathname, ref, ref1, ref2, search; var err, feature, hostname, j, len, match, name, pathname, ref, ref1, ref2, search;
hostname = location.hostname, search = location.search; hostname = location.hostname, search = location.search;
pathname = location.pathname.split(/\/+/); pathname = location.pathname.split(/\/+/);
if (hostname !== 'www.4chan.org') { if (hostname !== 'www.4chan.org' && hostname !== 'www.4channel.org') {
g.BOARD = new Board(pathname[1]); g.BOARD = new Board(pathname[1]);
} }
$.global(function() { $.global(function() {
@ -24995,12 +25037,14 @@ Main = (function() {
Main.jsEnabled = $.hasClass(doc, 'js-enabled'); Main.jsEnabled = $.hasClass(doc, 'js-enabled');
switch (hostname) { switch (hostname) {
case 'www.4chan.org': case 'www.4chan.org':
case 'www.4channel.org':
$.onExists(doc, 'body', function() { $.onExists(doc, 'body', function() {
return $.addStyle(CSS.www); return $.addStyle(CSS.www);
}); });
Captcha.replace.init(); Captcha.replace.init();
return; return;
case 'sys.4chan.org': case 'sys.4chan.org':
case 'sys.4channel.org':
if (pathname[2] === 'imgboard.php') { if (pathname[2] === 'imgboard.php') {
if (/\bmode=report\b/.test(search)) { if (/\bmode=report\b/.test(search)) {
Report.init(); Report.init();

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

4
version.json
View File

@ -1,4 +1,4 @@
{ {
"version": "1.14.4.3", "version": "1.14.4.4",
"date": "2018-11-08T07:57:01.999Z" "date": "2018-11-23T22:35:01.925Z"
} }