jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2763 from evazion/fix-image-board-sources

Browse Source 
Don't clobber image board sources.
This commit is contained in:
Albert Yi
2016-11-28 11:45:03 -08:00
committed by GitHub
parent 77e06b6c08 3eafc5ae6a
commit c5bb71a3f3
1 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -55,7 +55,6 @@ module Downloads
end end
def after_download(src) def after_download(src)
src = fix_image_board_sources(src)
src = fix_twitter_sources(src) src = fix_twitter_sources(src)
if options[:referer_url].present? if options[:referer_url].present?
src = set_source_to_referer(src) src = set_source_to_referer(src)
@@ -128,14 +127,6 @@ module Downloads
[src, datums] [src, datums]
end # def end # def
def fix_image_board_sources(src)
if src =~ /i\.4cdn\.org|\/src\/\d{12,}|urnc\.yi\.org|yui\.cynthia\.bne\.jp/
"Image board"
else
src
end
end
def fix_twitter_sources(src) def fix_twitter_sources(src)
if src =~ %r!^https?://pbs\.twimg\.com/! && original_source =~ %r!^https?://twitter\.com/! if src =~ %r!^https?://pbs\.twimg\.com/! && original_source =~ %r!^https?://twitter\.com/!
original_source original_source