github-mirror/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2024-11-23 06:29:30 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

DEV: Check if video thumbnails site setting is enabled (#21306)

Browse Source
This commit is contained in:
Blake Erickson 2023-04-28 14:08:20 -06:00 committed by GitHub
parent cd24656570
commit e2fbf4865a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/models/post.rb
View File

@ -1013,7 +1013,8 @@ class Post < ActiveRecord::Base
upload ||= Upload.get_from_url(src)
# Link any video thumbnails
if upload.present? && (FileHelper.supported_video.include? upload.extension&.downcase)
if SiteSetting.video_thumbnails_enabled && upload.present? &&
FileHelper.supported_video.include?(upload.extension&.downcase)
# Video thumbnails have the filename of the video file sha1 with a .png or .jpg extension.
# This is because at time of upload in the composer we don't know the topic/post id yet
# and there is no thumbnail info added to the markdown to tie the thumbnail to the topic/post after

12
spec/models/post_spec.rb
View File

@ -1547,6 +1547,8 @@ RSpec.describe Post do
let(:post) { Fabricate(:post, raw: raw_video) }
before { SiteSetting.video_thumbnails_enabled = true }
it "has a topic thumbnail" do
# Thumbnails are tied to a specific video file by using the
# video's sha1 as the image filename
@ -1577,6 +1579,16 @@ RSpec.describe Post do
post.topic.reload
expect(post.topic.image_upload_id).to eq(image_upload_2.id)
end
it "does not create thumbnails when disabled" do
SiteSetting.video_thumbnails_enabled = false
image_upload.original_filename = "#{video_upload.sha1}.png"
image_upload.save!
post.link_post_uploads
post.topic.reload
expect(post.topic.topic_thumbnails.length).to eq(0)
end
end
describe "uploads" do