From b5972f8fa3ddad874d8ccf2441cb043c54c2fd48 Mon Sep 17 00:00:00 2001
From: metamuffin <metamuffin@disroot.org>
Date: Tue, 19 Dec 2023 10:07:27 +0100
Subject: no more overriding of the admin every restart

---
 server/src/main.rs | 22 ++++++++++++++--------
 1 file changed, 14 insertions(+), 8 deletions(-)

(limited to 'server/src')

diff --git a/server/src/main.rs b/server/src/main.rs
index 7c868a9..6e732bd 100644
--- a/server/src/main.rs
+++ b/server/src/main.rs
@@ -32,21 +32,27 @@ async fn main() {
 
     database
         .user
-        .insert(
-            &CONF.admin_username,
-            &User {
+        .fetch_and_update(&CONF.admin_username, |admin| {
+            Some(User {
                 admin: true,
-                theme: Theme::Dark,
-                display_name: "Admin".to_string(),
                 name: CONF.admin_username.clone(),
                 password: hash_password(&CONF.admin_username, &CONF.admin_password),
-                permissions: PermissionSet::default(),
-            },
-        )
+                ..admin.unwrap_or_else(|| User {
+                    name: Default::default(),
+                    display_name: "Admin".to_string(),
+                    password: Default::default(),
+                    admin: Default::default(),
+                    theme: Theme::Dark,
+                    permissions: PermissionSet::default(),
+                })
+            })
+        })
         .unwrap();
+
     // if let Err(err) = import::import(&database, &federation).await {
     //     log::error!("import not sucessful: {err:?}")
     // }
+    
     let r = build_rocket(database, federation).launch().await;
     match r {
         Ok(_) => warn!("server shutdown"),
-- 
cgit v1.2.3-70-g09d2