shadowfacts
/
Tusker
2
10
Fork 2
Code Issues 71 Pull Requests Releases Wiki Activity

Fix crash when decoding emojis with spaces in URLs

This commit is contained in:
Shadowfacts 2020-11-11 12:45:13 -05:00
parent 0249207dcc
commit 904ff4eecf
Signed by: shadowfacts
GPG Key ID: 94A5AB95422746E5
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Pachyderm/Model/Emoji.swift
View File

@ -14,6 +14,25 @@ public class Emoji: Codable {
public let staticURL: URL
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 {
case shortcode
case url