mirror of
https://github.com/discourse/discourse.git
synced 2025-05-25 19:29:34 +08:00
FIX: should look through posts for image markdown
Downloaded onebox images only included in the cooked HTML content. So we have to check 'post.cooked' instead of 'raw'. bfdd0fe64cc90707569a158b0dbdecedf3d03986
This commit is contained in:
@ -108,6 +108,13 @@ class Post < ActiveRecord::Base
|
|||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
|
scope :have_uploads, -> {
|
||||||
|
where(
|
||||||
|
"(posts.cooked LIKE '%<a %' OR posts.cooked LIKE '%<img %') AND posts.cooked LIKE ?",
|
||||||
|
"%/uploads/#{RailsMultisite::ConnectionManagement.current_db}/%"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
delegate :username, to: :user
|
delegate :username, to: :user
|
||||||
|
|
||||||
def self.hidden_reasons
|
def self.hidden_reasons
|
||||||
|
@ -391,9 +391,8 @@ end
|
|||||||
desc 'Finds missing post upload records from cooked HTML content'
|
desc 'Finds missing post upload records from cooked HTML content'
|
||||||
task 'posts:missing_uploads' => :environment do
|
task 'posts:missing_uploads' => :environment do
|
||||||
name = "missing_uploads"
|
name = "missing_uploads"
|
||||||
db_name = RailsMultisite::ConnectionManagement.current_db
|
|
||||||
PostCustomField.where(name: name).destroy_all
|
PostCustomField.where(name: name).destroy_all
|
||||||
posts = Post.where("(posts.cooked LIKE '%<a %' OR posts.cooked LIKE '%<img %') AND posts.cooked LIKE '%/uploads/#{db_name}/%'").select(:id, :cooked)
|
posts = Post.have_uploads.select(:id, :cooked)
|
||||||
count = 0
|
count = 0
|
||||||
|
|
||||||
posts.find_each do |post|
|
posts.find_each do |post|
|
||||||
@ -401,7 +400,7 @@ task 'posts:missing_uploads' => :environment do
|
|||||||
|
|
||||||
Nokogiri::HTML::fragment(post.cooked).css("a/@href", "img/@src").each do |media|
|
Nokogiri::HTML::fragment(post.cooked).css("a/@href", "img/@src").each do |media|
|
||||||
src = media.value
|
src = media.value
|
||||||
next if src.blank? || (src =~ /\/uploads\/#{db_name}\//).blank?
|
next if src.blank? || (src =~ /\/uploads\/#{RailsMultisite::ConnectionManagement.current_db}\//).blank?
|
||||||
|
|
||||||
src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
|
src = "#{SiteSetting.force_https ? "https" : "http"}:#{src}" if src.start_with?("//")
|
||||||
next unless Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i
|
next unless Discourse.store.has_been_uploaded?(src) || src =~ /\A\/[^\/]/i
|
||||||
|
@ -4,12 +4,7 @@ class UploadRecovery
|
|||||||
end
|
end
|
||||||
|
|
||||||
def recover(posts = Post)
|
def recover(posts = Post)
|
||||||
posts.where("
|
posts.have_uploads.find_each do |post|
|
||||||
raw LIKE '%upload:\/\/%'
|
|
||||||
OR raw LIKE '%href=%'
|
|
||||||
OR raw LIKE '%src=%'
|
|
||||||
OR raw LIKE '%[img]%'
|
|
||||||
").find_each do |post|
|
|
||||||
|
|
||||||
begin
|
begin
|
||||||
analyzer = PostAnalyzer.new(post.raw, post.topic_id)
|
analyzer = PostAnalyzer.new(post.raw, post.topic_id)
|
||||||
|
@ -141,6 +141,33 @@ RSpec.describe UploadRecovery do
|
|||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
describe 'image markdown' do
|
||||||
|
let(:post) do
|
||||||
|
Fabricate(:post,
|
||||||
|
raw: <<~SQL,
|
||||||
|

|
||||||
|
SQL
|
||||||
|
user: user
|
||||||
|
).tap(&:link_post_uploads)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'should recover the upload' do
|
||||||
|
stub_request(:get, "http://test.localhost#{upload.url}")
|
||||||
|
.to_return(status: 200)
|
||||||
|
|
||||||
|
expect do
|
||||||
|
upload.destroy!
|
||||||
|
end.to change { post.reload.uploads.count }.from(1).to(0)
|
||||||
|
|
||||||
|
expect do
|
||||||
|
upload_recovery.recover
|
||||||
|
end.to change { post.reload.uploads.count }.from(0).to(1)
|
||||||
|
|
||||||
|
expect(File.read(Discourse.store.path_for(post.uploads.first)))
|
||||||
|
.to eq(File.read(file_from_fixtures("smallest.png")))
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
describe 'bbcode' do
|
describe 'bbcode' do
|
||||||
let(:post) do
|
let(:post) do
|
||||||
Fabricate(:post,
|
Fabricate(:post,
|
||||||
|
Reference in New Issue
Block a user