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

calendarobject: Rename get_id to get_uid

Browse Source
This commit is contained in:
Lennart
2025-11-01 21:23:55 +01:00
parent a53c333f1f
commit db144ebcae
7 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
crates/store_sqlite/src/calendar_store.rs
View File

@@ -24,11 +24,11 @@ impl TryFrom<CalendarObjectRow> for CalendarObject {
fn try_from(value: CalendarObjectRow) -> Result<Self, Self::Error> {
let object = Self::from_ics(value.ics)?;
if object.get_id() != value.id {
if object.get_uid() != value.id {
return Err(rustical_store::Error::IcalError(
rustical_ical::Error::InvalidData(format!(
"object_id={} and UID={} don't match",
object.get_id(),
object.get_uid(),
value.id
)),
));
@@ -355,7 +355,7 @@ impl SqliteCalendarStore {
object: CalendarObject,
overwrite: bool,
) -> Result<(), Error> {
let (object_id, ics) = (object.get_id(), object.get_ics());
let (object_id, ics) = (object.get_uid(), object.get_ics());
let first_occurence = object
.get_first_occurence()
@@ -678,7 +678,7 @@ impl CalendarStore for SqliteCalendarStore {
.await
.map_err(crate::Error::from)?;
let object_id = object.get_id().to_owned();
let object_id = object.get_uid().to_owned();
let calendar = Self::_get_calendar(&mut *tx, &principal, &cal_id, true).await?;
if calendar.subscription_url.is_some() {