Update to new jcal parsing version to support all day events

Author: gueldenstone

go.mod

@@ -4,7 +4,7 @@ go 1.22.0
 
 require (
 	github.com/go-co-op/gocron v1.37.0
-	github.com/xHain-hackspace/go-jcal v0.0.3
+	github.com/xHain-hackspace/go-jcal v0.0.5
 	gopkg.in/yaml.v3 v3.0.1
 	maunium.net/go/mautrix v0.11.0
 )

go.sum

@@ -30,8 +30,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
 github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
-github.com/xHain-hackspace/go-jcal v0.0.3 h1:2FcfP0FimmhMOUCHQ6uXCWgNJnk3OQImbZSFKt8zBbI=
-github.com/xHain-hackspace/go-jcal v0.0.3/go.mod h1:TtrDntq5LuHqIYYnPTBmM5fAD0EMWRf+ZS7H+3XpwHM=
+github.com/xHain-hackspace/go-jcal v0.0.5 h1:fvAgMaSMuVbYtWdqOG18OpG8XShgOEhq5PKINbT+ToU=
+github.com/xHain-hackspace/go-jcal v0.0.5/go.mod h1:TtrDntq5LuHqIYYnPTBmM5fAD0EMWRf+ZS7H+3XpwHM=
 go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
 go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 h1:NUzdAbFtCJSXU20AOXgeqaUwg8Ypg4MPYmL+d+rsB5c=

internal/message/message.go

@@ -20,6 +20,7 @@ type Event struct {
 	EndTime         string
 	HtmlDescription string
 	TxtDescription  string
+	IsAllDay        bool
 }
 
 type TemplatedMessage struct {
@@ -37,6 +38,7 @@ func NewTemplatedMessage(htmlTemplate, txtTemplate string, events []calendar.Eve
 			EndTime:         evt.End.In(tz).Format(timeLayout),
 			HtmlDescription: strings.ReplaceAll(strings.ReplaceAll(evt.Description, "\n", "<br>"), "\\", ""),
 			TxtDescription:  evt.Description,
+			IsAllDay:        evt.IsAllDay,
 		}
 
 		msg.Events = append(msg.Events, event)

pkg/calendar/calendar.go

@@ -19,6 +19,7 @@ type Event struct {
 	End         time.Time
 	Summary     string
 	Description string
+	IsAllDay    bool
 }
 
 type NextcloudCalendar struct {
@@ -101,5 +102,6 @@ func fromJcal(jEvent jcal.Event) Event {
 		Description: jEvent.Description,
 		Start:       jEvent.DtStart,
 		End:         jEvent.DtEnd,
+		IsAllDay:    jEvent.IsAllDay,
 	}
 }

templates/event.html

@@ -2,7 +2,9 @@ <h3>Events on {{ today }}</h3>
 <ul>
   {{range .Events}}
     <li>
+    {{ if not .IsAllDay }}
     {{.StartTime}} - {{.EndTime}}<br>
+    {{ end }}
     {{.Summary}} <br>
     {{ if ne .HtmlDescription `` }}
     ({{.HtmlDescription}})