From c2b49bf2b7c0de842c047a56b7f33955a60433ff Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 13 Sep 2017 11:14:35 -0700 Subject: [PATCH] fixes #3293 --- app/logical/downloads/file.rb | 2 +- test/unit/downloads/file_test.rb | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/app/logical/downloads/file.rb b/app/logical/downloads/file.rb index 2b3e5424b..0fa1b26d7 100644 --- a/app/logical/downloads/file.rb +++ b/app/logical/downloads/file.rb @@ -114,7 +114,7 @@ module Downloads end # def def fix_twitter_sources(src) - if src =~ %r!^https?://pbs\.twimg\.com/! && original_source =~ %r!^https?://twitter\.com/! + if src =~ %r!^https?://(?:video|pbs)\.twimg\.com/! && original_source =~ %r!^https?://twitter\.com/! original_source elsif src =~ %r!^https?://img\.pawoo\.net/! && original_source =~ %r!^https?://pawoo\.net/! original_source diff --git a/test/unit/downloads/file_test.rb b/test/unit/downloads/file_test.rb index 65718c753..1eccb0a1a 100644 --- a/test/unit/downloads/file_test.rb +++ b/test/unit/downloads/file_test.rb @@ -2,6 +2,23 @@ require 'test_helper' module Downloads class FileTest < ActiveSupport::TestCase + context "A twitter video download" do + setup do + @source = "https://twitter.com/CincinnatiZoo/status/859073537713328129" + @tempfile = Tempfile.new("danbooru-test") + @download = Downloads::File.new(@source, @tempfile.path) + end + + teardown do + @tempfile.close + end + + should "preserve the twitter source" do + @download.download! + assert_equal("https://twitter.com/CincinnatiZoo/status/859073537713328129", @download.source) + end + end + context "A post download" do setup do @source = "http://www.google.com/intl/en_ALL/images/logo.gif"