github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-06-05 14:07:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

FIX: always try to convert PNG to JPG when pasting an image

Browse Source
This commit is contained in:
Régis Hanol
2017-06-23 12:13:48 +02:00
parent bfd892bbbc
commit a9c0df0b58
4 changed files with 33 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
app/controllers/uploads_controller.rb
View File

@ -13,17 +13,18 @@ class UploadsController < ApplicationController
return render json: failed_json, status: 422
end
url = params[:url]
file = params[:file] || params[:files]&.first
for_private_message = params[:for_private_message]
url = params[:url]
file = params[:file] || params[:files]&.first
pasted = params[:pasted] == "true"
for_private_message = params[:for_private_message] == "true"
if params[:synchronous] && (current_user.staff? || is_api?)
data = create_upload(file, url, type, for_private_message)
data = create_upload(file, url, type, for_private_message, pasted)
render json: data.as_json
else
Scheduler::Defer.later("Create Upload") do
begin
data = create_upload(file, url, type, for_private_message)
data = create_upload(file, url, type, for_private_message, pasted)
ensure
MessageBus.publish("/uploads/#{type}", (data || {}).as_json, client_ids: [params[:client_id]])
end
@ -60,7 +61,7 @@ class UploadsController < ApplicationController
raise Discourse::NotFound
end
def create_upload(file, url, type, for_private_message = false)
def create_upload(file, url, type, for_private_message, pasted)
if file.nil?
if url.present? && is_api?
maximum_upload_size = [SiteSetting.max_image_size_kb, SiteSetting.max_attachment_size_kb].max.kilobytes
@ -79,8 +80,12 @@ class UploadsController < ApplicationController
return { errors: [I18n.t("upload.file_missing")] } if tempfile.nil?
opts = { type: type, content_type: content_type }
opts[:for_private_message] = true if for_private_message
opts = {
type: type,
content_type: content_type,
for_private_message: for_private_message,
pasted: pasted,
}
upload = UploadCreator.new(tempfile, filename, opts).create_for(current_user.id)