Merge branch 'master' into v3

This commit is contained in:
Nicolas Stepien 2013-04-01 16:34:40 +02:00
commit c3a09159a3
2 changed files with 9 additions and 5 deletions

View File

@ -1,5 +1,9 @@
master master
2.39.1
- Mayhem
Add /gd/, /out/, /vp/ and /vr/ archive redirection.
2.39.0 2.39.0
- Queue - Queue
Fix rare bug in Relative Post Dates. Fix rare bug in Relative Post Dates.

View File

@ -1940,7 +1940,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}"
@ -1956,22 +1956,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' when 'a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'
"//archive.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}" "//archive.foolz.us/_/api/chan/post/?board=#{board}&num=#{postID}"
when 'u' when 'u'
"//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}"
# for fuuka-based archives: # for fuuka-based archives:
# https://github.com/eksopl/fuuka/issues/27 # https://github.com/eksopl/fuuka/issues/27
to: (data) -> to: (data) ->
{board} = data {board} = data
switch "#{board}" switch "#{board}"
when 'a', 'co', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'wsg' when 'a', 'co', 'gd', 'jp', 'm', 'q', 'sp', 'tg', 'tv', 'v', 'vg', 'vp', 'vr', 'wsg'
url = Redirect.path '//archive.foolz.us', 'foolfuuka', data url = Redirect.path '//archive.foolz.us', 'foolfuuka', data
when 'u' when 'u'
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