dr.sybren/matrix-chat-bot
0
0
Fork 1
Code Issues 5 Pull Requests Actions Projects Releases Wiki Activity

Fix #2: ical calendar: take 'cancelled' status into account #4

Closed
Sybren A. Stüvel wants to merge 3 commits from fix/2-handle-cancelled-events into main
pull from: fix/2-handle-cancelled-events
merge into: dr.sybren:main

When changing the target branch, be careful to rebase the branch in your fork to match. See documentation.
Conversation 1 Commits 3 Files Changed 3 +37 -4
1 changed files with 37 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 334f7d101a - Show all commits

41
animmeetings.go
View File

@ -129,7 +129,22 @@ func (cal *RemoteCalendar) LoadNextMeetingTime(ctx context.Context) (time.Time,
var nextStartTime time.Time var nextStartTime time.Time
for eventIndex, event := range events { for eventIndex, event := range events {
uid := event.GetProperty(ical.ComponentPropertyUniqueId)
if uid == nil {
log.Warn("calendar: ignoring entry without UID property")
continue
}
// Skip cancelled meetings.
if isCancelled(event) {
continue
}
dtStart := event.GetProperty(ical.ComponentPropertyDtStart) dtStart := event.GetProperty(ical.ComponentPropertyDtStart)
if dtStart == nil {
log.Warn("calendar: ignoring entry without DTSTART property", "uid", uid.Value)
continue
}
parsedDtStart, err := time.Parse(icalTimeFormat, dtStart.Value) parsedDtStart, err := time.Parse(icalTimeFormat, dtStart.Value)
if err != nil { if err != nil {
log.Warn("calendar: could not parse DTSTART property", "value", dtStart.Value, "cause", err) log.Warn("calendar: could not parse DTSTART property", "value", dtStart.Value, "cause", err)
@ -146,17 +161,22 @@ func (cal *RemoteCalendar) LoadNextMeetingTime(ctx context.Context) (time.Time,
return nextStartTime, nil return nextStartTime, nil
} }
func (cal *RemoteCalendar) MeetingsOnMonth(ctx context.Context, timeInMonth time.Time) []time.Time { type MeetingInfo struct {
StartTime time.Time
IsCancelled bool
}
func (cal *RemoteCalendar) MeetingsOnMonth(ctx context.Context, timeInMonth time.Time) []MeetingInfo {
log := GetBotLog(ctx) log := GetBotLog(ctx)
calendar, err := cal.LoadFromDisk(ctx) calendar, err := cal.LoadFromDisk(ctx)
if err != nil { if err != nil {
log.Warn("could not load calendar from disk, pretending there are no meetings", "cause", err) log.Warn("could not load calendar from disk, pretending there are no meetings", "cause", err)
return []time.Time{} return []MeetingInfo{}
} }
events := calendar.Events() events := calendar.Events()
inMonth := []time.Time{} inMonth := []MeetingInfo{}
year := timeInMonth.Year() year := timeInMonth.Year()
month := timeInMonth.Month() month := timeInMonth.Month()
@ -173,7 +193,12 @@ func (cal *RemoteCalendar) MeetingsOnMonth(ctx context.Context, timeInMonth time
if parsedDtStart.Year() != year || parsedDtStart.Month() != month { if parsedDtStart.Year() != year || parsedDtStart.Month() != month {
continue continue
} }
inMonth = append(inMonth, parsedDtStart.In(location))
meetingInfo := MeetingInfo{
StartTime: parsedDtStart.In(location),
IsCancelled: isCancelled(event),
}
inMonth = append(inMonth, meetingInfo)
} }
return inMonth return inMonth
@ -294,3 +319,11 @@ func fileExists(path string) bool {
return true return true
} }
} }
func isCancelled(event *ical.VEvent) bool {
status := event.GetProperty(ical.ComponentPropertyStatus)
if status == nil {
return false
}
return status.Value == string(ical.ObjectStatusCancelled)
}