Fix some warnings

mastodon · Nov 16, 2023 · 4014a1b · 4014a1b
1 parent 9947335
commit 4014a1b
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 37 deletions.
diff --git a/MastodonSDK/Sources/CoreDataStack/CoreDataStack.swift b/MastodonSDK/Sources/CoreDataStack/CoreDataStack.swift
@@ -94,18 +94,6 @@ public final class CoreDataStack {
             container.viewContext.automaticallyMergesChangesFromParent = true
 
             callback()
-
-            #if DEBUG
-            do {
-                let storeURL = URL.storeURL(for: AppName.groupID, databaseName: "shared")
-                let data = try Data(contentsOf: storeURL)
-                let formatter = ByteCountFormatter()
-                formatter.allowedUnits = [.useMB]
-                formatter.countStyle = .file
-                let size = formatter.string(fromByteCount: Int64(data.count))
-            } catch {
-            }
-            #endif
         })
     }
 

diff --git a/MastodonSDK/Sources/MastodonCore/Extension/MastodonSDK/Mastodon+Entity+Field.swift b/MastodonSDK/Sources/MastodonCore/Extension/MastodonSDK/Mastodon+Entity+Field.swift
diff --git a/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Status+History.swift b/MastodonSDK/Sources/MastodonCore/Service/API/APIService+Status+History.swift
@@ -50,7 +50,7 @@ extension APIService {
                 domain: domain,
                 authorization: authorization).singleOutput()
 
-            let responseHistory = try await Mastodon.API.Statuses.editHistory(
+            _ = try await Mastodon.API.Statuses.editHistory(
                 forStatusID: statusID,
                 session: session,
                 domain: domain,

diff --git a/MastodonSDK/Sources/MastodonCore/Service/Notification/NotificationService.swift b/MastodonSDK/Sources/MastodonCore/Service/Notification/NotificationService.swift
@@ -238,7 +238,7 @@ extension NotificationService {
     }
 
     private func authenticationBox(for pushNotification: MastodonPushNotification) async throws -> MastodonAuthenticationBox? {
-        guard let authenticationService = self.authenticationService else { return nil }
+        guard self.authenticationService != nil else { return nil }
         let results = AuthenticationServiceProvider.shared.authentications.filter { $0.userAccessToken == pushNotification.accessToken }
         guard let authentication = results.first else { return nil }
 

diff --git a/.../Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+UITextViewDelegate.swift b/.../Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel+UITextViewDelegate.swift
@@ -31,7 +31,7 @@ extension ComposeContentViewModel: UITextViewDelegate {
         switch textView {
         case contentMetaText?.textView:
             // update model
-            guard let metaText = self.contentMetaText else {
+            guard self.contentMetaText != nil else {
                 assertionFailure()
                 return
             }

diff --git a/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift b/MastodonSDK/Sources/MastodonUI/Scene/ComposeContent/ComposeContentViewModel.swift
@@ -211,7 +211,7 @@ public final class ComposeContentViewModel: NSObject, ObservableObject {
 
         let recentLanguages = context.settingService.currentSetting.value?.recentLanguages ?? []
         self.recentLanguages = recentLanguages
-        self.language = recentLanguages.first ?? Locale.current.languageCode ?? "en"
+        self.language = recentLanguages.first ?? Locale.current.language.languageCode?.identifier ?? "en"
         super.init()
         // end init
 
@@ -490,7 +490,7 @@ extension ComposeContentViewModel {
             .flatMap { settings in
                 if let settings {
                     return settings.publisher(for: \.recentLanguages, options: .initial).eraseToAnyPublisher()
-                } else if let code = Locale.current.languageCode {
+                } else if let code = Locale.current.language.languageCode?.identifier {
                     return Just([code]).eraseToAnyPublisher()
                 }
                 return Just([]).eraseToAnyPublisher()

diff --git a/...Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView+ViewModel.swift b/...Sources/MastodonUI/Scene/ComposeContent/Toolbar/ComposeContentToolbarView+ViewModel.swift
@@ -32,7 +32,7 @@ extension ComposeContentToolbarView {
         @Published var isAttachmentButtonEnabled = false
         @Published var isPollButtonEnabled = false
 
-        @Published var language = Locale.current.languageCode ?? "en"
+        @Published var language = Locale.current.language.languageCode?.identifier ?? "en"
         @Published var recentLanguages: [String] = []
 
         @Published public var maxTextInputLimit = 500