From df8790f46d3d44f02f07c88ab01888f9d1fd61f9 Mon Sep 17 00:00:00 2001
From: Lennart <18233294+lennart-k@users.noreply.github.com>
Date: Sun, 27 Oct 2024 15:26:34 +0100
Subject: [PATCH] carddav: fix file suffix and content type

---
 crates/carddav/src/address_object/methods.rs  | 2 +-
 crates/carddav/src/address_object/resource.rs | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/crates/carddav/src/address_object/methods.rs b/crates/carddav/src/address_object/methods.rs
index 5f6792f..25a40ee 100644
--- a/crates/carddav/src/address_object/methods.rs
+++ b/crates/carddav/src/address_object/methods.rs
@@ -46,7 +46,7 @@ pub async fn get_object<AS: AddressbookStore + ?Sized>(
 
     Ok(HttpResponse::Ok()
         .insert_header(("ETag", object.get_etag()))
-        .insert_header(("Content-Type", "text/calendar"))
+        .insert_header(("Content-Type", "text/vcard"))
         .body(object.get_vcf().to_owned()))
 }
 
diff --git a/crates/carddav/src/address_object/resource.rs b/crates/carddav/src/address_object/resource.rs
index e75a61a..7f10749 100644
--- a/crates/carddav/src/address_object/resource.rs
+++ b/crates/carddav/src/address_object/resource.rs
@@ -66,7 +66,7 @@ impl Resource for AddressObjectResource {
                 AddressObjectProp::AddressData(self.0.get_vcf().to_owned())
             }
             AddressObjectPropName::Getcontenttype => {
-                AddressObjectProp::Getcontenttype("text/calendar;charset=utf-8".to_owned())
+                AddressObjectProp::Getcontenttype("text/vcard;charset=utf-8".to_owned())
             }
         })
     }
@@ -91,7 +91,7 @@ impl<'de> Deserialize<'de> for AddressObjectPathComponents {
     {
         type Inner = (String, String, String);
         let (principal, calendar, mut object) = Inner::deserialize(deserializer)?;
-        if object.ends_with(".ics") {
+        if object.ends_with(".vcf") {
             object.truncate(object.len() - 4);
         }
         Ok(Self {