nikdoof/rustical
1
1
Fork 0
mirror of https://github.com/lennart-k/rustical.git synced 2025-12-14 10:32:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix a few principal urls

Browse Source
This commit is contained in:
Lennart
2024-06-30 20:35:08 +02:00
parent eda4cea4e6
commit b6debf2ad2
2 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/caldav/src/calendar/resource.rs
View File

@@ -101,7 +101,7 @@ impl Resource for CalendarFile {
HrefElement::new(format!("{}/user/{}/", prefix, self.principal)), HrefElement::new(format!("{}/user/{}/", prefix, self.principal)),
)), )),
CalendarPropName::Owner => Ok(CalendarProp::Owner(HrefElement::new(format!( CalendarPropName::Owner => Ok(CalendarProp::Owner(HrefElement::new(format!(
"{}/{}/", "{}/user/{}/",
prefix, self.principal prefix, self.principal
)))), )))),
CalendarPropName::Displayname => { CalendarPropName::Displayname => {

23
crates/caldav/src/principal/mod.rs
View File

@@ -71,22 +71,21 @@ impl Resource for PrincipalFile {
type Error = Error; type Error = Error;
fn get_prop(&self, prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> { fn get_prop(&self, prefix: &str, prop: Self::PropName) -> Result<Self::Prop, Self::Error> {
let principal_href = HrefElement::new(format!("{}/user/{}/", prefix, self.principal));
match prop { match prop {
PrincipalPropName::Resourcetype => { PrincipalPropName::Resourcetype => {
Ok(PrincipalProp::Resourcetype(Resourcetype::default())) Ok(PrincipalProp::Resourcetype(Resourcetype::default()))
} }
PrincipalPropName::CurrentUserPrincipal => Ok(PrincipalProp::CurrentUserPrincipal( PrincipalPropName::CurrentUserPrincipal => {
HrefElement::new(format!("{}/{}/", prefix, self.principal)), Ok(PrincipalProp::CurrentUserPrincipal(principal_href))
)), }
PrincipalPropName::PrincipalUrl => Ok(PrincipalProp::PrincipalUrl(HrefElement::new( PrincipalPropName::PrincipalUrl => Ok(PrincipalProp::PrincipalUrl(principal_href)),
format!("{}/user/{}/", prefix, self.principal), PrincipalPropName::CalendarHomeSet => {
))), Ok(PrincipalProp::CalendarHomeSet(principal_href))
PrincipalPropName::CalendarHomeSet => Ok(PrincipalProp::CalendarHomeSet( }
HrefElement::new(format!("{}/user/{}/", prefix, self.principal)), PrincipalPropName::CalendarUserAddressSet => {
)), Ok(PrincipalProp::CalendarUserAddressSet(principal_href))
PrincipalPropName::CalendarUserAddressSet => Ok(PrincipalProp::CalendarUserAddressSet( }
HrefElement::new(format!("{}/user/{}/", prefix, self.principal)),
)),
} }
} }
} }