Add archive redirection for /gd/, /out/, /vp/ and /vr/.
Update CS. Fix compiling on my laptop. (maxBuffer error)
This commit is contained in:
parent
80ff5d2651
commit
709c1b69eb
@ -581,7 +581,7 @@
|
|||||||
Filter = {
|
Filter = {
|
||||||
filters: {},
|
filters: {},
|
||||||
init: function() {
|
init: function() {
|
||||||
var boards, filter, hl, key, op, regexp, stub, top, _i, _len, _ref, _ref1, _ref2, _ref3, _ref4;
|
var boards, err, filter, hl, key, op, regexp, stub, top, _i, _len, _ref, _ref1, _ref2, _ref3, _ref4;
|
||||||
for (key in Config.filter) {
|
for (key in Config.filter) {
|
||||||
this.filters[key] = [];
|
this.filters[key] = [];
|
||||||
_ref = Conf[key].split('\n');
|
_ref = Conf[key].split('\n');
|
||||||
@ -603,7 +603,8 @@
|
|||||||
} else {
|
} else {
|
||||||
try {
|
try {
|
||||||
regexp = RegExp(regexp[1], regexp[2]);
|
regexp = RegExp(regexp[1], regexp[2]);
|
||||||
} catch (err) {
|
} catch (_error) {
|
||||||
|
err = _error;
|
||||||
alert(err.message);
|
alert(err.message);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@ -2090,7 +2091,6 @@
|
|||||||
},
|
},
|
||||||
replies: [],
|
replies: [],
|
||||||
reply: (function() {
|
reply: (function() {
|
||||||
|
|
||||||
function _Class() {
|
function _Class() {
|
||||||
var persona, prev,
|
var persona, prev,
|
||||||
_this = this;
|
_this = this;
|
||||||
@ -3044,14 +3044,15 @@
|
|||||||
}
|
}
|
||||||
reader = new FileReader();
|
reader = new FileReader();
|
||||||
reader.onload = function(e) {
|
reader.onload = function(e) {
|
||||||
var data;
|
var data, err;
|
||||||
try {
|
try {
|
||||||
data = JSON.parse(decodeURIComponent(escape(e.target.result)));
|
data = JSON.parse(decodeURIComponent(escape(e.target.result)));
|
||||||
Options.loadSettings(data);
|
Options.loadSettings(data);
|
||||||
if (confirm('Import successful. Refresh now?')) {
|
if (confirm('Import successful. Refresh now?')) {
|
||||||
return window.location.reload();
|
return window.location.reload();
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (_error) {
|
||||||
|
err = _error;
|
||||||
return output.textContent = 'Import failed due to an error.';
|
return output.textContent = 'Import failed due to an error.';
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
@ -4917,11 +4918,14 @@
|
|||||||
image: function(board, filename) {
|
image: function(board, filename) {
|
||||||
switch (board) {
|
switch (board) {
|
||||||
case 'a':
|
case 'a':
|
||||||
|
case 'gd':
|
||||||
case 'jp':
|
case 'jp':
|
||||||
case 'm':
|
case 'm':
|
||||||
case 'q':
|
case 'q':
|
||||||
case 'tg':
|
case 'tg':
|
||||||
case 'vg':
|
case 'vg':
|
||||||
|
case 'vp':
|
||||||
|
case 'vr':
|
||||||
case 'wsg':
|
case 'wsg':
|
||||||
return "//archive.foolz.us/" + board + "/full_image/" + filename;
|
return "//archive.foolz.us/" + board + "/full_image/" + filename;
|
||||||
case 'u':
|
case 'u':
|
||||||
@ -4949,6 +4953,7 @@
|
|||||||
switch (board) {
|
switch (board) {
|
||||||
case 'a':
|
case 'a':
|
||||||
case 'co':
|
case 'co':
|
||||||
|
case 'gd':
|
||||||
case 'jp':
|
case 'jp':
|
||||||
case 'm':
|
case 'm':
|
||||||
case 'q':
|
case 'q':
|
||||||
@ -4957,6 +4962,8 @@
|
|||||||
case 'tv':
|
case 'tv':
|
||||||
case 'v':
|
case 'v':
|
||||||
case 'vg':
|
case 'vg':
|
||||||
|
case 'vp':
|
||||||
|
case 'vr':
|
||||||
case 'wsg':
|
case 'wsg':
|
||||||
case 'dev':
|
case 'dev':
|
||||||
case 'foolz':
|
case 'foolz':
|
||||||
@ -4966,6 +4973,7 @@
|
|||||||
return "//nsfw.foolz.us/_/api/chan/post/?board=" + board + "&num=" + postID;
|
return "//nsfw.foolz.us/_/api/chan/post/?board=" + board + "&num=" + postID;
|
||||||
case 'c':
|
case 'c':
|
||||||
case 'int':
|
case 'int':
|
||||||
|
case 'out':
|
||||||
case 'po':
|
case 'po':
|
||||||
return "//archive.thedarkcave.org/_/api/chan/post/?board=" + board + "&num=" + postID;
|
return "//archive.thedarkcave.org/_/api/chan/post/?board=" + board + "&num=" + postID;
|
||||||
}
|
}
|
||||||
@ -4979,6 +4987,7 @@
|
|||||||
switch (board) {
|
switch (board) {
|
||||||
case 'a':
|
case 'a':
|
||||||
case 'co':
|
case 'co':
|
||||||
|
case 'gd':
|
||||||
case 'jp':
|
case 'jp':
|
||||||
case 'm':
|
case 'm':
|
||||||
case 'q':
|
case 'q':
|
||||||
@ -4987,6 +4996,8 @@
|
|||||||
case 'tv':
|
case 'tv':
|
||||||
case 'v':
|
case 'v':
|
||||||
case 'vg':
|
case 'vg':
|
||||||
|
case 'vp':
|
||||||
|
case 'vr':
|
||||||
case 'wsg':
|
case 'wsg':
|
||||||
case 'dev':
|
case 'dev':
|
||||||
case 'foolz':
|
case 'foolz':
|
||||||
@ -4997,6 +5008,7 @@
|
|||||||
url = Redirect.path('//nsfw.foolz.us', 'foolfuuka', data);
|
url = Redirect.path('//nsfw.foolz.us', 'foolfuuka', data);
|
||||||
break;
|
break;
|
||||||
case 'int':
|
case 'int':
|
||||||
|
case 'out':
|
||||||
case 'po':
|
case 'po':
|
||||||
url = Redirect.path('//archive.thedarkcave.org', 'foolfuuka', data);
|
url = Redirect.path('//archive.thedarkcave.org', 'foolfuuka', data);
|
||||||
break;
|
break;
|
||||||
@ -5742,7 +5754,7 @@
|
|||||||
return post;
|
return post;
|
||||||
},
|
},
|
||||||
node: function(nodes, notify) {
|
node: function(nodes, notify) {
|
||||||
var callback, node, _i, _j, _len, _len1, _ref;
|
var callback, err, node, _i, _j, _len, _len1, _ref;
|
||||||
_ref = Main.callbacks;
|
_ref = Main.callbacks;
|
||||||
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
for (_i = 0, _len = _ref.length; _i < _len; _i++) {
|
||||||
callback = _ref[_i];
|
callback = _ref[_i];
|
||||||
@ -5751,7 +5763,8 @@
|
|||||||
node = nodes[_j];
|
node = nodes[_j];
|
||||||
callback(node);
|
callback(node);
|
||||||
}
|
}
|
||||||
} catch (err) {
|
} catch (_error) {
|
||||||
|
err = _error;
|
||||||
if (notify) {
|
if (notify) {
|
||||||
alert("4chan X (" + Main.version + ") error: " + err.message + "\nReport the bug at mayhemydg.github.com/4chan-x/#bug-report\n\nURL: " + window.location + "\n" + err.stack);
|
alert("4chan X (" + Main.version + ") error: " + err.message + "\nReport the bug at mayhemydg.github.com/4chan-x/#bug-report\n\nURL: " + window.location + "\n" + err.stack);
|
||||||
}
|
}
|
||||||
|
|||||||
2
Cakefile
2
Cakefile
@ -112,7 +112,7 @@ task 'upgrade', (options) ->
|
|||||||
exec "git commit -am 'Release #{version}.' && git tag -a #{version} -m '#{version}' && git tag -af stable -m '#{version}'"
|
exec "git commit -am 'Release #{version}.' && git tag -a #{version} -m '#{version}' && git tag -af stable -m '#{version}'"
|
||||||
|
|
||||||
task 'build', ->
|
task 'build', ->
|
||||||
exec 'coffee --print script.coffee', (err, stdout, stderr) ->
|
exec 'coffee --print script.coffee', {maxBuffer: 500 * 1024}, (err, stdout, stderr) ->
|
||||||
throw err if err
|
throw err if err
|
||||||
fs.writeFile OUTFILE, HEADER + stdout, (err) ->
|
fs.writeFile OUTFILE, HEADER + stdout, (err) ->
|
||||||
throw err if err
|
throw err if err
|
||||||
|
|||||||
@ -1,4 +1,6 @@
|
|||||||
master
|
master
|
||||||
|
- Mayhem
|
||||||
|
Add /gd/, /out/, /vp/ and /vr/ archive redirection.
|
||||||
|
|
||||||
2.39.0
|
2.39.0
|
||||||
- Queue
|
- Queue
|
||||||
|
|||||||
@ -4080,7 +4080,7 @@ Redirect =
|
|||||||
image: (board, filename) ->
|
image: (board, filename) ->
|
||||||
# Do not use g.BOARD, the image url can originate from a cross-quote.
|
# Do not use g.BOARD, the image url can originate from a cross-quote.
|
||||||
switch board
|
switch board
|
||||||
when 'a', 'jp', 'm', 'q', 'tg', 'vg', 'wsg'
|
when 'a', 'gd', 'jp', 'm', 'q', 'tg', 'vg', 'vp', 'vr', 'wsg'
|
||||||
"//archive.foolz.us/#{board}/full_image/#{filename}"
|
"//archive.foolz.us/#{board}/full_image/#{filename}"
|
||||||
when 'u'
|
when 'u'
|
||||||
"//nsfw.foolz.us/#{board}/full_image/#{filename}"
|
"//nsfw.foolz.us/#{board}/full_image/#{filename}"
|
||||||
@ -4096,22 +4096,22 @@ Redirect =
|
|||||||
"//archive.nyafuu.org/#{board}/full_image/#{filename}"
|
"//archive.nyafuu.org/#{board}/full_image/#{filename}"
|
||||||
post: (board, postID) ->
|
post: (board, postID) ->
|
||||||
switch board
|
switch board
|
||||||
when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg', 'dev', 'foolz'
|
when 'a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg', 'dev', 'foolz'
|
||||||
"//archive.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
|
"//archive.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
|
||||||
when 'u', 'kuku'
|
when 'u', 'kuku'
|
||||||
"//nsfw.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
|
"//nsfw.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
|
||||||
when 'c', 'int', 'po'
|
when 'c', 'int', 'out', 'po'
|
||||||
"//archive.thedarkcave.org/_/api/chan/post/?board=#{board}&num=#{postID}"
|
"//archive.thedarkcave.org/_/api/chan/post/?board=#{board}&num=#{postID}"
|
||||||
to: (data) ->
|
to: (data) ->
|
||||||
unless data.isSearch
|
unless data.isSearch
|
||||||
{threadID} = data
|
{threadID} = data
|
||||||
{board} = data
|
{board} = data
|
||||||
switch board
|
switch board
|
||||||
when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg', 'dev', 'foolz'
|
when 'a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg', 'dev', 'foolz'
|
||||||
url = Redirect.path '//archive.foolz.us', 'foolfuuka', data
|
url = Redirect.path '//archive.foolz.us', 'foolfuuka', data
|
||||||
when 'u', 'kuku'
|
when 'u', 'kuku'
|
||||||
url = Redirect.path '//nsfw.foolz.us', 'foolfuuka', data
|
url = Redirect.path '//nsfw.foolz.us', 'foolfuuka', data
|
||||||
when 'int', 'po'
|
when 'int', 'out', 'po'
|
||||||
url = Redirect.path '//archive.thedarkcave.org', 'foolfuuka', data
|
url = Redirect.path '//archive.thedarkcave.org', 'foolfuuka', data
|
||||||
when 'ck', 'lit'
|
when 'ck', 'lit'
|
||||||
url = Redirect.path '//fuuka.warosu.org', 'fuuka', data
|
url = Redirect.path '//fuuka.warosu.org', 'fuuka', data
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user