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

dav: Make the get_members function more ergonomic

Browse Source
This commit is contained in:
Lennart
2025-06-09 20:35:25 +02:00
parent 0feaaaaca1
commit 0595920809
14 changed files with 121 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -15,7 +15,7 @@ use rustical_dav::extensions::{
CommonPropertiesExtension, CommonPropertiesProp, SyncTokenExtension, SyncTokenExtensionProp,
};
use rustical_dav::privileges::UserPrivilegeSet;
use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceService};
use rustical_dav::resource::{AxumMethods, PrincipalUri, Resource, ResourceName, ResourceService};
use rustical_dav::xml::{HrefElement, Resourcetype, ResourcetypeInner};
use rustical_dav_push::DavPushExtension;
use rustical_ical::CalDateTime;
@@ -83,6 +83,12 @@ pub struct CalendarResource {
pub read_only: bool,
}
impl ResourceName for CalendarResource {
fn get_name(&self) -> String {
self.cal.id.to_owned()
}
}
impl From<CalendarResource> for Calendar {
fn from(value: CalendarResource) -> Self {
value.cal
@@ -360,20 +366,15 @@ impl<C: CalendarStore, S: SubscriptionStore> ResourceService for CalendarResourc
async fn get_members(
&self,
(principal, cal_id): &Self::PathComponents,
) -> Result<Vec<(String, Self::MemberType)>, Self::Error> {
) -> Result<Vec<Self::MemberType>, Self::Error> {
Ok(self
.cal_store
.get_objects(principal, cal_id)
.await?
.into_iter()
.map(|object| {
(
format!("{}.ics", object.get_id()),
CalendarObjectResource {
object,
principal: principal.to_owned(),
},
)
.map(|object| CalendarObjectResource {
object,
principal: principal.to_owned(),
})
.collect())
}