From 3edcca608ee5f4bb9e5ae4e5698205b9ca30c108 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Tue, 4 Feb 2025 17:52:06 +0100
Subject: [PATCH] Principal resources: Set displayname

---
 crates/caldav/src/principal/mod.rs  | 9 ++++++---
 crates/carddav/src/principal/mod.rs | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/crates/caldav/src/principal/mod.rs b/crates/caldav/src/principal/mod.rs
index 4c00d90..3d48339 100644
--- a/crates/caldav/src/principal/mod.rs
+++ b/crates/caldav/src/principal/mod.rs
@@ -99,9 +99,12 @@ impl Resource for PrincipalResource {
                     PrincipalPropName::CalendarUserType => {
                         PrincipalProp::CalendarUserType(self.principal.user_type.to_owned())
                     }
-                    PrincipalPropName::Displayname => {
-                        PrincipalProp::Displayname(self.principal.id.to_owned())
-                    }
+                    PrincipalPropName::Displayname => PrincipalProp::Displayname(
+                        self.principal
+                            .displayname
+                            .to_owned()
+                            .unwrap_or(self.principal.id.to_owned()),
+                    ),
                     PrincipalPropName::PrincipalUrl => {
                         PrincipalProp::PrincipalUrl(principal_url.into())
                     }
diff --git a/crates/carddav/src/principal/mod.rs b/crates/carddav/src/principal/mod.rs
index 6967772..131468e 100644
--- a/crates/carddav/src/principal/mod.rs
+++ b/crates/carddav/src/principal/mod.rs
@@ -101,9 +101,12 @@ impl Resource for PrincipalResource {
         Ok(match prop {
             PrincipalPropWrapperName::Principal(prop) => {
                 PrincipalPropWrapper::Principal(match prop {
-                    PrincipalPropName::Displayname => {
-                        PrincipalProp::Displayname(self.principal.id.to_owned())
-                    }
+                    PrincipalPropName::Displayname => PrincipalProp::Displayname(
+                        self.principal
+                            .displayname
+                            .to_owned()
+                            .unwrap_or(self.principal.id.to_owned()),
+                    ),
                     PrincipalPropName::PrincipalUrl => PrincipalProp::PrincipalUrl(principal_href),
                     PrincipalPropName::AddressbookHomeSet => {
                         PrincipalProp::AddressbookHomeSet(home_set)