github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-05-22 04:31:10 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: API can provide a URL to create an upload

Browse Source
This commit is contained in:
Régis Hanol
2015-05-20 17:38:06 +02:00
parent c91634c09a
commit bcd98c8f0f
3 changed files with 13 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/controllers/uploads_controller.rb
View File

@ -7,16 +7,18 @@ class UploadsController < ApplicationController
file = params[:file] || params[:files].first
url = params[:url]
# TODO: support for API providing a URL (cf. AvatarUploadService)
Scheduler::Defer.later("Create Upload") do
upload = Upload.create_for(
current_user.id,
file.tempfile,
file.original_filename,
file.tempfile.size,
content_type: file.content_type
)
# API can provide a URL
if file.nil? && url.present? && is_api?
tempfile = FileHelper.download(url, SiteSetting.max_image_size_kb.kilobytes, "discourse-upload-#{type}") rescue nil
filename = File.basename(URI.parse(file).path)
else
tempfile = file.tempfile
filename = file.original_filename
content_type = file.content_type
end
upload = Upload.create_for(current_user.id, tempfile, filename, tempfile.size, content_type: content_type)
if upload.errors.empty? && current_user.admin?
retain_hours = params[:retain_hours].to_i
@ -26,6 +28,8 @@ class UploadsController < ApplicationController
data = upload.errors.empty? ? upload : { errors: upload.errors.values.flatten }
MessageBus.publish("/uploads/#{type}", data.as_json, user_ids: [current_user.id])
tempfile.try(:close!) rescue nil
end
# HACK FOR IE9 to prevent the "download dialog"