From 964be9a633c8be3f00a2dc16c0af81f700ecb666 Mon Sep 17 00:00:00 2001 From: ghostrigger Date: Sun, 15 Jun 2014 23:16:49 +0800 Subject: [PATCH 1/2] update #1866 escape escape the dot in the url --- app/models/post.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/app/models/post.rb b/app/models/post.rb index 8b7ee5374..ee0f38be4 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -312,16 +312,16 @@ class Post < ActiveRecord::Base day = $5 "http://diary#{server_id}.fc2.com/cgi-sys/ed.cgi/#{username}?Y=#{year}&M=#{month}&D=#{day}" - when %r{\Ahttps?://s(?:content|photos)-[^/]+\.fbcdn.net/hphotos-.+/\d+_(\d+)_\d+_[no]\.}i + when %r{\Ahttps?://s(?:content|photos)-[^/]+\.fbcdn\.net/hphotos-.+/\d+_(\d+)_\d+_[no]\.}i "https://www.facebook.com/photo.php?fbid=#{$1}" - when %r{\Ahttp://c(?:s|han|[1-4]).sankakucomplex.com/data(?:/sample)?/(?:[a-f0-9]{2}/){2}(?:sample-|preview)?([a-f0-9]{32})}i + when %r{\Ahttp://c(?:s|han|[1-4])\.sankakucomplex\.com/data(?:/sample)?/(?:[a-f0-9]{2}/){2}(?:sample-|preview)?([a-f0-9]{32})}i "http://chan.sankakucomplex.com/en/post/show?md5=#{$1}" - when %r{\Ahttp?://s(?:tatic|[1-4]).zerochan.net/.+(?:\.|\/)(\d+)\.(?:jpe?g?)\z}i + when %r{\Ahttp://s(?:tatic|[1-4])\.zerochan\.net/.+(?:\.|\/)(\d+)\.(?:jpe?g?)\z}i "http://www.zerochan.net/#{$1}#full" - when %r{\Ahttp?://static[1-6]?.minitokyo.net/(?:downloads|view)/(?:\d{2}/){2}(\d+)}i + when %r{\Ahttp://static[1-6]?\.minitokyo\.net/(?:downloads|view)/(?:\d{2}/){2}(\d+)}i "http://gallery.minitokyo.net/download/#{$1}" else From aa7a91c98f6a9ca1edbbc331d1e92b16fd2d7cf1 Mon Sep 17 00:00:00 2001 From: ghostrigger Date: Mon, 16 Jun 2014 01:19:27 +0800 Subject: [PATCH 2/2] #1866: support gelbooru source redirection doesn't support the discontinued sha1 naming scheme in some older files --- app/models/post.rb | 3 +++ 1 file changed, 3 insertions(+) diff --git a/app/models/post.rb b/app/models/post.rb index ee0f38be4..5c73f4fa5 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -324,6 +324,9 @@ class Post < ActiveRecord::Base when %r{\Ahttp://static[1-6]?\.minitokyo\.net/(?:downloads|view)/(?:\d{2}/){2}(\d+)}i "http://gallery.minitokyo.net/download/#{$1}" + when %r{\Ahttp://(?:(?:s?img|cdn|www)\d?\.)?gelbooru\.com/{1,2}(?:images|samples)/\d+/(?:sample_)?([a-f0-9]{32})\.}i + "http://gelbooru.com/index.php?page=post&s=list&md5=#{$1}" + else source end