alert at event START

gcal.go

@@ -71,11 +71,18 @@ func (gcal *GCal) EventsToday(ctx context.Context) ([]Event, error) {
 			d = t2.Sub(t)
 		}
 
-		result = append(result, Event{
-			Name:     events.Items[i].Summary,
+		result = append(result,
+			Event{
+				Name:     "Soon: " + events.Items[i].Summary,
+				Time:     t.Add(-2 * time.Minute),
+				Duration: 0,
+			},
+			Event{
+				Name:     "Now: " + events.Items[i].Summary,
 				Time:     t,
 				Duration: d,
-		})
+			},
+		)
 	}
 	return result, nil
 }

main.go

@@ -122,10 +122,11 @@ func alertsGCal(ctx context.Context) (chan string, error) {
 				if err := refresh(); err != nil {
 					panic(err)
 				}
-			case <-time.After(time.Until(events[0].Time.Add(-2 * time.Minute))):
+			case <-time.After(time.Until(events[0].Time)):
 				select {
 				case <-ctx.Done():
 				case ch <- events[0].Name:
+					if events[0].Duration > 0 {
 						select {
 						case <-ctx.Done():
 						case <-time.After(events[0].Duration):
@@ -135,6 +136,7 @@ func alertsGCal(ctx context.Context) (chan string, error) {
 							}
 						}
 					}
+				}
 				events = events[1:]
 			case <-ctx.Done():
 			}