refactor: improve notification rendering and scheduling

revelaction · Aug 28, 2024 · d2f62b9 · d2f62b9
1 parent 9679ceb
commit d2f62b9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 20 deletions.
diff --git a/notify/desktop/desktop.go b/notify/desktop/desktop.go
@@ -5,7 +5,7 @@ import (
 	"github.com/revelaction/ical-git/config"
 	"github.com/revelaction/ical-git/notify"
 	"html/template"
-	//"time"
+	"time"
 	"bytes"
 )
 
@@ -23,7 +23,7 @@ func New(conf config.Config) *Desktop {
 // icon https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#directory_layout
 func (d *Desktop) Notify(n notify.Notification) error {
 
-	body, err := renderNotification(n)
+	body, err := d.renderNotification(n)
 	if err != nil {
 		return err
 	}
@@ -32,15 +32,24 @@ func (d *Desktop) Notify(n notify.Notification) error {
 	return nil
 }
 
-func renderNotification(n notify.Notification) (string, error) {
+func (d *Desktop) renderNotification(n notify.Notification) (string, error) {
 
-	type NotificationWrapper struct {
-		notify.Notification
-		EventTimeZone *time.Location
-	}
+    wrapper := struct {
+        notify.Notification 
+        EventTimeZone    string
+        EventTimeConf    time.Time
+        EventTimeZoneConf string
+    }{
+
+        Notification: n, 
+        EventTimeZone: n.EventTimeTz(),
+        EventTimeConf: n.EventTimeConf(d.config.Location.Location),
+        EventTimeZoneConf: d.config.Location.Location.String(),
+    }
 
 	const tpl = `
 📅 <b>{{.EventTime.Format "Monday, 2006-01-02"}}</b> <b>{{.EventTime.Format "🕒 15:04"}}</b> 🌍 {{.EventTimeZone}}
+📅 <i>{{.EventTimeConf.Format "Monday, 2006-01-02"}}</i> <i>{{.EventTimeConf.Format "🕒 15:04"}}</i> 🌍 <i>{{.EventTimeZoneConf}}</i>
 
 {{if .Duration}}
 ⏳ Duration: <b>{{.Duration}}</b>
@@ -67,7 +76,6 @@ Attendees:
 		return "", err
 	}
 
-	wrapper := NotificationWrapper{Notification: n}
 
 	var buf bytes.Buffer
 	if err := t.Execute(&buf, wrapper); err != nil {

diff --git a/notify/notify.go b/notify/notify.go
@@ -40,7 +40,7 @@ type Notification struct {
 }
 
 // EventTimeConf returns the EventTime in the configured location
-func (n Notification) EventTimeConf(loc time.Location) time.Time {
+func (n Notification) EventTimeConf(loc *time.Location) time.Time {
     return n.EventTime.In(loc)
 }
 

diff --git a/notify/schedule/schedule.go b/notify/schedule/schedule.go
@@ -34,7 +34,7 @@ func (s *Scheduler) Schedule(notifications []notify.Notification) error {
 		f := s.getNotifyFunc(n)
 		dur := n.Time.Sub(s.start)
 		slog.Info("⏰ Notification", "time", n.Time, "event_time", n.EventTime, "trigger_in", dur, "DurIso8601", n.DurIso8601, "type", n.Type, "summary", n.Summary)
-		dur = 10 * time.Second // Hack
+		dur = 3 * time.Second // Hack
 		timer := time.AfterFunc(dur, f)
 		s.timers = append(s.timers, timer)
 	}

diff --git a/notify/telegram/telegram.go b/notify/telegram/telegram.go
@@ -9,9 +9,6 @@ import (
 	"time"
 )
 
-type Notifier interface {
-	Notify(message string, level string) error
-}
 
 type message struct {
 	msg       string
@@ -21,7 +18,7 @@ type message struct {
 // Telegram
 type Telegram struct {
 	bot  *tg.BotAPI
-	conf config.Config
+	config config.Config
 }
 
 func New(conf config.Config) *Telegram {
@@ -33,20 +30,20 @@ func New(conf config.Config) *Telegram {
 
 	return &Telegram{
 		bot:  bot,
-		conf: conf,
+		config: conf,
 	}
 }
 
 func (t *Telegram) Notify(n notify.Notification) error {
 
-	message, err := renderNotification(n)
+	message, err := t.renderNotification(n)
 
 	if err != nil {
 		return err
 	}
 	//message = "YOLO"
 
-	msg := tg.NewMessage(t.conf.Telegram.ChatId, message)
+	msg := tg.NewMessage(t.config.Telegram.ChatId, message)
 	msg.ParseMode = "html"
 	_, err = t.bot.Send(msg)
 	if err != nil {
@@ -57,11 +54,25 @@ func (t *Telegram) Notify(n notify.Notification) error {
 }
 
 // https://core.telegram.org/bots/api#html-style
-func renderNotification(n notify.Notification) (string, error) {
+func (t *Telegram) renderNotification(n notify.Notification) (string, error) {
+
+    wrapper := struct {
+        notify.Notification 
+        EventTimeZone    string
+        EventTimeConf    time.Time
+        EventTimeZoneConf string
+    }{
+
+        Notification: n, 
+        EventTimeZone: n.EventTimeTz(),
+        EventTimeConf: n.EventTimeConf(t.config.Location.Location),
+        EventTimeZoneConf: t.config.Location.Location.String(),
+    }
 	const tpl = `
 <b>{{.Summary}}</b>
 
 📅 <b>{{.EventTime.Format "Monday, 2006-01-02"}}</b> <b>{{.EventTime.Format "🕒 15:04"}}</b> 🌍 {{.EventTimeZone}}
+📅 <i>{{.EventTimeConf.Format "Monday, 2006-01-02"}}</i> <i>{{.EventTimeConf.Format "🕒 15:04"}}</i> 🌍 <i>{{.EventTimeZoneConf}}</i>
 
 {{if .Duration}}
 ⏳ Duration: <b>{{.Duration}}</b>
@@ -83,13 +94,13 @@ Attendees:
 {{end}}
 `
 	// Confirmed: ✅, Postponed: 🔄Cancelled: ❌Pending: ⌛Tentative: 🤔Not Attending: 🚫
-	t, err := template.New("notification").Parse(tpl)
+	tmpl, err := template.New("notification").Parse(tpl)
 	if err != nil {
 		return "", err
 	}
 
 	var buf bytes.Buffer
-	if err := t.Execute(&buf, n); err != nil {
+	if err := tmpl.Execute(&buf, wrapper); err != nil {
 		return "", err
 	}