From fde921d256302df64d48cf5027e2c61a9e34e602 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bartu=20=C3=96zen?= <git@bartuzen.dev>
Date: Thu, 11 Dec 2025 23:54:56 +0300
Subject: [PATCH] Properly fix default category bug

---
 .../kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt | 3 ++-
 .../tachidesk/global/impl/sync/SyncYomiSyncService.kt         | 4 +---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt
index b595e94ad..91c98dab8 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncManager.kt
@@ -8,6 +8,7 @@ import kotlinx.serialization.protobuf.ProtoBuf
 import org.jetbrains.exposed.sql.selectAll
 import org.jetbrains.exposed.sql.transactions.transaction
 import org.jetbrains.exposed.sql.update
+import suwayomi.tachidesk.manga.impl.Category
 import suwayomi.tachidesk.manga.impl.backup.BackupFlags
 import suwayomi.tachidesk.manga.impl.backup.proto.ProtoBackupImport
 import suwayomi.tachidesk.manga.impl.backup.proto.handlers.BackupCategoryHandler
@@ -65,7 +66,7 @@ object SyncManager {
 
         val backup = Backup(
             BackupMangaHandler.backup(backupFlags),
-            BackupCategoryHandler.backup(backupFlags),
+            BackupCategoryHandler.backup(backupFlags).filter { it.name != Category.DEFAULT_CATEGORY_NAME },
             BackupSourceHandler.backup(backupMangas, backupFlags),
             emptyMap(),
             null,
diff --git a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
index 150240700..11c90a4e2 100644
--- a/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
+++ b/server/src/main/kotlin/suwayomi/tachidesk/global/impl/sync/SyncYomiSyncService.kt
@@ -326,9 +326,7 @@ class SyncYomiSyncService {
     ): List<BackupCategory> {
         if (localCategoriesList == null) return remoteCategoriesList ?: emptyList()
         if (remoteCategoriesList == null) return localCategoriesList
-        val localCategoriesMap = localCategoriesList
-            .filter { it.name != Category.DEFAULT_CATEGORY_NAME }
-            .associateBy { it.name }
+        val localCategoriesMap = localCategoriesList.associateBy { it.name }
         val remoteCategoriesMap = remoteCategoriesList.associateBy { it.name }
 
         val mergedCategoriesMap = mutableMapOf<String, BackupCategory>()