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

Improve handling of inlined images in incoming emails

Browse Source
This commit is contained in:
Régis Hanol
2017-05-03 22:54:26 +02:00
parent 768c63c103
commit bf322281e3
3 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/email/receiver.rb
View File

@ -194,7 +194,7 @@ module Email
end
markdown, elided_markdown = if html.present?
markdown = HtmlToMarkdown.new(html, keep_img_tags: true).to_markdown
markdown = HtmlToMarkdown.new(html, keep_img_tags: true, keep_cid_imgs: true).to_markdown
markdown = trim_discourse_markers(markdown)
EmailReplyTrimmer.trim(markdown, true)
end
@ -573,8 +573,14 @@ module Email
upload = Upload.create_for(options[:user].id, tmp, attachment.filename, tmp.size, opts)
if upload && upload.errors.empty?
# try to inline images
if attachment.content_type.start_with?("image/") && options[:raw][/\[image: .+ \d+\]/]
options[:raw].sub!(/\[image: .+ \d+\]/, attachment_markdown(upload))
if attachment.content_type.start_with?("image/")
if options[:raw][attachment.url]
options[:raw].sub!(attachment.url, upload.url)
elsif options[:raw][/\[image:.*?\d+[^\]]*\]/i]
options[:raw].sub!(/\[image:.*?\d+[^\]]*\]/i, attachment_markdown(upload))
else
options[:raw] << "\n\n#{attachment_markdown(upload)}\n\n"
end
else
options[:raw] << "\n\n#{attachment_markdown(upload)}\n\n"
end