edshot99/eBooru
1
0
Fork 0
forked from e621ng/e621ng
Code Issues 11 Releases 1 Activity

fixes #3293

Browse Source
This commit is contained in:
r888888888 2017-09-13 11:14:35 -07:00
parent ed75e4bcf6
commit c2b49bf2b7
2 changed files with 18 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/logical/downloads/file.rb
View File

@ -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

17
test/unit/downloads/file_test.rb
View File

@ -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"