From 40955ffc6910bf23e9e5e0100ccce79cdbcca2c7 Mon Sep 17 00:00:00 2001
From: spiral <spiral@spiral.sh>
Date: Wed, 25 May 2022 06:32:24 -0400
Subject: [PATCH] fix: don't try to import config if it's not present in export
 file

---
 .../Utils/BulkImporter/PluralKitImport.cs     | 20 +++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs b/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs
index 2c9304e8..816dd618 100644
--- a/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs
+++ b/PluralKit.Core/Utils/BulkImporter/PluralKitImport.cs
@@ -30,23 +30,23 @@ public partial class BulkImporter
 
         await _repo.UpdateSystem(_system.Id, patch, _conn);
 
-        var configPatch = new SystemConfigPatch();
-
         if (importFile.ContainsKey("config"))
-            configPatch = SystemConfigPatch.FromJson(importFile.Value<JObject>("config"));
+        {
+            var configPatch = SystemConfigPatch.FromJson(importFile.Value<JObject>("config"));
 
-        if (importFile.ContainsKey("timezone"))
-            configPatch.UiTz = importFile.Value<string>("timezone");
+            if (importFile.ContainsKey("timezone"))
+                configPatch.UiTz = importFile.Value<string>("timezone");
 
-        configPatch.AssertIsValid();
-        if (configPatch.Errors.Count > 0)
-            throw new ImportException($"Field config.{patch.Errors[0].Key} in export file is invalid.");
+            configPatch.AssertIsValid();
+            if (configPatch.Errors.Count > 0)
+                throw new ImportException($"Field config.{patch.Errors[0].Key} in export file is invalid.");
 
-        await _repo.UpdateSystemConfig(_system.Id, configPatch, _conn);
+            await _repo.UpdateSystemConfig(_system.Id, configPatch, _conn);
+        }
 
         var members = importFile.Value<JArray>("members");
-        var groups = importFile.Value<JArray>("groups");
         var switches = importFile.Value<JArray>("switches");
+        var groups = importFile.Value<JArray>("groups");
 
         var newMembers = members.Count(m =>
         {