From 6e2bb14e6f8782f047e3884419609c04167ce823 Mon Sep 17 00:00:00 2001 From: Fuwn Date: Thu, 18 Sep 2025 04:01:02 -0700 Subject: feat: Development commit --- Sora/Views/BookmarkMenuButtonView.swift | 26 +++----------------------- 1 file changed, 3 insertions(+), 23 deletions(-) (limited to 'Sora/Views') diff --git a/Sora/Views/BookmarkMenuButtonView.swift b/Sora/Views/BookmarkMenuButtonView.swift index 714448e..339854f 100644 --- a/Sora/Views/BookmarkMenuButtonView.swift +++ b/Sora/Views/BookmarkMenuButtonView.swift @@ -18,14 +18,7 @@ struct BookmarkMenuButtonView: View { Menu { ForEach(settings.folders.filter { $0.topLevelName == nil }, id: \.id) { folder in Button(action: { - settings.addBookmark(provider: provider, tags: tags) - - if let bookmarkId = settings.bookmarks.first(where: { bookmark in - bookmark.provider == provider - && Set(bookmark.tags) == Set(tags.map { $0.lowercased() }) - })?.id { - settings.updateBookmarkFolder(withID: bookmarkId, folder: folder.id) - } + settings.addBookmark(provider: provider, tags: tags, folder: folder.id) }) { Label(folder.name, systemImage: "folder") } @@ -43,14 +36,7 @@ struct BookmarkMenuButtonView: View { Menu { ForEach(topLevelFolders[topLevelName] ?? [], id: \.id) { folder in Button(action: { - settings.addBookmark(provider: provider, tags: tags) - - if let bookmarkId = settings.bookmarks.first(where: { bookmark in - bookmark.provider == provider - && Set(bookmark.tags) == Set(tags.map { $0.lowercased() }) - })?.id { - settings.updateBookmarkFolder(withID: bookmarkId, folder: folder.id) - } + settings.addBookmark(provider: provider, tags: tags, folder: folder.id) }) { Text(folder.shortName) } @@ -94,13 +80,7 @@ struct BookmarkMenuButtonView: View { let newFolder = SettingsFolder(name: newCollectionName) settings.folders.append(newFolder) - settings.addBookmark(provider: provider, tags: tags) - - if let bookmarkId = settings.bookmarks.first(where: { bookmark in - bookmark.provider == provider && Set(bookmark.tags) == Set(tags.map { $0.lowercased() }) - })?.id { - settings.updateBookmarkFolder(withID: bookmarkId, folder: newFolder.id) - } + settings.addBookmark(provider: provider, tags: tags, folder: newFolder.id) } } -- cgit v1.2.3