From 712a5844b32989c47d038111775b4da1d16d6aee Mon Sep 17 00:00:00 2001 From: Toks Date: Mon, 5 Jan 2015 21:39:19 -0500 Subject: [PATCH] Update for new twitpic link format related #1866 --- app/logical/downloads/rewrite_strategies/twitpic.rb | 4 ++-- app/models/post.rb | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/logical/downloads/rewrite_strategies/twitpic.rb b/app/logical/downloads/rewrite_strategies/twitpic.rb index 2a1c97422..b8a07195e 100644 --- a/app/logical/downloads/rewrite_strategies/twitpic.rb +++ b/app/logical/downloads/rewrite_strategies/twitpic.rb @@ -2,7 +2,7 @@ module Downloads module RewriteStrategies class Twitpic < Base 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_thumbnails(url, headers) end @@ -24,7 +24,7 @@ module Downloads end 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 url.sub!("/thumb/" + match, "/large/" + match) end diff --git a/app/models/post.rb b/app/models/post.rb index 804793a20..68730e2c8 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -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 "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_36_id = base_10_id.to_s(36) "http://twitpic.com/#{base_36_id}"