jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update for new twitpic link format

Browse Source 
related #1866
This commit is contained in:
Toks
2015-01-05 21:39:19 -05:00
parent 9d1c31a06f
commit 712a5844b3
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/logical/downloads/rewrite_strategies/twitpic.rb
View File

@@ -2,7 +2,7 @@ module Downloads
module RewriteStrategies module RewriteStrategies
class Twitpic < Base class Twitpic < Base
def rewrite(url, headers, data = {}) def rewrite(url, headers, data = {})
if url =~ %r{https?://twitpic\.com} || url =~ %r{^https?://d3j5vwomefv46c\.cloudfront\.net} if url =~ %r{https?://twitpic\.com} || url =~ %r{^https?://(?:d3j5vwomefv46c|dn3pm25xmtlyu)\.cloudfront\.net}
url, headers = rewrite_html_pages(url, headers) url, headers = rewrite_html_pages(url, headers)
url, headers = rewrite_thumbnails(url, headers) url, headers = rewrite_thumbnails(url, headers)
end end
@@ -24,7 +24,7 @@ module Downloads
end end
def rewrite_thumbnails(url, headers) def rewrite_thumbnails(url, headers)
if url =~ %r{^https?://d3j5vwomefv46c\.cloudfront\.net/photos/thumb/(\d+\..+)$} if url =~ %r{^https?://(?:d3j5vwomefv46c|dn3pm25xmtlyu)\.cloudfront\.net/photos/thumb/(\d+\..+)$}
match = $1 match = $1
url.sub!("/thumb/" + match, "/large/" + match) url.sub!("/thumb/" + match, "/large/" + match)
end end

2
app/models/post.rb
View File

@@ -313,7 +313,7 @@ class Post < ActiveRecord::Base
when %r{\Ahttp://lohas\.nicoseiga\.jp/priv/(\d+)\?e=\d+&h=[a-f0-9]+}i, %r{\Ahttp://lohas\.nicoseiga\.jp/priv/[a-f0-9]+/\d+/(\d+)}i when %r{\Ahttp://lohas\.nicoseiga\.jp/priv/(\d+)\?e=\d+&h=[a-f0-9]+}i, %r{\Ahttp://lohas\.nicoseiga\.jp/priv/[a-f0-9]+/\d+/(\d+)}i
"http://seiga.nicovideo.jp/seiga/im#{$1}" "http://seiga.nicovideo.jp/seiga/im#{$1}"
when %r{\Ahttps?://d3j5vwomefv46c\.cloudfront\.net/photos/large/(\d+)\.}i when %r{\Ahttps?://(?:d3j5vwomefv46c|dn3pm25xmtlyu)\.cloudfront\.net/photos/large/(\d+)\.}i
base_10_id = $1.to_i base_10_id = $1.to_i
base_36_id = base_10_id.to_s(36) base_36_id = base_10_id.to_s(36)
"http://twitpic.com/#{base_36_id}" "http://twitpic.com/#{base_36_id}"