dr.sybren/matrix-chat-bot
0
0
Fork 0
Code Issues 4 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 +13 -7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit fc9aa2be30 - Show all commits

4
call_and_response.go
View File

@ -23,9 +23,11 @@ var _ EventConsumer = (*CallAndReponse)(nil)
// MeetingTimer provides the next meeting time. // MeetingTimer provides the next meeting time.
type MeetingTimer interface { type MeetingTimer interface {
NextMeetingTime() time.Time NextMeetingTime() time.Time
MeetingsOnMonth(ctx context.Context, timeInMonth time.Time) []time.Time MeetingsOnMonth(ctx context.Context, timeInMonth time.Time) []MeetingInfo
} }
var _ MeetingTimer = (*RemoteCalendar)(nil)
type CallAndResponseCommand interface { type CallAndResponseCommand interface {
CmdTag() string CmdTag() string
CmdDescription() string CmdDescription() string

16
call_and_response_cmd_cal.go
View File

@ -51,10 +51,10 @@ func (c *CmdCalendar) Handle(ctx context.Context, car *CallAndReponse, evt *even
car.sendReplyInThread(ctx, evt, calendarMD) car.sendReplyInThread(ctx, evt, calendarMD)
} }
func MeetingCalendar(ctx context.Context, meetingTimes []time.Time) string { func MeetingCalendar(ctx context.Context, meetings []MeetingInfo) string {
log := GetBotLog(ctx) log := GetBotLog(ctx)
dateInMonth := meetingTimes[0] dateInMonth := meetings[0].StartTime
firstOfMonth := time.Date(dateInMonth.Year(), dateInMonth.Month(), 1, 0, 0, 0, 0, dateInMonth.Location()) firstOfMonth := time.Date(dateInMonth.Year(), dateInMonth.Month(), 1, 0, 0, 0, 0, dateInMonth.Location())
lastOfMonth := firstOfMonth.AddDate(0, 1, -1) lastOfMonth := firstOfMonth.AddDate(0, 1, -1)
@ -70,10 +70,14 @@ func MeetingCalendar(ctx context.Context, meetingTimes []time.Time) string {
meetingCal[weekIndex][weekdayIndex] = fmt.Sprintf("%2d", dayNum) meetingCal[weekIndex][weekdayIndex] = fmt.Sprintf("%2d", dayNum)
} }
for _, meetingTime := range meetingTimes { for _, meeting := range meetings {
weekIndex, weekdayIndex := calendarIndex(meetingTime, firstOfMonth) weekIndex, weekdayIndex := calendarIndex(meeting.StartTime, firstOfMonth)
// dayNum := strings.TrimSpace(meetingCal[weekIndex][weekdayIndex]) var entry string
entry := "<strong><u>" + meetingTime.Format("15:04") + "</u></strong>" if meeting.IsCancelled {
entry = "❌"
} else {
entry = "<strong>" + meeting.StartTime.Format("15:04") + "</strong>"
}
meetingCal[weekIndex][weekdayIndex] = entry meetingCal[weekIndex][weekdayIndex] = entry
} }