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

calendar: refactoring

Browse Source
This commit is contained in:
Lennart
2024-09-29 12:22:07 +02:00
parent 4597f67777
commit 3ac7e01b53
1 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -90,7 +90,6 @@ impl InvalidProperty for CalendarProp {
#[derive(Clone, Debug)]
pub struct CalendarFile {
pub calendar: Calendar,
pub principal: String,
}
impl Resource for CalendarFile {
@@ -102,11 +101,11 @@ impl Resource for CalendarFile {
Ok(match prop {
CalendarPropName::Resourcetype => CalendarProp::Resourcetype(Resourcetype::default()),
CalendarPropName::CurrentUserPrincipal => CalendarProp::CurrentUserPrincipal(
HrefElement::new(format!("{}/user/{}/", prefix, self.principal)),
HrefElement::new(format!("{}/user/{}/", prefix, self.calendar.principal)),
),
CalendarPropName::Owner => CalendarProp::Owner(HrefElement::new(format!(
"{}/user/{}/",
prefix, self.principal
prefix, self.calendar.principal
))),
CalendarPropName::Displayname => {
CalendarProp::Displayname(self.calendar.displayname.clone())
@@ -248,10 +247,7 @@ impl<C: CalendarStore + ?Sized> ResourceService for CalendarResource<C> {
.get_calendar(&self.principal, &self.calendar_id)
.await
.map_err(|_e| Error::NotFound)?;
Ok(CalendarFile {
calendar,
principal: self.principal.to_owned(),
})
Ok(CalendarFile { calendar })
}
async fn get_members(