amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-05-22 11:55:24 +00:00
Code Issues Projects Releases Wiki Activity

fix(calendar): update email alarm of yearly events

Browse Source 
We now compute the next alarms of a yrealy recurrent event for a period
of two years in order to make sure to pickup the next occurrence and
update the email alarms table, otherwise sogo-ealarms-notify was sending
email alarms every minute until the next alarm was properly computed.

Fixes #4991
This commit is contained in:
Francis Lachapelle
2021-11-25 17:51:18 -05:00
parent fc121acff3
commit 9c025f6871
1 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
SoObjects/Appointments/iCalEntityObject+SOGo.m
+7 -4
View File
@@ -761,8 +761,11 @@ NSNumber *iCalDistantFutureNumber = nil;
NSMutableArray *alarms;
alarms = [NSMutableArray array];
// Compute the alarms for the next 2 years. We must cover more than 1 year since yearly alarms that are triggered
// 1 day before the event date require a range of at least 1 year and 1 day. Too play safe, we cover 2 years.
start = [NSCalendarDate date];
end = [start addYear:1 month:0 day:0 hour:0 minute:0 second:0];
end = [start addYear:2 month:0 day:0 hour:0 minute:0 second:0];
range = [NGCalendarDateRange calendarDateRangeWithStartDate: start
endDate: end];
@@ -832,12 +835,12 @@ NSNumber *iCalDistantFutureNumber = nil;
|| ([webstatus caseInsensitiveCompare: @"TRIGGERED"]
!= NSOrderedSame))
v = delta;
nextAlarmDate = [NSDate dateWithTimeIntervalSince1970: [[[alarms objectAtIndex: i] objectForKey: @"c_nextalarm"] intValue]];
nextAlarmDate = [NSDate dateWithTimeIntervalSince1970: c_nextalarm];
}
else if ((anAlarm = [self firstEmailAlarm]) && af)
{
nextAlarmDate = [NSDate dateWithTimeIntervalSince1970: [[[alarms objectAtIndex: i] objectForKey: @"c_nextalarm"] intValue]];
nextAlarmDate = [NSDate dateWithTimeIntervalSince1970: c_nextalarm];
email_alarm_number = [[self alarms] indexOfObject: anAlarm];
if ([anAlarm userIsAttendee: alarmOwner])
@@ -857,7 +860,7 @@ NSNumber *iCalDistantFutureNumber = nil;
}
}
// Don't update c_nextalarm in the quick table if it's not na email alarm
// Don't update c_nextalarm in the quick table if it's not an email alarm
if ([nextAlarmDate isNotNull] && email_alarm_number < 0)
{
[row setObject: [NSNumber numberWithInt: [nextAlarmDate timeIntervalSince1970]]