A platform for community discussion. Free, open, simple.
FIX: Review media without image dimensions (#42079)
Sam6ecbc17067c5
diff --git a/lib/new_post_manager.rb b/lib/new_post_manager.rbindex ed004750665..15905c65b62 100644--- a/lib/new_post_manager.rb+++ b/lib/new_post_manager.rb@@ -114,14 +114,19 @@ class NewPostManagerreturn :category if post_needs_approval_in_its_category?(manager)- if manager.args[:image_sizes].present? &&- !user.in_any_groups?(SiteSetting.skip_review_media_groups_map)- return :contains_media+ unless user.in_any_groups?(SiteSetting.skip_review_media_groups_map)+ return :contains_media if contains_embedded_media?(manager.args)end:skipend+ def self.contains_embedded_media?(args)+ return true if args[:image_sizes].present?++ Post.new(raw: args[:raw], topic_id: args[:topic_id]).embedded_media_count.positive?+ end+def self.post_needs_approval_in_its_category?(manager)guardian = manager.user.guardiandiff --git a/spec/lib/new_post_manager_spec.rb b/spec/lib/new_post_manager_spec.rbindex 49aeda1b352..14d3fc6b654 100644--- a/spec/lib/new_post_manager_spec.rb+++ b/spec/lib/new_post_manager_spec.rb@@ -295,6 +295,7 @@ RSpec.describe NewPostManager doendcontext "with media" do+ let(:empty_image_sizes) { {} }let(:manager_opts) do{raw: "this is new post content",@@ -321,6 +322,53 @@ RSpec.describe NewPostManager doexpect(result.reason).to eq(:contains_media)end+ it "queues an image for review when image dimensions are missing" do+ SiteSetting.skip_review_media_groups = Group::AUTO_GROUPS[:trust_level_1]+ manager =+ NewPostManager.new(+ user,+ manager_opts.merge(+ raw: "",+ image_sizes: empty_image_sizes,+ ),+ )++ result = NewPostManager.default_handler(manager)++ expect(result.action).to eq(:enqueued)+ expect(result.reason).to eq(:contains_media)+ end++ it "queues embedded video for review when image dimensions are missing" do+ SiteSetting.skip_review_media_groups = Group::AUTO_GROUPS[:trust_level_1]+ manager =+ NewPostManager.new(+ user,+ manager_opts.merge(+ raw:+ '<video controls><source src="https://example.com/video.mp4" type="video/mp4"></video>',+ image_sizes: empty_image_sizes,+ ),+ )++ result = NewPostManager.default_handler(manager)++ expect(result.action).to eq(:enqueued)+ expect(result.reason).to eq(:contains_media)+ end++ it "does not queue plain text or emoji when image dimensions are missing" do+ SiteSetting.skip_review_media_groups = Group::AUTO_GROUPS[:trust_level_1]+ results =+ ["plain text without media", "content with an emoji :mask:"].map do |raw|+ manager =+ NewPostManager.new(user, manager_opts.merge(raw: raw, image_sizes: empty_image_sizes))+ NewPostManager.default_handler(manager)+ end++ expect(results).to eq([nil, nil])+ end+it "does not enqueue the post if the poster is a trusted user" doSiteSetting.skip_review_media_groups = Group::AUTO_GROUPS[:trust_level_0]manager = NewPostManager.new(user, manager_opts)