ThePain/Swiftgram
1
0
Fork 0
mirror of https://github.com/Swiftgram/Telegram-iOS.git synced 2025-06-16 05:55:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix urlencode

Browse Source
This commit is contained in:
Ilya Laktyushin 2021-09-13 14:34:06 +03:00
parent e6c0a6965b
commit 9f94bc7f83
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
submodules/UrlEscaping/Sources/UrlEscaping.swift
View File

@ -45,11 +45,18 @@ public func explicitUrl(_ url: String) -> String {
return url return url
} }
private let validUrlSet: CharacterSet = {
var set = CharacterSet(charactersIn: "a".unicodeScalars.first! ... "z".unicodeScalars.first!)
set.insert(charactersIn: "A".unicodeScalars.first! ... "Z".unicodeScalars.first!)
set.insert(charactersIn: "0".unicodeScalars.first! ... "9".unicodeScalars.first!)
set.insert(charactersIn: ".?!@#$^&%*+=,:;'\"`<>()[]{}/\\|~ ")
return set
}()
public func urlEncodedStringFromString(_ string: String) -> String { public func urlEncodedStringFromString(_ string: String) -> String {
var nsString: NSString = string as NSString var nsString: NSString = string as NSString
if let value = nsString.removingPercentEncoding { if let value = nsString.removingPercentEncoding {
nsString = value as NSString nsString = value as NSString
} }
return nsString.addingPercentEncoding(withAllowedCharacters: validUrlSet) ?? ""
return nsString.addingPercentEncoding(withAllowedCharacters: CharacterSet(charactersIn: "?!@#$^&%*+=,:;'\"`<>()[]{}/\\|~ ")) ?? ""
} }