mirror of
				https://github.com/discourse/discourse.git
				synced 2025-02-25 18:55:32 -06:00 
			
		
		
		
	Temporarily revert "FEATURE: Support [description|attachment](upload://<short-sha>) in MD. (#7603)"
				
					
				
			This reverts commit b1d3c678ca.
We need to make sure post_upload records are correctly stored.
			
			
This commit is contained in:
		@@ -117,28 +117,7 @@ class Upload < ActiveRecord::Base
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def short_url
 | 
			
		||||
    "upload://#{short_url_basename}"
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def short_path
 | 
			
		||||
    self.class.short_path(sha1: self.sha1, extension: self.extension)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def self.short_path(sha1:, extension:)
 | 
			
		||||
    @url_helpers ||= Rails.application.routes.url_helpers
 | 
			
		||||
 | 
			
		||||
    @url_helpers.upload_short_path(
 | 
			
		||||
      base62: self.base62_sha1(sha1),
 | 
			
		||||
      extension: extension
 | 
			
		||||
    )
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def self.base62_sha1(sha1)
 | 
			
		||||
    Base62.encode(sha1.hex)
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def base62_sha1
 | 
			
		||||
    Upload.base62_sha1(upload.sha1)
 | 
			
		||||
    "upload://#{Base62.encode(sha1.hex)}.#{extension}"
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  def local?
 | 
			
		||||
@@ -203,17 +182,13 @@ class Upload < ActiveRecord::Base
 | 
			
		||||
 | 
			
		||||
  def self.sha1_from_short_url(url)
 | 
			
		||||
    if url =~ /(upload:\/\/)?([a-zA-Z0-9]+)(\..*)?/
 | 
			
		||||
      self.sha1_from_base62_encoded($2)
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
      sha1 = Base62.decode($2).to_s(16)
 | 
			
		||||
 | 
			
		||||
  def self.sha1_from_base62_encoded(encoded_sha1)
 | 
			
		||||
    sha1 = Base62.decode(encoded_sha1).to_s(16)
 | 
			
		||||
 | 
			
		||||
    if sha1.length > SHA1_LENGTH
 | 
			
		||||
      nil
 | 
			
		||||
    else
 | 
			
		||||
      sha1.rjust(SHA1_LENGTH, '0')
 | 
			
		||||
      if sha1.length > SHA1_LENGTH
 | 
			
		||||
        nil
 | 
			
		||||
      else
 | 
			
		||||
        sha1.rjust(SHA1_LENGTH, '0')
 | 
			
		||||
      end
 | 
			
		||||
    end
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
@@ -347,12 +322,6 @@ class Upload < ActiveRecord::Base
 | 
			
		||||
    problems
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  private
 | 
			
		||||
 | 
			
		||||
  def short_url_basename
 | 
			
		||||
    "#{Upload.base62_sha1(sha1)}.#{extension}"
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
# == Schema Information
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user