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

Fix #3197 - Post Replacement comment: use Replacement URL instead of Final Source

Browse Source 
Record the URL of the image that was actually downloaded as the replacement URL.
This commit is contained in:
evazion
2017-07-02 20:57:41 -05:00
parent 5a2745ee71
commit c3ac4f3329
4 changed files with 19 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/models/upload.rb
View File

@@ -7,7 +7,7 @@ class Upload < ApplicationRecord
attr_accessor :file, :image_width, :image_height, :file_ext, :md5,
:file_size, :as_pending, :artist_commentary_title,
:artist_commentary_desc, :include_artist_commentary,
:referer_url
:referer_url, :downloaded_source
belongs_to :uploader, :class_name => "User"
belongs_to :post
before_validation :initialize_uploader, :on => :create
@@ -110,7 +110,7 @@ class Upload < ApplicationRecord
update_attribute(:status, "processing")
self.source = strip_source
if is_downloadable?
self.source = download_from_source(temp_file_path)
self.downloaded_source, self.source = download_from_source(temp_file_path)
end
validate_file_exists
self.content_type = file_header_to_content_type(file_path)
@@ -407,7 +407,7 @@ class Upload < ApplicationRecord
download = Downloads::File.new(source, destination_path, :referer_url => referer_url)
download.download!
ugoira_service.load(download.data)
download.source
[download.downloaded_source, download.source]
end
end