feat: Development commit

6 files changed, 14 insertions, 19 deletions

diff --git a/.swiftlint.yml b/.swiftlint.yml
index 430b4a1..bb785b7 100644
--- a/.swiftlint.yml
+++ b/.swiftlint.yml
@@ -22,7 +22,5 @@ disabled_rules:
   - opening_brace
   - required_deinit
   - trailing_comma
-  - inert_defer
-  - unused_capture_list
   - type_contents_order
 
diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift
index 8e9c5bd..3c7ed1d 100644
--- a/Sora/Data/Booru/BooruManager.swift
+++ b/Sora/Data/Booru/BooruManager.swift
@@ -65,8 +65,7 @@ class BooruManager: ObservableObject {
     updateTagsCacheSize()
   }
 
-  func fetchPosts(page: Int = 1, limit: Int = 100, tags: [String] = [], replace: Bool = false) async
-  {
+  func fetchPosts(page: Int = 1, limit: Int = 100, tags: [String] = [], replace: Bool = false) {
     guard !isLoading,
       let url = urlForPosts(page: flavor == .gelbooru ? page - 1 : page, limit: limit, tags: tags)
     else { return }
@@ -145,7 +144,7 @@ class BooruManager: ObservableObject {
 
     currentTask = nil
 
-    Task { await fetchPosts(page: 1, tags: tags, replace: true) }
+    fetchPosts(page: 1, tags: tags, replace: true)
   }
 
   func loadNextPage() {
@@ -154,7 +153,7 @@ class BooruManager: ObservableObject {
     Task {
       currentPage += 1
 
-      await fetchPosts(page: currentPage, tags: tags)
+      fetchPosts(page: currentPage, tags: tags)
 
       if historyIndex >= 0 && historyIndex < searchHistory.count {
         var currentQuery = searchHistory[historyIndex]
@@ -272,7 +271,7 @@ class BooruManager: ObservableObject {
     endOfData = newPosts.isEmpty
 
     if !endOfData {
-      posts = posts + newPosts
+      posts += newPosts
 
       postIndexMap.merge(
         Dictionary(uniqueKeysWithValues: newPosts.enumerated().map { ($0.element.id, $0.offset) })
diff --git a/Sora/Data/Booru/Post/BooruPostXMLParser.swift b/Sora/Data/Booru/Post/BooruPostXMLParser.swift
index 4960a79..96aa23a 100644
--- a/Sora/Data/Booru/Post/BooruPostXMLParser.swift
+++ b/Sora/Data/Booru/Post/BooruPostXMLParser.swift
@@ -191,7 +191,7 @@ class BooruPostXMLParser: NSObject, XMLParserDelegate {
   }
 
   #if DEBUG
-    func parser(_: XMLParser, parseErrorOccurred parseError: any Error) {
+    func parser(_: XMLParser, parseErrorOccurred parseError: Error) {
       print("parser: \(parseError)")
     }
   #endif
diff --git a/Sora/Data/Booru/Tag/BooruTagXMLParser.swift b/Sora/Data/Booru/Tag/BooruTagXMLParser.swift
index ebc5afd..5bb005c 100644
--- a/Sora/Data/Booru/Tag/BooruTagXMLParser.swift
+++ b/Sora/Data/Booru/Tag/BooruTagXMLParser.swift
@@ -62,7 +62,7 @@ class BooruTagXMLParser: NSObject, XMLParserDelegate {
   }
 
   #if DEBUG
-    func parser(_: XMLParser, parseErrorOccurred parseError: any Error) {
+    func parser(_: XMLParser, parseErrorOccurred parseError: Error) {
       print(parseError)
     }
   #endif
diff --git a/Sora/Views/MainView.swift b/Sora/Views/MainView.swift
index 246e7a9..5eeab5c 100644
--- a/Sora/Views/MainView.swift
+++ b/Sora/Views/MainView.swift
@@ -55,7 +55,7 @@ struct MainView: View {
       refreshTags()
 
       if manager.searchText.isEmpty {
-        await manager.fetchPosts()
+        manager.fetchPosts()
       } else {
         manager.performSearch(settings: settings)
       }
@@ -69,7 +69,7 @@ struct MainView: View {
       refreshTags()
 
       if manager.posts.isEmpty {
-        await manager.fetchPosts()
+        manager.fetchPosts()
       }
     }
   }
diff --git a/Sora/Views/Post/Grid/PostGridView.swift b/Sora/Views/Post/Grid/PostGridView.swift
index ecaa971..ca3338e 100644
--- a/Sora/Views/Post/Grid/PostGridView.swift
+++ b/Sora/Views/Post/Grid/PostGridView.swift
@@ -89,13 +89,11 @@ struct PostGridView: View {
           manager.posts = []
           manager.currentPage = 1
 
-          Task {
-            await manager.fetchPosts(
-              page: 1,
-              tags: manager.searchHistory[newIndex].tags,
-              replace: true
-            )
-          }
+          manager.fetchPosts(
+            page: 1,
+            tags: manager.searchHistory[newIndex].tags,
+            replace: true
+          )
         }
       }
       .toolbar {
@@ -156,7 +154,7 @@ struct PostGridView: View {
       .navigationTitle("Posts")
       .refreshable {
         manager.clearCachedPages()
-        await manager.fetchPosts(page: 1, tags: manager.tags, replace: true)
+        manager.fetchPosts(page: 1, tags: manager.tags, replace: true)
       }
       .scrollDisabled(manager.isLoading)
       .sheet(isPresented: $isSearchHistoryPresented) {