Skip to content

fix(dav): fix event birthday alarms not being updated #39977

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tcitworld wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(dav): fix event birthday alarms not being updated #39977

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8939a2e
fix(dav): fix event birthday alarms not being updated
tcitworld Aug 19, 2023
4451809
fix(dav): add a new config key to check to retrigger regenerating bir…
tcitworld Oct 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
fix(dav): fix event birthday alarms not being updated 
In #33251 the default offset for
a birthday event alarm was changed to 9AM on the day of the event.

However the birthdayEvenChanged method did not account for alarm
changes, so it was never propagated to existing birthday events, which
were kept on midnight.

Signed-off-by: Thomas Citharel <[email protected]>
  • Loading branch information
@tcitworld
tcitworld committed Feb 1, 2024
commit 8939a2edcd10ec79c11f62cd6e993c960b62fa2e
8 changes: 7 additions & 1 deletion apps/dav/lib/CalDAV/BirthdayService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,6 +317,11 @@ public function syncUser(string $user):void {
}

/**
* The birthday event is considered changed if either
* - the start date has changed
* - the title has changed
* - the time for the alarm has changed
*
* @param string $existingCalendarData
* @param VCalendar $newCalendarData
* @return bool
Expand All @@ -331,7 +336,8 @@ public function birthdayEvenChanged(string $existingCalendarData,

return (
$newCalendarData->VEVENT->DTSTART->getValue() !== $existingBirthday->VEVENT->DTSTART->getValue() ||
$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue()
$newCalendarData->VEVENT->SUMMARY->getValue() !== $existingBirthday->VEVENT->SUMMARY->getValue() ||

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $newCalendarData->VEVENT of type Sabre\VObject\Property|null

Check notice

Code scanning / Psalm

UndefinedPropertyFetch

Instance property Sabre\VObject\Property::$SUMMARY is not defined

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getValue on possibly null value

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $existingBirthday->VEVENT of type Sabre\VObject\Property|null

Check notice

Code scanning / Psalm

UndefinedPropertyFetch

Instance property Sabre\VObject\Property::$SUMMARY is not defined

Check notice

Code scanning / Psalm

PossiblyNullReference

Cannot call method getValue on possibly null value
($newCalendarData->VEVENT->VALARM && $existingBirthday->VEVENT->VALARM && $newCalendarData->VEVENT->VALARM->TRIGGER->getValue() !== $existingBirthday->VEVENT->VALARM->TRIGGER->getValue())

Check failure

Code scanning / Psalm

UndefinedPropertyFetch

Instance property Sabre\VObject\Property::$VALARM is not defined

Check failure

Code scanning / Psalm

UndefinedPropertyFetch

Instance property Sabre\VObject\Property::$VALARM is not defined

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $newCalendarData->VEVENT of type Sabre\VObject\Property|null

Check notice

Code scanning / Psalm

PossiblyNullPropertyFetch

Cannot get property on possibly null variable $existingBirthday->VEVENT of type Sabre\VObject\Property|null
);
}

Expand Down