From 6e80d77a8905281b9cb536cc21aa1bb7a07cd7c4 Mon Sep 17 00:00:00 2001 From: Toks Date: Wed, 24 Sep 2014 23:09:54 -0400 Subject: [PATCH] #2261 source redirection and pixiv_id for thumbnails --- app/models/post.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/app/models/post.rb b/app/models/post.rb index 6736926b1..e40ceb758 100644 --- a/app/models/post.rb +++ b/app/models/post.rb @@ -288,7 +288,7 @@ class Post < ActiveRecord::Base when %r{\Ahttp://img\d+\.pixiv\.net/img/[^\/]+/(\d+)}i, %r{\Ahttp://i\d\.pixiv\.net/img\d+/img/[^\/]+/(\d+)}i "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=#{$1}" - when %r{\Ahttp://i\d\.pixiv\.net/img-original/img/(?:\d+\/)+(\d+)_p} + when %r{\Ahttp://i\d\.pixiv\.net/img-original/img/(?:\d+\/)+(\d+)_p}, %r{\Ahttp://i\d\.pixiv\.net/c/\d+x\d+/img-master/img/(?:\d+\/)+(\d+)_p} "http://www.pixiv.net/member_illust.php?mode=medium&illust_id=#{$1}" 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 @@ -1386,6 +1386,8 @@ class Post < ActiveRecord::Base self.pixiv_id = $1 elsif source =~ %r!http://i\d\.pixiv\.net/img-original/img/(?:\d+\/)+(\d+)_p! self.pixiv_id = $1 + elsif source =~ %r!http://i\d\.pixiv\.net/c/\d+x\d+/img-master/img/(?:\d+\/)+(\d+)_p! + self.pixiv_id = $1 elsif source =~ /pixiv\.net/ && source =~ /illust_id=(\d+)/ self.pixiv_id = $1 else