refactor: 脱 SwiftyJSON

rinsuki · rinsuki · commit 9ec6ddc0dd2f · 2023-09-30T17:01:27.000+09:00
diff --git a/Podfile b/Podfile
@@ -11,7 +11,6 @@ abstract_target 'iMastShared' do
   def core_pods
     pod 'GRDB.swift', '~> 4.6.2', :linkage => :static
   end
-  pod 'SwiftyJSON', '5.0.0'
   pod 'HydraAsync', '~> 2.0.6'
   pod 'SDWebImage', '~> 5.12.6'
   pod 'Fuzi', '~> 3.1.3'
diff --git a/Podfile.lock b/Podfile.lock
@@ -16,7 +16,6 @@ PODS:
   - Starscream (3.1.1)
   - SwiftGen (6.5.1)
   - SwiftLint (0.52.4)
-  - SwiftyJSON (5.0.0)
 
 DEPENDENCIES:
   - Alamofire (~> 4.9.1)
@@ -32,7 +31,6 @@ DEPENDENCIES:
   - Starscream (~> 3.1.1)
   - SwiftGen (= 6.5.1)
   - SwiftLint (= 0.52.4)
-  - SwiftyJSON (= 5.0.0)
 
 SPEC REPOS:
   trunk:
@@ -48,7 +46,6 @@ SPEC REPOS:
     - Starscream
     - SwiftGen
     - SwiftLint
-    - SwiftyJSON
 
 EXTERNAL SOURCES:
   Mew:
@@ -74,8 +71,7 @@ SPEC CHECKSUMS:
   Starscream: 4bb2f9942274833f7b4d296a55504dcfc7edb7b0
   SwiftGen: a6d22010845f08fe18fbdf3a07a8e380fd22e0ea
   SwiftLint: 1cc5cd61ba9bacb2194e340aeb47a2a37fda00b3
-  SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
 
-PODFILE CHECKSUM: eec6d544bb8107e88e88e4075992f435b33bed36
+PODFILE CHECKSUM: 625b70b19f2dca2402959b351e5fff797553261f
 
 COCOAPODS: 1.13.0
diff --git a/Sources/Core/Mastodon/Endpoint/MastodonEndpoint.swift b/Sources/Core/Mastodon/Endpoint/MastodonEndpoint.swift
@@ -56,4 +56,26 @@ extension MastodonEndpoint {
             case postIds = "status_ids"
         }
     }
+    
+    public struct VerifyCredentials: MastodonEndpointProtocol {
+        public struct Response: MastodonEndpointResponse, Decodable {
+            let displayName: String
+            let screenName: String
+            let avatar: String
+            public let source: Source?
+            
+            public struct Source: Decodable {
+                public let privacy: String
+            }
+            
+            enum CodingKeys: String, CodingKey {
+                case displayName = "display_name"
+                case screenName = "username"
+                case avatar = "avatar_static"
+                case source
+            }
+        }
+        public let endpoint = "/api/v1/accounts/verify_credentials"
+        public let method = "GET"
+    }
 }
diff --git a/Sources/Core/Mastodon/Model/MastodonApp.swift b/Sources/Core/Mastodon/Model/MastodonApp.swift
@@ -22,7 +22,6 @@
 //  limitations under the License.
 
 import Foundation
-import SwiftyJSON
 import Alamofire
 import GRDB
 
@@ -44,10 +43,10 @@ public class MastodonApp: Hashable {
     public var instance: MastodonInstance
     var id: String
     
-    init(instance: MastodonInstance, info: JSON, name: String, redirectUri: String) {
+    init(instance: MastodonInstance, info: MastodonInstance.CreateAppResponse, name: String, redirectUri: String) {
         self.instance = instance
-        clientId = info["client_id"].stringValue
-        clientSecret = info["client_secret"].stringValue
+        clientId = info.clientId
+        clientSecret = info.clientSecret
         self.name = name
         self.redirectUri = redirectUri
         self.id = genRandomString()
diff --git a/Sources/Core/Mastodon/Model/MastodonInstance.swift b/Sources/Core/Mastodon/Model/MastodonInstance.swift
@@ -22,11 +22,8 @@
 //  limitations under the License.
 
 import Foundation
-import SwiftyJSON
-import Hydra
-//import Alamofire
 
-var mastodonInstanceInfoCache: [String: JSON] = [:]
+var mastodonInstanceInfoCache: [String: MastodonInstance.Info] = [:]
 
 #if os(macOS)
 public let defaultAppName = "iMast (macOS)"
@@ -37,10 +34,35 @@ private let website = "https://cinderella-project.github.io/iMast/"
 #endif
 
 public class MastodonInstance {
+    public struct Info: Codable {
+        public let version: String
+        public let urls: Urls
+        
+        public struct Urls: Codable {
+            public let streamingApi: String
+            
+            enum CodingKeys: String, CodingKey {
+                case streamingApi = "streaming_api"
+            }
+        }
+        
+        enum CodingKeys: String, CodingKey {
+            case version
+            case urls
+        }
+    }
+    
+    struct CreateAppResponse: Codable {
+        let clientId: String
+        let clientSecret: String
+        
+        enum CodingKeys: String, CodingKey {
+            case clientId = "client_id"
+            case clientSecret = "client_secret"
+        }
+    }
+    
     public var hostName: String
-    public var name: String?
-    var description: String?
-    var email: String?
     public var url: URL {
         return URL(string: "https://\(self.hostName)")!
     }
@@ -49,18 +71,15 @@ public class MastodonInstance {
         self.hostName = hostName.replacing(/.+@/, with: "").lowercased()
     }
     
-    public func getInfo() async throws -> JSON {
+    public func getInfo() async throws -> Info {
         if let cache = mastodonInstanceInfoCache[self.hostName] {
             return cache
         }
         var request = try URLRequest(url: URL(string: "https://\(hostName)/api/v1/instance")!, method: .get)
         request.setValue(UserAgentString, forHTTPHeaderField: "User-Agent")
         let data = try await MastodonAPI.handleHTTPError(URLSession.shared.data(for: request))
-        let json = try JSON(data: data)
+        let json = try JSONDecoder.forMastodonAPI.decode(Info.self, from: data)
         
-        self.name = json["name"].string
-        self.description = json["description"].string
-        self.email = json["email"].string
         mastodonInstanceInfoCache[self.hostName] = json
         return json
     }
@@ -77,7 +96,7 @@ public class MastodonInstance {
         request.setValue("application/json; charset=UTF-8", forHTTPHeaderField: "Content-Type")
         request.httpBody = try JSONEncoder().encode(params)
         let data = try await MastodonAPI.handleHTTPError(URLSession.shared.data(for: request))
-        let json = try JSON(data: data)
+        let json = try JSONDecoder.forMastodonAPI.decode(CreateAppResponse.self, from: data)
         
         return MastodonApp(instance: self, info: json, name: name, redirectUri: redirect_uri)
     }
diff --git a/Sources/Core/Mastodon/Model/MastodonUserToken.swift b/Sources/Core/Mastodon/Model/MastodonUserToken.swift
@@ -22,7 +22,6 @@
 //  limitations under the License.
 
 import Foundation
-import SwiftyJSON
 import Alamofire
 import Hydra
 import GRDB
@@ -59,7 +58,7 @@ public class MastodonUserToken: Equatable, @unchecked Sendable {
     }
     
     public func getIntVersion() async throws -> MastodonVersionInt {
-        return MastodonVersionInt(try await self.app.instance.getInfo()["version"].stringValue)
+        return MastodonVersionInt(try await self.app.instance.getInfo().version)
     }
     
     static public func initFromId(id: String) -> MastodonUserToken? {
@@ -201,25 +200,20 @@ public class MastodonUserToken: Equatable, @unchecked Sendable {
         }
     }
     
-    static var verifyCredentialsCache: [String: JSON] = [:]
+    static var verifyCredentialsCache: [String: MastodonEndpoint.VerifyCredentials.Response] = [:]
     
-    public func getUserInfo(cache: Bool = false) async throws -> JSON {
+    public func getUserInfo(cache: Bool = false) async throws -> MastodonEndpoint.VerifyCredentials.Response {
         if cache, let cacheObj = MastodonUserToken.verifyCredentialsCache[self.acct] {
             return cacheObj
         }
-        let response = try await getJSON("accounts/verify_credentials")
-        self.name = response["display_name"].string
-        if self.name == nil || self.name?.isEmpty == true {
-            self.name = response["name"].string
-        }
-        self.screenName = response["username"].string
-        self.avatarUrl = response["avatar"].string
+        let response = try await MastodonEndpoint.VerifyCredentials().request(with: self)
+        self.name = response.displayName.isEmpty ? response.screenName : response.displayName
+        self.screenName = response.screenName
+        self.avatarUrl = response.avatar
         if let avatarUrl = self.avatarUrl, !avatarUrl.isEmpty, avatarUrl.first == "/" { // ホスト名がない！！！
             self.avatarUrl = "https://"+self.app.instance.hostName+self.avatarUrl!
         }
-        if response["error"].isEmpty {
-            MastodonUserToken.verifyCredentialsCache[self.acct] = response
-        }
+        MastodonUserToken.verifyCredentialsCache[self.acct] = response
         return response
     }
     
@@ -257,35 +251,6 @@ public class MastodonUserToken: Equatable, @unchecked Sendable {
         )
     }
     
-    @available(*, deprecated)
-    func getJSON(_ endpoint: String, params: [URLQueryItem] = []) async throws -> JSON {
-        print("GET", endpoint)
-        
-        var urlBuilder = URLComponents(url: URL(string: endpoint, relativeTo: URL(string: "https://\(self.app.instance.hostName)/api/v1/")!)!, resolvingAgainstBaseURL: true)!
-        urlBuilder.queryItems = params
-        if urlBuilder.queryItems?.count == 0 {
-            urlBuilder.queryItems = nil
-        }
-        let headers = getHeader()
-        var request = URLRequest(url: try urlBuilder.asURL())
-        print(request.url)
-        request.httpMethod = "GET"
-        for (name, value) in headers {
-            request.setValue(value, forHTTPHeaderField: name)
-        }
-        print(request.httpMethod!, request.url!)
-        let (data, response) = try await URLSession.shared.data(for: request)
-        if let response = response as? HTTPURLResponse, response.statusCode >= 400 {
-            do {
-                let error = try JSONDecoder.forMastodonAPI.decode(MastodonErrorResponse.self, from: data)
-                throw APIError.errorReturned(errorMessage: error.error, errorHttpCode: response.statusCode)
-            } catch {
-                throw APIError.unknownResponse(errorHttpCode: response.statusCode, errorString: .init(data: data, encoding: .utf8))
-            }
-        }
-        return try JSON(data: data)
-    }
-    
     public func upload(file: Data, mimetype: String, filename: String = "imast_upload_file") async throws -> MastodonAttachment {
         let request = try await withCheckedThrowingContinuation { continuation in
             Alamofire.upload(
diff --git a/Sources/Mac/App/Generated/licenses.json b/Sources/Mac/App/Generated/licenses.json
@@ -70,9 +70,5 @@
 	{
 		"title": "SwiftLint (0.52.4)",
 		"text": "The MIT License (MIT)\n\nCopyright (c) 2020 Realm Inc.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
-	},
-	{
-		"title": "SwiftyJSON (5.0.0)",
-		"text": "The MIT License (MIT)\n\nCopyright (c) 2017 Ruoyu Fu\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
 	}
 ]
diff --git a/Sources/iOS/App/Screens/NewPost/NewPostViewController.swift b/Sources/iOS/App/Screens/NewPost/NewPostViewController.swift
@@ -23,7 +23,6 @@
 
 import UIKit
 import Hydra
-import SwiftyJSON
 import MediaPlayer
 import Alamofire
 import iMastiOSCore
@@ -313,20 +312,22 @@ class NewPostViewController: UIViewController, UITextViewDelegate {
             var request = URLRequest(url: URL(string: "https://itunes.apple.com/lookup?id=\(storeId)&country=\(region)&media=music")!)
             request.timeoutInterval = 1.5
             request.addValue(UserAgentString, forHTTPHeaderField: "User-Agent")
-            Alamofire.request(request).responseData { [finished] res in
+            Task { @MainActor in
                 var text = nowPlayingText
                 do {
-                    switch res.result {
-                    case .success(let data):
-                        let json = try JSON(data: data)
-                        if let url = json["results"][0]["trackViewUrl"].string {
-                            text += " " + url + " "
-                        }
-                    case .failure(let error):
-                        throw error
+                    let (data, res) = try await URLSession.shared.data(for: request)
+                    struct SearchResultWrapper: Codable {
+                        let results: [SearchResult]
+                    }
+                    struct SearchResult: Codable {
+                        let trackViewUrl: URL
+                    }
+                    let result = try JSONDecoder().decode(SearchResultWrapper.self, from: data)
+                    if let url = result.results.first?.trackViewUrl {
+                        text += " " + url.absoluteString + " "
                     }
                 } catch {
-                    print(error)
+                    // nothing
                 }
                 finished(text)
             }
@@ -378,7 +379,7 @@ class NewPostViewController: UIViewController, UITextViewDelegate {
     func setVisibilityFromUserInfo() {
         Task { @MainActor in
             let res = try await self.userToken.getUserInfo(cache: true)
-            if let myScope = MastodonPostVisibility(rawValue: res["source"]["privacy"].string ?? "public") {
+            if let myScope = MastodonPostVisibility(rawValue: res.source?.privacy ?? "public") {
                 self.scope = myScope
             }
         }
diff --git a/Sources/iOS/App/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt b/Sources/iOS/App/Settings.bundle/com.mono0926.LicensePlist.latest_result.txt
@@ -416,46 +416,6 @@ name: SwiftLint, nameSpecified:
 body: The MIT License (MIT…
 version: 0.52.4
 
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
-name: SwiftyJSON, nameSpecified: 
-body: The MIT License (MIT…
-version: 5.0.0
-
 name: mikutter, nameSpecified: , owner: mikutter, version: , source: https://github.com/mikutter/mikutter
 
 name: mikutter, nameSpecified: , owner: mikutter, version: , source: https://github.com/mikutter/mikutter
diff --git a/Sources/iOS/App/Settings.bundle/com.mono0926.LicensePlist.plist b/Sources/iOS/App/Settings.bundle/com.mono0926.LicensePlist.plist
@@ -154,14 +154,6 @@
 			<key>Type</key>
 			<string>PSChildPaneSpecifier</string>
 		</dict>
-		<dict>
-			<key>File</key>
-			<string>com.mono0926.LicensePlist/SwiftyJSON</string>
-			<key>Title</key>
-			<string>SwiftyJSON (5.0.0)</string>
-			<key>Type</key>
-			<string>PSChildPaneSpecifier</string>
-		</dict>
 	</array>
 </dict>
 </plist>
diff --git a/Sources/iOS/App/Settings.bundle/com.mono0926.LicensePlist/SwiftyJSON.plist b/Sources/iOS/App/Settings.bundle/com.mono0926.LicensePlist/SwiftyJSON.plist
diff --git a/Sources/iOS/App/WebSocketWrapper.swift b/Sources/iOS/App/WebSocketWrapper.swift
diff --git a/Sources/iOS/Extensions/iMastShare/ShareNewPostViewController.swift b/Sources/iOS/Extensions/iMastShare/ShareNewPostViewController.swift
diff --git a/iMast.xcodeproj/project.pbxproj b/iMast.xcodeproj/project.pbxproj

Original file line number	Diff line number	Diff line change
`@@ -70,9 +70,5 @@`
`70`	`70`	`{`
`71`	`71`	`"title": "SwiftLint (0.52.4)",`
`72`	`72`	"text": "The MIT License (MIT)\n\nCopyright (c) 2020 Realm Inc.\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in all\ncopies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE\nSOFTWARE.\n"
`73`		`- },`
`74`		`- {`
`75`		`- "title": "SwiftyJSON (5.0.0)",`
`76`		- "text": "The MIT License (MIT)\n\nCopyright (c) 2017 Ruoyu Fu\n\nPermission is hereby granted, free of charge, to any person obtaining a copy\nof this software and associated documentation files (the \"Software\"), to deal\nin the Software without restriction, including without limitation the rights\nto use, copy, modify, merge, publish, distribute, sublicense, and/or sell\ncopies of the Software, and to permit persons to whom the Software is\nfurnished to do so, subject to the following conditions:\n\nThe above copyright notice and this permission notice shall be included in\nall copies or substantial portions of the Software.\n\nTHE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR\nIMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\nFITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE\nAUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER\nLIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,\nOUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN\nTHE SOFTWARE.\n"
`77`	`73`	`}`
`78`	`74`	`]`