From cf7703d784fe1ef15c01bd55c4b7f9aa58731436 Mon Sep 17 00:00:00 2001 From: Enzo Moretti Date: Wed, 20 Aug 2014 21:48:13 +0200 Subject: [PATCH] NSFW Foolz to NSFW Moe, added /h/ to NSFW Moe, removed Foolz Beta Conflicts: src/Archive/archives.json --- builds/appchan-x.user.js | 29 +++++------------------------ builds/crx/script.js | 29 +++++------------------------ src/Archive/archives.json | 27 ++++----------------------- 3 files changed, 14 insertions(+), 71 deletions(-) diff --git a/builds/appchan-x.user.js b/builds/appchan-x.user.js index 791f711f4..1e7a1e17f 100644 --- a/builds/appchan-x.user.js +++ b/builds/appchan-x.user.js @@ -13222,7 +13222,7 @@ } return Redirect.data = o; }, - archives: [{"uid":0,"name":"Moe","domain":"archive.moe","http":true,"https":true,"software":"foolfuuka","boards":["a","biz","c","co","diy","gd","int","jp","m","out","po","sci","sp","tg","tv","v","vg","vp","vr","wsg"],"files":["a","biz","c","co","diy","gd","jp","m","po","sci","tg","v","vg","vp","vr","wsg"]},{"uid":1,"name":"NSFW Foolz","domain":"nsfw.foolz.us","http":true,"https":true,"software":"foolfuuka","boards":["u"],"files":["u"]},{"uid":3,"name":"4plebs Archive","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["d","i","lgbt","e","t","u"],"files":["d","i","lgbt","e","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"archive.rebeccablacktech.com","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","w"],"files":["cgl","g","mu","w"]},{"uid":9,"name":"Heinessen","domain":"archive.heinessen.com","http":true,"https":false,"software":"fuuka","boards":["an","fit","k","mlp","r9k","toy"],"files":["an","fit","k","mlp","r9k","toy"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","cm","h","hc","hm","n","p","r","s","soc","y"],"files":["asp","cm","h","hc","hm","n","p","r","s","soc","y"]},{"uid":16,"name":"maware","domain":"archive.mawa.re","http":true,"https":false,"software":"foolfuuka","boards":["t"],"files":["t"]},{"uid":19,"name":"Deniable Plausibility","domain":"boards.deniableplausibility.net","http":true,"https":false,"software":"foolfuuka","boards":["v","vg"],"files":["v","vg"]},{"uid":13,"name":"Foolz Beta","domain":"beta.foolz.us","http":true,"https":true,"withCredentials":true,"software":"foolfuuka","boards":["a","biz","c","co","d","diy","gd","h","i","int","jp","m","out","po","s4s","sci","sp","tg","tv","u","v","vg","vp","vr","wsg"],"files":["a","biz","c","co","d","diy","gd","h","i","jp","m","po","s4s","sci","tg","u","v","vg","vp","vr","wsg"]}], + archives: [{"uid":0,"name":"Moe","domain":"archive.moe","http":true,"https":true,"software":"foolfuuka","boards":["a","biz","c","co","diy","gd","int","jp","m","out","po","sci","sp","tg","tv","v","vg","vp","vr","wsg"],"files":["a","biz","c","co","diy","gd","jp","m","po","sci","tg","v","vg","vp","vr","wsg"]},{"uid":1,"name":"NSFW Moe","domain":"nsfw.archive.moe","http":true,"https":true,"software":"foolfuuka","boards":["h","u"],"files":["h","u"]},{"uid":3,"name":"4plebs Archive","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["d","i","lgbt","e","t","u"],"files":["d","i","lgbt","e","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"archive.rebeccablacktech.com","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","w"],"files":["cgl","g","mu","w"]},{"uid":9,"name":"Heinessen","domain":"archive.heinessen.com","http":true,"https":false,"software":"fuuka","boards":["an","fit","k","mlp","r9k","toy"],"files":["an","fit","k","mlp","r9k","toy"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","cm","h","hc","hm","n","p","r","s","soc","y"],"files":["asp","cm","h","hc","hm","n","p","r","s","soc","y"]},{"uid":16,"name":"maware","domain":"archive.mawa.re","http":true,"https":false,"software":"foolfuuka","boards":["t"],"files":["t"]}], to: function(dest, data) { var archive; archive = (dest === 'search' || dest === 'board' ? Redirect.data.thread : Redirect.data[dest])[data.boardID]; @@ -13290,13 +13290,13 @@ "files": ["a", "biz", "c", "co", "diy", "gd", "jp", "m", "po", "sci", "tg", "v", "vg", "vp", "vr", "wsg"] }, { "uid": 1, - "name": "NSFW Foolz", - "domain": "nsfw.foolz.us", + "name": "NSFW Moe", + "domain": "nsfw.archive.moe", "http": true, "https": true, "software": "foolfuuka", - "boards": ["u"], - "files": ["u"] + "boards": ["h", "u"], + "files": ["h", "u"] }, { "uid": 3, "name": "4plebs Archive", @@ -13369,25 +13369,6 @@ "software": "foolfuuka", "boards": ["t"], "files": ["t"] - }, { - "uid": 19, - "name": "Deniable Plausibility", - "domain": "boards.deniableplausibility.net", - "http": true, - "https": false, - "software": "foolfuuka", - "boards": ["v", "vg"], - "files": ["v", "vg"] - }, { - "uid": 13, - "name": "Foolz Beta", - "domain": "beta.foolz.us", - "http": true, - "https": true, - "withCredentials": true, - "software": "foolfuuka", - "boards": ["a", "biz", "c", "co", "d", "diy", "gd", "h", "i", "int", "jp", "m", "out", "po", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], - "files": ["a", "biz", "c", "co", "d", "diy", "gd", "h", "i", "jp", "m", "po", "s4s", "sci", "tg", "u", "v", "vg", "vp", "vr", "wsg"] } ]; diff --git a/builds/crx/script.js b/builds/crx/script.js index 8025cb09c..8c4ff211f 100644 --- a/builds/crx/script.js +++ b/builds/crx/script.js @@ -13227,7 +13227,7 @@ } return Redirect.data = o; }, - archives: [{"uid":0,"name":"Moe","domain":"archive.moe","http":true,"https":true,"software":"foolfuuka","boards":["a","biz","c","co","diy","gd","int","jp","m","out","po","sci","sp","tg","tv","v","vg","vp","vr","wsg"],"files":["a","biz","c","co","diy","gd","jp","m","po","sci","tg","v","vg","vp","vr","wsg"]},{"uid":1,"name":"NSFW Foolz","domain":"nsfw.foolz.us","http":true,"https":true,"software":"foolfuuka","boards":["u"],"files":["u"]},{"uid":3,"name":"4plebs Archive","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["d","i","lgbt","e","t","u"],"files":["d","i","lgbt","e","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"archive.rebeccablacktech.com","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","w"],"files":["cgl","g","mu","w"]},{"uid":9,"name":"Heinessen","domain":"archive.heinessen.com","http":true,"https":false,"software":"fuuka","boards":["an","fit","k","mlp","r9k","toy"],"files":["an","fit","k","mlp","r9k","toy"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","cm","h","hc","hm","n","p","r","s","soc","y"],"files":["asp","cm","h","hc","hm","n","p","r","s","soc","y"]},{"uid":16,"name":"maware","domain":"archive.mawa.re","http":true,"https":false,"software":"foolfuuka","boards":["t"],"files":["t"]},{"uid":19,"name":"Deniable Plausibility","domain":"boards.deniableplausibility.net","http":true,"https":false,"software":"foolfuuka","boards":["v","vg"],"files":["v","vg"]},{"uid":13,"name":"Foolz Beta","domain":"beta.foolz.us","http":true,"https":true,"withCredentials":true,"software":"foolfuuka","boards":["a","biz","c","co","d","diy","gd","h","i","int","jp","m","out","po","s4s","sci","sp","tg","tv","u","v","vg","vp","vr","wsg"],"files":["a","biz","c","co","d","diy","gd","h","i","jp","m","po","s4s","sci","tg","u","v","vg","vp","vr","wsg"]}], + archives: [{"uid":0,"name":"Moe","domain":"archive.moe","http":true,"https":true,"software":"foolfuuka","boards":["a","biz","c","co","diy","gd","int","jp","m","out","po","sci","sp","tg","tv","v","vg","vp","vr","wsg"],"files":["a","biz","c","co","diy","gd","jp","m","po","sci","tg","v","vg","vp","vr","wsg"]},{"uid":1,"name":"NSFW Moe","domain":"nsfw.archive.moe","http":true,"https":true,"software":"foolfuuka","boards":["h","u"],"files":["h","u"]},{"uid":3,"name":"4plebs Archive","domain":"archive.4plebs.org","http":true,"https":true,"software":"foolfuuka","boards":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"],"files":["adv","f","hr","o","pol","s4s","tg","trv","tv","x"]},{"uid":4,"name":"Nyafuu","domain":"archive.nyafuu.org","http":true,"https":true,"software":"foolfuuka","boards":["c","e","w","wg"],"files":["c","e","w","wg"]},{"uid":5,"name":"Love is Over","domain":"archive.loveisover.me","http":true,"https":true,"software":"foolfuuka","boards":["d","i","lgbt","e","t","u"],"files":["d","i","lgbt","e","t","u"]},{"uid":8,"name":"Rebecca Black Tech","domain":"archive.rebeccablacktech.com","http":false,"https":true,"software":"fuuka","boards":["cgl","g","mu","w"],"files":["cgl","g","mu","w"]},{"uid":9,"name":"Heinessen","domain":"archive.heinessen.com","http":true,"https":false,"software":"fuuka","boards":["an","fit","k","mlp","r9k","toy"],"files":["an","fit","k","mlp","r9k","toy"]},{"uid":10,"name":"warosu","domain":"warosu.org","http":false,"https":true,"software":"fuuka","boards":["3","biz","cgl","ck","diy","fa","g","ic","jp","lit","sci","tg","vr"],"files":["3","biz","cgl","ck","diy","fa","ic","jp","lit","sci","tg","vr"]},{"uid":15,"name":"fgts","domain":"fgts.jp","http":true,"https":true,"software":"foolfuuka","boards":["asp","cm","h","hc","hm","n","p","r","s","soc","y"],"files":["asp","cm","h","hc","hm","n","p","r","s","soc","y"]},{"uid":16,"name":"maware","domain":"archive.mawa.re","http":true,"https":false,"software":"foolfuuka","boards":["t"],"files":["t"]}], to: function(dest, data) { var archive; archive = (dest === 'search' || dest === 'board' ? Redirect.data.thread : Redirect.data[dest])[data.boardID]; @@ -13295,13 +13295,13 @@ "files": ["a", "biz", "c", "co", "diy", "gd", "jp", "m", "po", "sci", "tg", "v", "vg", "vp", "vr", "wsg"] }, { "uid": 1, - "name": "NSFW Foolz", - "domain": "nsfw.foolz.us", + "name": "NSFW Moe", + "domain": "nsfw.archive.moe", "http": true, "https": true, "software": "foolfuuka", - "boards": ["u"], - "files": ["u"] + "boards": ["h", "u"], + "files": ["h", "u"] }, { "uid": 3, "name": "4plebs Archive", @@ -13374,25 +13374,6 @@ "software": "foolfuuka", "boards": ["t"], "files": ["t"] - }, { - "uid": 19, - "name": "Deniable Plausibility", - "domain": "boards.deniableplausibility.net", - "http": true, - "https": false, - "software": "foolfuuka", - "boards": ["v", "vg"], - "files": ["v", "vg"] - }, { - "uid": 13, - "name": "Foolz Beta", - "domain": "beta.foolz.us", - "http": true, - "https": true, - "withCredentials": true, - "software": "foolfuuka", - "boards": ["a", "biz", "c", "co", "d", "diy", "gd", "h", "i", "int", "jp", "m", "out", "po", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], - "files": ["a", "biz", "c", "co", "d", "diy", "gd", "h", "i", "jp", "m", "po", "s4s", "sci", "tg", "u", "v", "vg", "vp", "vr", "wsg"] } ]; diff --git a/src/Archive/archives.json b/src/Archive/archives.json index ca30b0dc0..fa2f1eb48 100644 --- a/src/Archive/archives.json +++ b/src/Archive/archives.json @@ -9,13 +9,13 @@ "files": ["a", "biz", "c", "co", "diy", "gd", "jp", "m", "po", "sci", "tg", "v", "vg", "vp", "vr", "wsg"] }, { "uid": 1, - "name": "NSFW Foolz", - "domain": "nsfw.foolz.us", + "name": "NSFW Moe", + "domain": "nsfw.archive.moe", "http": true, "https": true, "software": "foolfuuka", - "boards": ["u"], - "files": ["u"] + "boards": ["h", "u"], + "files": ["h", "u"] }, { "uid": 3, "name": "4plebs Archive", @@ -88,23 +88,4 @@ "software": "foolfuuka", "boards": ["t"], "files": ["t"] -}, { - "uid": 19, - "name": "Deniable Plausibility", - "domain": "boards.deniableplausibility.net", - "http": true, - "https": false, - "software": "foolfuuka", - "boards": ["v", "vg"], - "files": ["v", "vg"] -}, { - "uid": 13, - "name": "Foolz Beta", - "domain": "beta.foolz.us", - "http": true, - "https": true, - "withCredentials": true, - "software": "foolfuuka", - "boards": ["a", "biz", "c", "co", "d", "diy", "gd", "h", "i", "int", "jp", "m", "out", "po", "s4s", "sci", "sp", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"], - "files": ["a", "biz", "c", "co", "d", "diy", "gd", "h", "i", "jp", "m", "po", "s4s", "sci", "tg", "u", "v", "vg", "vp", "vr", "wsg"] }]