4 files changed, 16 insertions, 12 deletions
diff --git a/Sora/Data/Booru/BooruManager.swift b/Sora/Data/Booru/BooruManager.swift
index 1beb795..3c5f49b 100644
--- a/Sora/Data/Booru/BooruManager.swift
+++ b/Sora/Data/Booru/BooruManager.swift
@@ -12,7 +12,7 @@ class BooruManager: ObservableObject {
         @Published var selectedPost: BooruPost?
     #endif
     private var currentTask: Task<Void, Never>?
-    private let booruProvider: BooruProvider?
+    let provider: BooruProvider?
     var tags: [String] {
         if searchText.isEmpty {
             return []
@@ -25,14 +25,14 @@ class BooruManager: ObservableObject {
     }
 
     init(_ provider: BooruProvider? = nil) {
-        self.booruProvider = provider
+        self.provider = provider
 
         fetchAllTags()
     }
 
     func fetchPosts(page: Int = 1, limit: Int = 100, tags: [String] = [], replace: Bool = false) async {
         guard !isLoading else { return }
-        guard booruProvider != nil else { return }
+        guard provider != nil else { return }
 
         currentTask?.cancel()
 
@@ -46,7 +46,7 @@ class BooruManager: ObservableObject {
                 self.currentPage = 1
             }
 
-            guard let url = urlForPosts(page: self.booruProvider == .safebooru ? page - 1 : page, limit: limit, tags: tags) else {
+            guard let url = urlForPosts(page: self.provider == .safebooru ? page - 1 : page, limit: limit, tags: tags) else {
                 return
             }
 
@@ -75,7 +75,9 @@ class BooruManager: ObservableObject {
     }
 
     func performSearch() {
-        Task {
+        currentTask?.cancel()
+
+        currentTask = Task {
             await fetchPosts(page: 1, tags: tags, replace: true)
         }
     }
@@ -93,7 +95,7 @@ class BooruManager: ObservableObject {
     }
 
     func fetchAllTags(limit: Int = 100_000) {
-        guard booruProvider != nil else { return }
+        guard provider != nil else { return }
 
         Task {
             guard let url = urlForTags(limit: limit) else { return }
@@ -119,7 +121,7 @@ class BooruManager: ObservableObject {
     private func urlForPosts(page: Int, limit: Int, tags: [String]) -> URL? {
         let tagString = tags.joined(separator: "+")
 
-        switch booruProvider {
+        switch provider {
         case .yandere:
             return URL(string: "https://yande.re/post.xml?page=\(page)&limit=\(limit)&tags=\(tagString)")
         case .safebooru:
@@ -130,7 +132,7 @@ class BooruManager: ObservableObject {
     }
 
     private func urlForTags(limit: Int) -> URL? {
-        switch booruProvider {
+        switch provider {
         case .yandere:
             return URL(string: "https://yande.re/tag.xml?limit=\(limit)")
         case .safebooru:
diff --git a/Sora/Data/Booru/BooruProvider.swift b/Sora/Data/Booru/BooruProvider.swift
index 18cfd64..e742fef 100644
--- a/Sora/Data/Booru/BooruProvider.swift
+++ b/Sora/Data/Booru/BooruProvider.swift
@@ -1,4 +1,4 @@
-enum BooruProvider: String, CaseIterable {
+enum BooruProvider: String, CaseIterable, Decodable, Encodable {
     case yandere
     case safebooru
 }
diff --git a/Sora/Data/Settings/Bookmark.swift b/Sora/Data/Settings/Bookmark.swift
index 2e6fc93..16f1e50 100644
--- a/Sora/Data/Settings/Bookmark.swift
+++ b/Sora/Data/Settings/Bookmark.swift
@@ -4,10 +4,12 @@ struct Bookmark: Codable, Identifiable, Hashable {
     let id: UUID
     let tags: [String]
     let createdAt: Date
+    let provider: BooruProvider
 
-    init(id: UUID = UUID(), tags: [String]) {
+    init(id: UUID = UUID(), provider: BooruProvider, tags: [String]) {
         createdAt = Date()
         self.id = id
         self.tags = tags
+        self.provider = provider
     }
 }
diff --git a/Sora/Data/Settings/Settings.swift b/Sora/Data/Settings/Settings.swift
index e8d1510..3ffa114 100644
--- a/Sora/Data/Settings/Settings.swift
+++ b/Sora/Data/Settings/Settings.swift
@@ -43,10 +43,10 @@ class Settings: ObservableObject {
         showNSFWPosts = false
     }
 
-    func addBookmark(tags: [String]) {
+    func addBookmark(provider: BooruProvider, tags: [String]) {
         var currentBookmarks = bookmarks
 
-        currentBookmarks.append(Bookmark(tags: tags.map { $0.lowercased() }))
+        currentBookmarks.append(Bookmark(provider: provider, tags: tags.map { $0.lowercased() }))
 
         bookmarks = currentBookmarks
     }