Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Stop setting a shortcode to newly-created media attachments (#16730)

Browse source 
* Stop setting a shortcode to newly-created media attachments

The WebUI has stopped using the “short media URL” in ages. This isn't used
anywhere except for mail notifications.

Deprecating it would allow us to eventually get rid of at least a database
column and corruption-prone index, as well as a controller.

* Fix tests
This commit is contained in:
Claire 2021-09-13 18:59:37 +02:00 • committed by GitHub
parent 75027b51a4
commit db57bff11d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

11
app/models/media_attachment.rb
View file

@ -255,7 +255,7 @@ class MediaAttachment < ApplicationRecord
after_commit :reset_parent_cache, on: :update
before_create :prepare_description, unless: :local?
before_create :set_shortcode
before_create :set_unknown_type
before_create :set_processing
after_post_process :set_meta
@ -298,15 +298,8 @@ class MediaAttachment < ApplicationRecord
private
def set_shortcode
def set_unknown_type
self.type = :unknown if file.blank? && !type_changed?
return unless local?
loop do
self.shortcode = SecureRandom.urlsafe_base64(14)
break if MediaAttachment.find_by(shortcode: shortcode).nil?
end
end
def prepare_description