forked from shadowfacts/Tusker
Fix crash when decoding emojis with spaces in URLs
This commit is contained in:
parent
0249207dcc
commit
904ff4eecf
|
@ -14,6 +14,25 @@ public class Emoji: Codable {
|
||||||
public let staticURL: URL
|
public let staticURL: URL
|
||||||
public let visibleInPicker: Bool
|
public let visibleInPicker: Bool
|
||||||
|
|
||||||
|
public required init(from decoder: Decoder) throws {
|
||||||
|
let container = try decoder.container(keyedBy: CodingKeys.self)
|
||||||
|
|
||||||
|
self.shortcode = try container.decode(String.self, forKey: .shortcode)
|
||||||
|
if let url = try? container.decode(URL.self, forKey: .url) {
|
||||||
|
self.url = url
|
||||||
|
} else {
|
||||||
|
let str = try container.decode(String.self, forKey: .url)
|
||||||
|
self.url = URL(string: str.replacingOccurrences(of: " ", with: "%20"))!
|
||||||
|
}
|
||||||
|
if let url = try? container.decode(URL.self, forKey: .staticURL) {
|
||||||
|
self.staticURL = url
|
||||||
|
} else {
|
||||||
|
let staticStr = try container.decode(String.self, forKey: .staticURL)
|
||||||
|
self.staticURL = URL(string: staticStr.replacingOccurrences(of: " ", with: "%20"))!
|
||||||
|
}
|
||||||
|
self.visibleInPicker = try container.decode(Bool.self, forKey: .visibleInPicker)
|
||||||
|
}
|
||||||
|
|
||||||
private enum CodingKeys: String, CodingKey {
|
private enum CodingKeys: String, CodingKey {
|
||||||
case shortcode
|
case shortcode
|
||||||
case url
|
case url
|
||||||
|
|
Loading…
Reference in New Issue