IntenseWebs/discourse
3
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 09:26:54 -06:00
Code Issues Packages Projects Releases Wiki Activity

PERF: Reduce work when external sources are allowed in InlineUploads (#14594)

Browse Source 
It also fixes a bug in `match_bbcode_img()` which didn't check `block_given?` for all conditions.
This commit is contained in:
Gerhard Schlager 2021-10-13 18:59:05 +02:00 committed by GitHub
parent e1d3175668
commit 9ab9eda40e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/inline_uploads.rb
View File

@ -149,7 +149,7 @@ class InlineUploads
def self.match_md_inline_img(markdown, external_src: false)
markdown.scan(/(!?\[([^\[\]]*)\]\(([^\s\)]+)([ ]*['"]{1}[^\)]*['"]{1}[ ]*)?\))/) do |match|
if (matched_uploads(match[2]).present? || external_src) && block_given?
if (external_src || matched_uploads(match[2]).present?) && block_given?
yield(
match[0],
match[2],
@ -162,7 +162,7 @@ class InlineUploads
def self.match_bbcode_img(markdown, external_src: false)
markdown.scan(/(\[img\]\s*([^\[\]\s]+)\s*\[\/img\])/i) do |match|
if (matched_uploads(match[1]).present? && block_given?) || external_src
if (external_src || (matched_uploads(match[1]).present?)) && block_given?
yield(match[0], match[1], +"![](#{PLACEHOLDER})", $~.offset(0)[0])
end
end
@ -186,7 +186,7 @@ class InlineUploads
node = Nokogiri::HTML5::fragment(match[0]).children[0]
href = node.attributes["href"]&.value
if href && (matched_uploads(href).present? || external_href)
if href && (external_href || matched_uploads(href).present?)
has_attachment = node.attributes["class"]&.value
index = $~.offset(0)[0]
text = match[2].strip.gsub("\n", "").gsub(/ +/, " ")
@ -202,7 +202,7 @@ class InlineUploads
node = Nokogiri::HTML5::fragment(match[2].strip).children[0]
src = node&.attributes&.[]("src")&.value
if src && (matched_uploads(src).present? || external_src)
if src && (external_src || matched_uploads(src).present?)
upload = uploads&.[](src)
text = upload&.original_filename || node.attributes["alt"]&.value