Be a little more conservative here.

This commit is contained in:
Zixaphir 2014-01-07 08:11:28 -07:00
parent ddabad15e9
commit a720406bad
3 changed files with 205 additions and 176 deletions

View File

@ -9769,7 +9769,7 @@
for (type in data) { for (type in data) {
id = data[type]; id = data[type];
if ((archive = archives[id]) && __indexOf.call(archive[type] || archive['boards'], boardID) >= 0) { if ((archive = archives[id]) && __indexOf.call(archive[type] || archive['boards'], boardID) >= 0) {
o[type][boardID] = archive; o[type][boardID] = archive.data;
} }
} }
} }
@ -9778,14 +9778,15 @@
_ref1 = archive.boards; _ref1 = archive.boards;
for (_i = 0, _len = _ref1.length; _i < _len; _i++) { for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
boardID = _ref1[_i]; boardID = _ref1[_i];
data = archive.data;
if (!(boardID in o.thread)) { if (!(boardID in o.thread)) {
o.thread[boardID] = archive; o.thread[boardID] = data;
} }
if (!(boardID in o.post || archive.software !== 'foolfuuka')) { if (!(boardID in o.post || archive.software !== 'foolfuuka')) {
o.post[boardID] = archive; o.post[boardID] = data;
} }
if (!(boardID in o.file || __indexOf.call(archive.files, boardID) < 0)) { if (!(boardID in o.file || __indexOf.call(archive.files, boardID) < 0)) {
o.file[boardID] = archive; o.file[boardID] = data;
} }
} }
} }
@ -9793,92 +9794,104 @@
}, },
archives: { archives: {
"Foolz": { "Foolz": {
domain: "archive.foolz.us",
http: false,
https: true,
software: "foolfuuka",
boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"] files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"],
data: {
domain: "archive.foolz.us",
http: false,
https: true,
software: "foolfuuka"
}
}, },
"NSFW Foolz": { "NSFW Foolz": {
domain: "nsfw.foolz.us",
http: false,
https: true,
software: "foolfuuka",
boards: ["u"], boards: ["u"],
files: ["u"] files: ["u"],
data: {
domain: "nsfw.foolz.us",
http: false,
https: true,
software: "foolfuuka"
}
}, },
"The Dark Cave": { "The Dark Cave": {
domain: "archive.thedarkcave.org",
http: true,
https: true,
software: "foolfuuka",
boards: ["c", "int", "out", "po"], boards: ["c", "int", "out", "po"],
files: ["c", "po"] files: ["c", "po"],
data: {
domain: "archive.thedarkcave.org",
http: true,
https: true,
software: "foolfuuka"
}
}, },
"4plebs": { "4plebs": {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka",
boards: ["hr", "pol", "s4s", "tg", "tv", "x"], boards: ["hr", "pol", "s4s", "tg", "tv", "x"],
files: ["hr", "pol", "s4s", "tg", "tv", "x"] files: ["hr", "pol", "s4s", "tg", "tv", "x"],
data: {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, },
"Nyafuu": { "Nyafuu": {
domain: "archive.nyafuu.org",
http: true,
https: true,
software: "foolfuuka",
boards: ["c", "w", "wg"], boards: ["c", "w", "wg"],
files: ["c", "w", "wg"] files: ["c", "w", "wg"],
data: {
domain: "archive.nyafuu.org",
http: true,
https: true,
software: "foolfuuka"
}
}, },
"Install Gentoo": { "Install Gentoo": {
domain: "archive.installgentoo.net",
http: false,
https: true,
software: "fuuka",
boards: ["diy", "g", "sci"], boards: ["diy", "g", "sci"],
files: [] files: [],
data: {
domain: "archive.installgentoo.net",
http: false,
https: true,
software: "fuuka"
}
}, },
"Rebecca Black Tech": { "Rebecca Black Tech": {
domain: "rbt.asia",
http: true,
https: true,
software: "fuuka",
boards: ["cgl", "g", "mu", "w"], boards: ["cgl", "g", "mu", "w"],
files: ["cgl", "g", "mu", "w"] files: ["cgl", "g", "mu", "w"],
data: {
domain: "rbt.asia",
http: true,
https: true,
software: "fuuka"
}
}, },
"Heinessen": { "Heinessen": {
domain: "archive.heinessen.com",
http: true,
software: "fuuka",
boards: ["an", "fit", "k", "mlp", "r9k", "toy"], boards: ["an", "fit", "k", "mlp", "r9k", "toy"],
files: ["an", "fit", "k", "r9k", "toy"] files: ["an", "fit", "k", "r9k", "toy"],
data: {
domain: "archive.heinessen.com",
http: true,
software: "fuuka"
}
}, },
"warosu": { "warosu": {
domain: "fuuka.warosu.org",
http: true,
https: true,
software: "fuuka",
boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"] files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
}, data: {
"Bui's Archive": { domain: "fuuka.warosu.org",
domain: "archive.bui.pm", http: true,
http: true, https: true,
https: true, software: "fuuka"
software: "foolfuuka", }
boards: ["b"],
files: ["b"]
}, },
"Foolz Beta": { "Foolz Beta": {
domain: "beta.foolz.us",
http: true,
https: true,
withCredentials: true,
software: "foolfuuka",
boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"] files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"],
data: {
domain: "beta.foolz.us",
http: true,
https: true,
withCredentials: true,
software: "foolfuuka"
}
} }
}, },
to: function(dest, data) { to: function(dest, data) {

View File

@ -9758,7 +9758,7 @@
for (type in data) { for (type in data) {
id = data[type]; id = data[type];
if ((archive = archives[id]) && __indexOf.call(archive[type] || archive['boards'], boardID) >= 0) { if ((archive = archives[id]) && __indexOf.call(archive[type] || archive['boards'], boardID) >= 0) {
o[type][boardID] = archive; o[type][boardID] = archive.data;
} }
} }
} }
@ -9767,14 +9767,15 @@
_ref1 = archive.boards; _ref1 = archive.boards;
for (_i = 0, _len = _ref1.length; _i < _len; _i++) { for (_i = 0, _len = _ref1.length; _i < _len; _i++) {
boardID = _ref1[_i]; boardID = _ref1[_i];
data = archive.data;
if (!(boardID in o.thread)) { if (!(boardID in o.thread)) {
o.thread[boardID] = archive; o.thread[boardID] = data;
} }
if (!(boardID in o.post || archive.software !== 'foolfuuka')) { if (!(boardID in o.post || archive.software !== 'foolfuuka')) {
o.post[boardID] = archive; o.post[boardID] = data;
} }
if (!(boardID in o.file || __indexOf.call(archive.files, boardID) < 0)) { if (!(boardID in o.file || __indexOf.call(archive.files, boardID) < 0)) {
o.file[boardID] = archive; o.file[boardID] = data;
} }
} }
} }
@ -9782,92 +9783,104 @@
}, },
archives: { archives: {
"Foolz": { "Foolz": {
domain: "archive.foolz.us",
http: false,
https: true,
software: "foolfuuka",
boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"], boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"] files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"],
data: {
domain: "archive.foolz.us",
http: false,
https: true,
software: "foolfuuka"
}
}, },
"NSFW Foolz": { "NSFW Foolz": {
domain: "nsfw.foolz.us",
http: false,
https: true,
software: "foolfuuka",
boards: ["u"], boards: ["u"],
files: ["u"] files: ["u"],
data: {
domain: "nsfw.foolz.us",
http: false,
https: true,
software: "foolfuuka"
}
}, },
"The Dark Cave": { "The Dark Cave": {
domain: "archive.thedarkcave.org",
http: true,
https: true,
software: "foolfuuka",
boards: ["c", "int", "out", "po"], boards: ["c", "int", "out", "po"],
files: ["c", "po"] files: ["c", "po"],
data: {
domain: "archive.thedarkcave.org",
http: true,
https: true,
software: "foolfuuka"
}
}, },
"4plebs": { "4plebs": {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka",
boards: ["hr", "pol", "s4s", "tg", "tv", "x"], boards: ["hr", "pol", "s4s", "tg", "tv", "x"],
files: ["hr", "pol", "s4s", "tg", "tv", "x"] files: ["hr", "pol", "s4s", "tg", "tv", "x"],
data: {
domain: "archive.4plebs.org",
http: true,
https: true,
software: "foolfuuka"
}
}, },
"Nyafuu": { "Nyafuu": {
domain: "archive.nyafuu.org",
http: true,
https: true,
software: "foolfuuka",
boards: ["c", "w", "wg"], boards: ["c", "w", "wg"],
files: ["c", "w", "wg"] files: ["c", "w", "wg"],
data: {
domain: "archive.nyafuu.org",
http: true,
https: true,
software: "foolfuuka"
}
}, },
"Install Gentoo": { "Install Gentoo": {
domain: "archive.installgentoo.net",
http: false,
https: true,
software: "fuuka",
boards: ["diy", "g", "sci"], boards: ["diy", "g", "sci"],
files: [] files: [],
data: {
domain: "archive.installgentoo.net",
http: false,
https: true,
software: "fuuka"
}
}, },
"Rebecca Black Tech": { "Rebecca Black Tech": {
domain: "rbt.asia",
http: true,
https: true,
software: "fuuka",
boards: ["cgl", "g", "mu", "w"], boards: ["cgl", "g", "mu", "w"],
files: ["cgl", "g", "mu", "w"] files: ["cgl", "g", "mu", "w"],
data: {
domain: "rbt.asia",
http: true,
https: true,
software: "fuuka"
}
}, },
"Heinessen": { "Heinessen": {
domain: "archive.heinessen.com",
http: true,
software: "fuuka",
boards: ["an", "fit", "k", "mlp", "r9k", "toy"], boards: ["an", "fit", "k", "mlp", "r9k", "toy"],
files: ["an", "fit", "k", "r9k", "toy"] files: ["an", "fit", "k", "r9k", "toy"],
data: {
domain: "archive.heinessen.com",
http: true,
software: "fuuka"
}
}, },
"warosu": { "warosu": {
domain: "fuuka.warosu.org",
http: true,
https: true,
software: "fuuka",
boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"], boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"] files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"],
}, data: {
"Bui's Archive": { domain: "fuuka.warosu.org",
domain: "archive.bui.pm", http: true,
http: true, https: true,
https: true, software: "fuuka"
software: "foolfuuka", }
boards: ["b"],
files: ["b"]
}, },
"Foolz Beta": { "Foolz Beta": {
domain: "beta.foolz.us",
http: true,
https: true,
withCredentials: true,
software: "foolfuuka",
boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"] files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"],
data: {
domain: "beta.foolz.us",
http: true,
https: true,
withCredentials: true,
software: "foolfuuka"
}
} }
}, },
to: function(dest, data) { to: function(dest, data) {

View File

@ -10,107 +10,110 @@ Redirect =
for boardID, data of Conf['selectedArchives'] for boardID, data of Conf['selectedArchives']
for type, id of data when (archive = archives[id]) and boardID in (archive[type] or archive['boards']) for type, id of data when (archive = archives[id]) and boardID in (archive[type] or archive['boards'])
o[type][boardID] = archive o[type][boardID] = archive.data
for name, archive of archives for name, archive of archives
for boardID in archive.boards for boardID in archive.boards
{data} = archive
unless boardID of o.thread unless boardID of o.thread
o.thread[boardID] = archive o.thread[boardID] = data
unless boardID of o.post or archive.software isnt 'foolfuuka' unless boardID of o.post or archive.software isnt 'foolfuuka'
o.post[boardID] = archive o.post[boardID] = data
unless boardID of o.file or boardID not in archive.files unless boardID of o.file or boardID not in archive.files
o.file[boardID] = archive o.file[boardID] = data
Redirect.data = o Redirect.data = o
archives: archives:
"Foolz": "Foolz":
domain: "archive.foolz.us"
http: false
https: true
software: "foolfuuka"
boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"] boards: ["a", "co", "gd", "jp", "m", "sp", "tg", "tv", "v", "vg", "vp", "vr", "wsg"]
files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"] files: ["a", "gd", "jp", "m", "tg", "vg", "vp", "vr", "wsg"]
data:
domain: "archive.foolz.us"
http: false
https: true
software: "foolfuuka"
"NSFW Foolz": "NSFW Foolz":
domain: "nsfw.foolz.us"
http: false
https: true
software: "foolfuuka"
boards: ["u"] boards: ["u"]
files: ["u"] files: ["u"]
data:
domain: "nsfw.foolz.us"
http: false
https: true
software: "foolfuuka"
"The Dark Cave": "The Dark Cave":
domain: "archive.thedarkcave.org"
http: true
https: true
software: "foolfuuka"
boards: ["c", "int", "out", "po"] boards: ["c", "int", "out", "po"]
files: ["c", "po"] files: ["c", "po"]
data:
domain: "archive.thedarkcave.org"
http: true
https: true
software: "foolfuuka"
"4plebs": "4plebs":
domain: "archive.4plebs.org"
http: true
https: true
software: "foolfuuka"
boards: ["hr", "pol", "s4s", "tg", "tv", "x"] boards: ["hr", "pol", "s4s", "tg", "tv", "x"]
files: ["hr", "pol", "s4s", "tg", "tv", "x"] files: ["hr", "pol", "s4s", "tg", "tv", "x"]
data:
domain: "archive.4plebs.org"
http: true
https: true
software: "foolfuuka"
"Nyafuu": "Nyafuu":
domain: "archive.nyafuu.org"
http: true
https: true
software: "foolfuuka"
boards: ["c", "w", "wg"] boards: ["c", "w", "wg"]
files: ["c", "w", "wg"] files: ["c", "w", "wg"]
data:
domain: "archive.nyafuu.org"
http: true
https: true
software: "foolfuuka"
"Install Gentoo": "Install Gentoo":
domain: "archive.installgentoo.net"
http: false
https: true
software: "fuuka"
boards: ["diy", "g", "sci"] boards: ["diy", "g", "sci"]
files: [] files: []
data:
domain: "archive.installgentoo.net"
http: false
https: true
software: "fuuka"
"Rebecca Black Tech": "Rebecca Black Tech":
domain: "rbt.asia"
http: true
https: true
software: "fuuka"
boards: ["cgl", "g", "mu", "w"] boards: ["cgl", "g", "mu", "w"]
files: ["cgl", "g", "mu", "w"] files: ["cgl", "g", "mu", "w"]
data:
domain: "rbt.asia"
http: true
https: true
software: "fuuka"
"Heinessen": "Heinessen":
domain: "archive.heinessen.com"
http: true
software: "fuuka"
boards: ["an", "fit", "k", "mlp", "r9k", "toy"] boards: ["an", "fit", "k", "mlp", "r9k", "toy"]
files: ["an", "fit", "k", "r9k", "toy"] files: ["an", "fit", "k", "r9k", "toy"]
data:
domain: "archive.heinessen.com"
http: true
software: "fuuka"
"warosu": "warosu":
domain: "fuuka.warosu.org"
http: true
https: true
software: "fuuka"
boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"] boards: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"] files: ["3", "cgl", "ck", "fa", "ic", "jp", "lit", "tg", "vr"]
data:
"Bui's Archive": domain: "fuuka.warosu.org"
domain: "archive.bui.pm" http: true
http: true https: true
https: true software: "fuuka"
software: "foolfuuka"
boards: ["b"]
files: ["b"]
"Foolz Beta": "Foolz Beta":
domain: "beta.foolz.us"
http: true
https: true
withCredentials: true
software: "foolfuuka"
boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], boards: ["a", "co", "d", "gd", "h", "jp", "m", "mlp", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"] files: ["a", "d", "gd", "h", "jp", "m", "tg", "u", "vg", "vp", "vr", "wsg"]
data:
domain: "beta.foolz.us"
http: true
https: true
withCredentials: true
software: "foolfuuka"
to: (dest, data) -> to: (dest, data) ->
archive = (if dest is 'search' then Redirect.data.thread else Redirect.data[dest])[data.boardID] archive = (if dest is 'search' then Redirect.data.thread else Redirect.data[dest])[data.boardID]