Fix #3982: Uploads: URI::InvalidURIError - URI must be ascii only.
This commit is contained in:
@@ -135,6 +135,24 @@ class Upload < ApplicationRecord
|
||||
end
|
||||
end
|
||||
|
||||
module SourceMethods
|
||||
def source=(source)
|
||||
source = source.unicode_normalize(:nfc)
|
||||
|
||||
# percent encode unicode characters in urls
|
||||
if source =~ %r!\Ahttps?://!i
|
||||
source = Addressable::URI.normalized_encode(source) rescue source
|
||||
end
|
||||
|
||||
super(source)
|
||||
end
|
||||
|
||||
def source_url
|
||||
return nil unless source =~ %r!\Ahttps?://!i
|
||||
Addressable::URI.heuristic_parse(source) rescue nil
|
||||
end
|
||||
end
|
||||
|
||||
module UploaderMethods
|
||||
def uploader_name
|
||||
User.id_to_name(uploader_id)
|
||||
@@ -233,6 +251,7 @@ class Upload < ApplicationRecord
|
||||
include VideoMethods
|
||||
extend SearchMethods
|
||||
include ApiMethods
|
||||
include SourceMethods
|
||||
|
||||
def uploader_is_not_limited
|
||||
if !uploader.can_upload?
|
||||
|
||||
Reference in New Issue
Block a user