diff --git a/app/assets/stylesheets/specific/forum.scss b/app/assets/stylesheets/specific/forum.scss index 60fe79f21..5c0cddf61 100644 --- a/app/assets/stylesheets/specific/forum.scss +++ b/app/assets/stylesheets/specific/forum.scss @@ -6,7 +6,7 @@ div.list-of-forum-posts { } article { - border: 1px solid #999; + border: 1px solid #AAA; margin: 1em 0em; word-wrap: break-word; box-shadow: 1px 1px 2px #AAA; diff --git a/app/logical/downloads/rewrite_strategies/art_station.rb b/app/logical/downloads/rewrite_strategies/art_station.rb index 454044f9e..5ded4faf1 100644 --- a/app/logical/downloads/rewrite_strategies/art_station.rb +++ b/app/logical/downloads/rewrite_strategies/art_station.rb @@ -18,7 +18,6 @@ module Downloads protected def rewrite_html_url(url, headers) return [url, headers] unless Sources::Strategies::ArtStation.url_match?(url) - source = Sources::Site.new(url) source.get [source.image_url, headers] diff --git a/app/logical/sources/site.rb b/app/logical/sources/site.rb index a2dc0a47f..d9c818ee9 100644 --- a/app/logical/sources/site.rb +++ b/app/logical/sources/site.rb @@ -17,16 +17,14 @@ module Sources end def initialize(url, referer_url: nil) - @url = url - Site.strategies.each do |strategy| if strategy.url_match?(url) || strategy.url_match?(referer_url) @strategy = strategy.new(url, referer_url) - break + return end - - raise NoStrategyError.new end + + raise NoStrategyError.new end def referer_url diff --git a/app/logical/sources/strategies/art_station.rb b/app/logical/sources/strategies/art_station.rb index b697a06f3..28dd0f9b2 100644 --- a/app/logical/sources/strategies/art_station.rb +++ b/app/logical/sources/strategies/art_station.rb @@ -6,9 +6,9 @@ module Sources::Strategies self.project_id(url).present? end - # https://www.artstation.com/artwork/04XA4" - # https://dantewontdie.artstation.com/projects/YZK5q" - # https://www.artstation.com/artwork/cody-from-sf" + # https://www.artstation.com/artwork/04XA4 + # https://dantewontdie.artstation.com/projects/YZK5q + # https://www.artstation.com/artwork/cody-from-sf def self.project_id(url) if url =~ %r!\Ahttps?://\w+\.artstation\.com/(?:artwork|projects)/(?[a-z0-9-]+)\z!i $~[:project_id] diff --git a/test/unit/downloads/art_station_test.rb b/test/unit/downloads/art_station_test.rb index 46e24357b..a7db904d5 100644 --- a/test/unit/downloads/art_station_test.rb +++ b/test/unit/downloads/art_station_test.rb @@ -11,7 +11,7 @@ module Downloads end should "download the large image instead" do - assert_equal("https://cdnb3.artstation.com/p/assets/images/images/003/716/071/original/aoi-ogata-hate-city.jpg?1476754974", @download.source) + assert_equal("https://cdnb3.artstation.com/p/assets/images/images/003/716/071/large/aoi-ogata-hate-city.jpg?1476754974", @download.source) end end @@ -37,7 +37,7 @@ module Downloads end should "download the original image instead" do - assert_equal("https://cdna.artstation.com/p/assets/images/images/006/066/534/original/yinan-cui-reika.jpg?1495781565", @download.source) + assert_equal("https://cdna.artstation.com/p/assets/images/images/006/066/534/large/yinan-cui-reika.jpg?1495781565", @download.source) end end end diff --git a/test/unit/downloads/deviant_art_test.rb b/test/unit/downloads/deviant_art_test.rb index 11250697b..42013174d 100644 --- a/test/unit/downloads/deviant_art_test.rb +++ b/test/unit/downloads/deviant_art_test.rb @@ -11,7 +11,7 @@ module Downloads end should "set the html page as the source" do - assert_equal("http://orig00.deviantart.net/82ef/f/2016/271/7/1/aaaaaa_by_starbitt-daj8b46.gif", @download.source) + assert_equal("https://orig00.deviantart.net/82ef/f/2016/271/7/1/aaaaaa_by_starbitt-daj8b46.gif", @download.source) end should "work" do