Fix decoding Account.moved on Mastodon

instead of enum

Additional categories can be added, which would cause a crash when
decoding.
As the category isn't used for anything, storing it as an enum value is
not necessary.

Pachyderm/Model/Account.swift

@@ -26,9 +26,44 @@ public class Account: Decodable {
     public let headerStatic: URL
     public private(set) var emojis: [Emoji]
     public let moved: Bool?
+    public let movedTo: Account?
     public let fields: [Field]?
     public let bot: Bool?
     
+    public required init(from decoder: Decoder) throws {
+        let container = try decoder.container(keyedBy: CodingKeys.self)
+        
+        self.id = try container.decode(String.self, forKey: .id)
+        self.username = try container.decode(String.self, forKey: .username)
+        self.acct = try container.decode(String.self, forKey: .acct)
+        self.displayName = try container.decode(String.self, forKey: .displayName)
+        self.locked = try container.decode(Bool.self, forKey: .locked)
+        self.createdAt = try container.decode(Date.self, forKey: .createdAt)
+        self.followersCount = try container.decode(Int.self, forKey: .followersCount)
+        self.followingCount = try container.decode(Int.self, forKey: .followingCount)
+        self.statusesCount = try container.decode(Int.self, forKey: .statusesCount)
+        self.note = try container.decode(String.self, forKey: .note)
+        self.url = try container.decode(URL.self, forKey: .url)
+        self.avatar = try container.decode(URL.self, forKey: .avatar)
+        self.avatarStatic = try container.decode(URL.self, forKey: .avatarStatic)
+        self.header = try container.decode(URL.self, forKey: .header)
+        self.headerStatic = try container.decode(URL.self, forKey: .url)
+        self.emojis = try container.decode([Emoji].self, forKey: .emojis)
+        self.fields = try? container.decode([Field].self, forKey: .fields)
+        self.bot = try? container.decode(Bool.self, forKey: .bot)
+        
+        if let moved = try? container.decode(Bool.self, forKey: .moved) {
+            self.moved = moved
+            self.movedTo = nil
+        } else if let account = try? container.decode(Account.self, forKey: .moved) {
+            self.moved = true
+            self.movedTo = account
+        } else {
+            self.moved = false
+            self.movedTo = nil
+        }
+    }
+    
     public static func authorizeFollowRequest(_ account: Account) -> Request<Relationship> {
         return Request<Relationship>(method: .post, path: "/api/v1/follow_requests/\(account.id)/authorize")
     }

Pachyderm/Model/Hashtag.swift

@@ -32,6 +32,39 @@ extension Hashtag {
         public let uses: Int
         public let accounts: Int
         
+        public required init(from decoder: Decoder) throws {
+            let container = try decoder.container(keyedBy: CodingKeys.self)
+            
+            if let day = try? container.decode(Date.self, forKey: .day) {
+                self.day = day
+            } else if let unixTimestamp = try? container.decode(Double.self, forKey: .day) {
+                self.day = Date(timeIntervalSince1970: unixTimestamp)
+            } else if let str = try? container.decode(String.self, forKey: .day),
+                let unixTimestamp = Double(str) {
+                self.day = Date(timeIntervalSince1970: unixTimestamp)
+            } else {
+                throw DecodingError.dataCorruptedError(forKey: .day, in: container, debugDescription: "day must be either date or UNIX timestamp")
+            }
+            
+            if let uses = try? container.decode(Int.self, forKey: .uses) {
+                self.uses = uses
+            } else if let str = try? container.decode(String.self, forKey: .uses),
+                let uses = Int(str) {
+                self.uses = uses
+            } else {
+                throw DecodingError.dataCorruptedError(forKey: .uses, in: container, debugDescription: "uses must either be int or string containing int")
+            }
+            
+            if let accounts = try? container.decode(Int.self, forKey: .accounts) {
+                self.accounts = accounts
+            } else if let str = try? container.decode(String.self, forKey: .accounts),
+                let accounts = Int(str) {
+                self.accounts = accounts
+            } else {
+                throw DecodingError.dataCorruptedError(forKey: .accounts, in: container, debugDescription: "accounts must either be int or string containing int")
+            }
+        }
+
         private enum CodingKeys: String, CodingKey {
             case day
             case uses

Pachyderm/Utilities/InstanceSelector.swift

@@ -51,7 +51,7 @@ public extension InstanceSelector {
         public let description: String
         public let proxiedThumbnailURL: URL
         public let language: String
-        public let category: Category
+        public let category: String
         
         enum CodingKeys: String, CodingKey {
             case domain
@@ -62,20 +62,3 @@ public extension InstanceSelector {
         }
     }
 }
-
-public extension InstanceSelector {
-    enum Category: String, Codable {
-        // source: https://source.joinmastodon.org/mastodon/joinmastodon/blob/master/src/Wizard.js#L108
-        case general
-        case regional
-        case art
-        case journalism
-        case activism
-        case lgbt
-        case games
-        case tech
-        case adult
-        case furry
-        case food
-    }
-}

Tusker/Views/Instance Cell/InstanceTableViewCell.swift

@@ -36,7 +36,7 @@ class InstanceTableViewCell: UITableViewCell {
         self.instance = nil
         
         domainLabel.text = instance.domain
-        adultLabel.isHidden = instance.category != .adult
+        adultLabel.isHidden = instance.category != "adult"
         descriptionTextView.setTextFromHtml(instance.description)
         updateThumbnail(url: instance.proxiedThumbnailURL)
     }