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

FIX: use new changed method name and remove whitespaces

Browse Source
This commit is contained in:
Vinoth Kannan
2019-04-09 02:25:26 +05:30
parent bc949cf684
commit f5ac01253a
3 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/upload_recovery.rb
View File

@ -28,7 +28,7 @@ class UploadRecovery
recover_post_upload(post, Upload.sha1_from_short_url(orig_src)) recover_post_upload(post, Upload.sha1_from_short_url(orig_src))
end end
elsif url = (media["href"] || media["src"]) elsif url = (media["href"] || media["src"])
data = Upload.extract_upload_url(url) data = Upload.extract_url(url)
next unless data next unless data
sha1 = data[2] sha1 = data[2]
@ -58,7 +58,7 @@ class UploadRecovery
background = user_profile.public_send(column) background = user_profile.public_send(column)
if background.present? && !Upload.exists?(url: background) if background.present? && !Upload.exists?(url: background)
data = Upload.extract_upload_url(background) data = Upload.extract_url(background)
next unless data next unless data
sha1 = data[2] sha1 = data[2]

8
spec/models/upload_spec.rb
View File

@ -95,6 +95,14 @@ describe Upload do
expect(created_upload.valid?).to eq(false) expect(created_upload.valid?).to eq(false)
end end
context ".extract_url" do
let(:url) { 'https://example.com/uploads/default/original/1X/d1c2d40ab994e8410c.png' }
it 'should return the right part of url' do
expect(Upload.extract_url(url).to_s).to eq('/original/1X/d1c2d40ab994e8410c.png')
end
end
context ".get_from_url" do context ".get_from_url" do
let(:sha1) { "10f73034616a796dfd70177dc54b6def44c4ba6f" } let(:sha1) { "10f73034616a796dfd70177dc54b6def44c4ba6f" }
let(:upload) { Fabricate(:upload, sha1: sha1) } let(:upload) { Fabricate(:upload, sha1: sha1) }