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

FIX: Quoting videos can show a corrupted thumbnail (#31079)

Browse Source 
This change ensures we use the base62 sha1 for videos when quoting
because this is what the composer is used to using. With a valid base62
sha1 the composer already knows how to fetch the placeholder image for
it.

Fallbacks have been created to continue to support the old way as well
as a fix for the old way so that the thumbnail continues to display when
quoting. These fallbacks are in place so that we don't have to rebake
all posts that contain videos. If we ever do that we may remove these
fallbacks.
This commit is contained in:
Blake Erickson
2025-01-30 17:54:50 -07:00
committed by GitHub
parent e849802a48
commit dfb64f9b84
4 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/discourse/app/lib/utilities.js
View File

@ -169,7 +169,13 @@ export function selectedText() {
div div
.querySelectorAll("div.video-placeholder-container[data-video-src]") .querySelectorAll("div.video-placeholder-container[data-video-src]")
.forEach((element) => { .forEach((element) => {
const videoBase62Sha1 = element.dataset.videoBase62Sha1;
if (videoBase62Sha1) {
element.replaceWith(`![|video](upload://${videoBase62Sha1})`);
} else {
// Fallback for old posts that don't contain data-video-base62-sha1
element.replaceWith(`![|video](${element.dataset.videoSrc})`); element.replaceWith(`![|video](${element.dataset.videoSrc})`);
}
}); });
return toMarkdown(div.outerHTML); return toMarkdown(div.outerHTML);

3
lib/pretty_text.rb
View File

@ -460,6 +460,9 @@ module PrettyText
video["data-thumbnail-src"] = UrlHelper.absolute( video["data-thumbnail-src"] = UrlHelper.absolute(
GlobalPath.upload_cdn_path(thumbnail.url), GlobalPath.upload_cdn_path(thumbnail.url),
) )
video[
"data-video-base62-sha1"
] = "#{Upload.base62_sha1(video_sha1)}#{File.extname(video_src)}"
end end
end end
end end

5
lib/pretty_text/helpers.rb
View File

@ -45,7 +45,10 @@ module PrettyText
urls.each do |url| urls.each do |url|
sha1 = Upload.sha1_from_short_url(url) sha1 = Upload.sha1_from_short_url(url)
if (url.split(".")[1].nil?) # video sha1 without extension for thumbnail if (url.split(".")[1].nil?) # video sha1 without extension for thumbnail
thumbnail = Upload.where("original_filename LIKE ?", "#{sha1}.%").last thumbnail = Upload.where("original_filename LIKE ?", "#{sha1}.%").last if sha1
# Fallback for old posts that don't contain data-video-base62-sha1
thumbnail = Upload.where("original_filename LIKE ?", "#{url}.%").last if thumbnail.nil? &&
sha1.nil?
sha1 = thumbnail.sha1 if thumbnail sha1 = thumbnail.sha1 if thumbnail
end end
map[url] = sha1 if sha1 map[url] = sha1 if sha1

4
spec/lib/pretty_text_spec.rb
View File

@ -2819,8 +2819,10 @@ HTML
doc = Nokogiri::HTML5.fragment(html) doc = Nokogiri::HTML5.fragment(html)
described_class.add_video_placeholder_image(doc) described_class.add_video_placeholder_image(doc)
video_base62_sha1 = "#{Upload.base62_sha1(@video_upload.sha1)}.#{@video_upload.extension}"
html_with_thumbnail = <<~HTML html_with_thumbnail = <<~HTML
<p></p><div class="video-placeholder-container" data-video-src="#{@video_upload.url}" data-thumbnail-src="http://test.localhost#{thumbnail.url}"></div><p></p> <p></p><div class="video-placeholder-container" data-video-src="#{@video_upload.url}" data-thumbnail-src="http://test.localhost#{thumbnail.url}" data-video-base62-sha1="#{video_base62_sha1}"></div><p></p>
HTML HTML
expect(doc.to_html).to eq(html_with_thumbnail) expect(doc.to_html).to eq(html_with_thumbnail)