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

Merge branch 'bstable'

Browse Source
This commit is contained in:
ccd0 2015-10-07 12:59:52 -07:00
commit efeb8532ad
3 changed files with 26 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@ -14,6 +14,9 @@ Sometimes the changelog has notes (not comprehensive) acknowledging people's wor
### v1.11.11
**v1.11.11.6** *(2015-10-07)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.6/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.6/builds/4chan-X-noupdate.crx "Chromium version")]
- (Hasumi, fgts, MayhemYDG, ccd0) Update archive list: Remove archive.moe, add boards picked up by https://desustorage.org/, https://fgts.jp/, and https://ff.b4k.co/.
**v1.11.11.5** *(2015-10-03)* - [[Firefox](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.5/builds/4chan-X-noupdate.user.js "Firefox version")] [[Chromium](https://raw.githubusercontent.com/ccd0/4chan-x/1.11.11.5/builds/4chan-X-noupdate.crx "Chromium version")]
- Add feedback page link to captcha error.

35
src/Archive/archives.json
View File

@ -1,13 +1,4 @@
[{
"uid": 0,
"name": "Moe",
"domain": "archive.moe",
"http": false,
"https": true,
"software": "foolfuuka",
"boards": ["a", "aco", "an", "biz", "c", "co", "diy", "fit", "gd", "gif", "h", "i", "int", "jp", "k", "m", "mlp", "out", "po", "qa", "r9k", "s4s", "sci", "tg", "tv", "u", "v", "vg", "vp", "vr", "wsg"],
"files": ["a", "aco", "an", "biz", "c", "co", "diy", "fit", "gd", "gif", "h", "i", "int", "jp", "k", "m", "mlp", "out", "po", "qa", "r9k", "s4s", "sci", "tg", "u", "v", "vg", "vp", "vr", "wsg"]
}, {
"uid": 3,
"name": "4plebs",
"domain": "archive.4plebs.org",
@ -59,17 +50,18 @@
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["asp", "b", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"],
"files": ["asp", "b", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "y"]
"boards": ["asp", "b", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "vp", "y"],
"files": ["asp", "b", "cm", "h", "hc", "hm", "n", "p", "qa", "r", "s", "soc", "toy", "vp", "y"]
}, {
"uid": 23,
"name": "archive.horse",
"domain": "4ch.archive.horse",
"name": "Desustorage",
"domain": "desustorage.org",
"http": false,
"https": true,
"software": "foolfuuka",
"boards": ["mlp", "qa"],
"files": ["mlp", "qa"]
"boards": ["a", "aco", "an", "c", "co", "d", "fit", "int", "k", "m", "mlp", "qa", "r9k", "tg", "wsg"],
"files": ["a", "aco", "an", "c", "co", "d", "fit", "int", "k", "m", "mlp", "qa", "r9k", "tg", "wsg"],
"search": ["mlp", "qa"]
}, {
"uid": 24,
"name": "fireden.net",
@ -78,5 +70,16 @@
"https": true,
"software": "foolfuuka",
"boards": ["cm", "ic", "vg", "y"],
"files": ["cm", "ic", "vg", "y"]
"files": ["cm", "ic", "vg", "y"],
"search": []
}, {
"uid": 25,
"name": "b4k.co",
"domain": "ff.b4k.co",
"http": true,
"https": true,
"software": "foolfuuka",
"boards": ["g", "mlp", "qa", "v"],
"files": [],
"search": []
}]

8
src/General/Config.coffee
View File

@ -704,11 +704,11 @@ Config =
# uploaders:
#//imgur.com/upload?url=%URL;types:gif,jpg,png,pdf;text:Upload to imgur
# "View Same" in archives:
#https://archive.moe/_/search/image/%MD5/;text:View same on archive.moe
#https://archive.moe/%board/search/image/%MD5/;text:View same on archive.moe/%board/;boards:<%=
grunt.file.readJSON('src/Archive/archives.json').filter(function(x) {return x.uid === 0})[0].files.join(',')
#https://archive.4plebs.org/_/search/image/%MD5/;text:View same on 4plebs
#https://archive.4plebs.org/%board/search/image/%MD5/;text:View same on 4plebs /%board/;boards:<%=
grunt.file.readJSON('src/Archive/archives.json').filter(function(x) {return x.uid === 3})[0].files.join(',')
%>
#https://rbt.asia/%board/image/%MD5;text:View same on RBT /%board/;boards:<%=
#https://rbt.asia/%board/?task=search2&search_media_hash=%MD5;text:View same on RBT /%board/;boards:<%=
grunt.file.readJSON('src/Archive/archives.json').filter(function(x) {return x.uid === 8})[0].files.join(',')
%>
"""