Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 0c3da47

Browse files
committedApr 27, 2024··
Migrate to using jcal
* Updates dockerfile for timezone * Updates templates
1 parent 58d9898 commit 0c3da47

File tree

11 files changed

+135
-2778
lines changed

11 files changed

+135
-2778
lines changed
 

‎Dockerfile

+1
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ FROM alpine
2222

2323
WORKDIR /
2424
RUN apk add --no-cache tzdata
25+
RUN ln -s /usr/share/zoneinfo/Europe/Berlin /etc/localtime
2526
RUN adduser -D calendar-bot
2627
USER calendar-bot
2728
COPY --from=build /calendar-bot /calendar-bot

‎cmd/calendar-bot/calendar-bot.go

+18-8
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,16 @@ import (
1818

1919
const flags = log.Ldate | log.Ltime | log.Lmsgprefix
2020

21-
var errLog = log.New(os.Stderr, "[ERROR] ", flags|log.Lshortfile)
22-
var infoLog = log.New(os.Stdout, "[INFO] ", flags)
21+
var (
22+
errLog = log.New(os.Stderr, "[ERROR] ", flags|log.Lshortfile)
23+
infoLog = log.New(os.Stdout, "[INFO] ", flags)
24+
)
2325

24-
var configFile = flag.String("config", "", "Path to config file")
25-
var htmlTmplPath = flag.String("html", "", "Path to html template file")
26-
var txtTmplPath = flag.String("txt", "", "Path to txt template file")
26+
var (
27+
configFile = flag.String("config", "", "Path to config file")
28+
htmlTmplPath = flag.String("html", "", "Path to html template file")
29+
txtTmplPath = flag.String("txt", "", "Path to txt template file")
30+
)
2731

2832
func main() {
2933
flag.Parse()
@@ -94,15 +98,17 @@ func main() {
9498
timezone := time.Local
9599
s := gocron.NewScheduler(timezone)
96100
infoLog.Printf("Scheduling notifications for %s", notifyTime.Format("15:04"))
97-
s.Every(1).Day().At(notifyTime).Do(func() {
101+
_, err = s.Every(1).Day().At(time.Now().Add(2 * time.Second)).Do(func() {
98102
infoLog.Println("Start Notification")
99-
cal, err := calendar.ImportCalendar(conf.Calendar, infoLog)
103+
cal, err := calendar.NewNextcloudCalendar(conf.Calendar)
100104
if err != nil {
101-
errLog.Printf("Could not read calendar info from %s\n", conf.Calendar)
105+
errLog.Println(err)
106+
return
102107
}
103108
todayEvents, err := cal.GetEventsOn(time.Now())
104109
if err != nil {
105110
errLog.Println(err)
111+
return
106112
}
107113
if len(todayEvents) == 0 {
108114
infoLog.Println("No events today!")
@@ -127,5 +133,9 @@ func main() {
127133
}
128134
}
129135
})
136+
if err != nil {
137+
errLog.Println(err)
138+
return
139+
}
130140
s.StartBlocking()
131141
}

‎go.mod

+5-8
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,18 @@
11
module github.com/gueldenstone/calendar-bot
22

3-
go 1.18
3+
go 1.22.0
44

55
require (
6-
github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f
7-
github.com/go-co-op/gocron v1.13.0
6+
github.com/go-co-op/gocron v1.37.0
7+
github.com/xHain-hackspace/go-jcal v0.0.3
88
gopkg.in/yaml.v3 v3.0.1
99
maunium.net/go/mautrix v0.11.0
1010
)
1111

1212
require (
13-
github.com/kr/text v0.2.0 // indirect
14-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e // indirect
13+
github.com/google/uuid v1.4.0 // indirect
1514
github.com/robfig/cron/v3 v3.0.1 // indirect
16-
github.com/teambition/rrule-go v1.7.2 // indirect
15+
go.uber.org/atomic v1.9.0 // indirect
1716
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 // indirect
1817
golang.org/x/net v0.0.0-20220513224357-95641704303c // indirect
19-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c // indirect
20-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f // indirect
2118
)

‎go.sum

+32-13
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,49 @@
11
github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
2+
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
23
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
3-
github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f h1:feGUUxxvOtWVOhTko8Cbmp33a+tU0IMZxMEmnkoAISQ=
4-
github.com/emersion/go-ical v0.0.0-20220601085725-0864dccc089f/go.mod h1:2MKFUgfNMULRxqZkadG1Vh44we3y5gJAtTBlVsx1BKQ=
5-
github.com/go-co-op/gocron v1.13.0 h1:BjkuNImPy5NuIPEifhWItFG7pYyr27cyjS6BN9w/D4c=
6-
github.com/go-co-op/gocron v1.13.0/go.mod h1:GD5EIEly1YNW+LovFVx5dzbYVcIc8544K99D8UVRpGo=
4+
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
5+
github.com/go-co-op/gocron v1.37.0 h1:ZYDJGtQ4OMhTLKOKMIch+/CY70Brbb1dGdooLEhh7b0=
6+
github.com/go-co-op/gocron v1.37.0/go.mod h1:3L/n6BkO7ABj+TrfSVXLRzsP26zmikL4ISkLQ0O8iNY=
7+
github.com/google/uuid v1.4.0 h1:MtMxsa51/r9yyhkyLsVeVt0B+BGQZzpQiTQ4eHZ8bc4=
8+
github.com/google/uuid v1.4.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
9+
github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
10+
github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
11+
github.com/kr/pretty v0.3.0 h1:WgNl7dwNpEZ6jJ9k1snq4pZsg7DOEN8hP9Xw0Tsjwk0=
12+
github.com/kr/pretty v0.3.0/go.mod h1:640gp4NfQd8pI5XOwp5fnNeVWj67G7CFk/SaSQn7NBk=
713
github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
814
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
915
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
1016
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
11-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e h1:fD57ERR4JtEqsWbfPhv4DMiApHyliiK5xCTNVSPiaAs=
12-
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
17+
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=
1318
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
19+
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
1420
github.com/robfig/cron/v3 v3.0.1 h1:WdRxkvbJztn8LMz/QEvLN5sBU+xKpSqwwUO1Pjr4qDs=
1521
github.com/robfig/cron/v3 v3.0.1/go.mod h1:eQICP3HwyT7UooqI/z+Ov+PtYAWygg1TEWWzGIFLtro=
16-
github.com/stretchr/testify v1.7.1 h1:5TQK59W5E3v0r2duFAb7P95B6hEeOyEnHRa8MjYSMTY=
17-
github.com/teambition/rrule-go v1.7.2 h1:goEajFWYydfCgavn2m/3w5U+1b3PGqPUHx/fFSVfTy0=
18-
github.com/teambition/rrule-go v1.7.2/go.mod h1:mBJ1Ht5uboJ6jexKdNUJg2NcwP8uUMNvStWXlJD3MvU=
22+
github.com/rogpeppe/go-internal v1.6.1/go.mod h1:xXDCJY+GAPziupqXw64V24skbSoqbTEfhy4qGm1nDQc=
23+
github.com/rogpeppe/go-internal v1.8.1 h1:geMPLpDpQOgVyCg5z5GoRwLHepNdb71NXb67XFkP+Eg=
24+
github.com/rogpeppe/go-internal v1.8.1/go.mod h1:JeRgkft04UBgHMgCIwADu4Pn6Mtm5d4nPKWu0nJ5d+o=
25+
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
26+
github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
27+
github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
28+
github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
29+
github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
30+
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
31+
github.com/stretchr/testify v1.8.2 h1:+h33VjcLVPDHtOdpUCuF+7gSuG3yGIftsP1YvFihtJ8=
32+
github.com/stretchr/testify v1.8.2/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
33+
github.com/xHain-hackspace/go-jcal v0.0.3 h1:2FcfP0FimmhMOUCHQ6uXCWgNJnk3OQImbZSFKt8zBbI=
34+
github.com/xHain-hackspace/go-jcal v0.0.3/go.mod h1:TtrDntq5LuHqIYYnPTBmM5fAD0EMWRf+ZS7H+3XpwHM=
35+
go.uber.org/atomic v1.9.0 h1:ECmE8Bn/WFTYwEW/bpKD3M8VtR/zQVbavAoalC1PYyE=
36+
go.uber.org/atomic v1.9.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
1937
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9 h1:NUzdAbFtCJSXU20AOXgeqaUwg8Ypg4MPYmL+d+rsB5c=
2038
golang.org/x/crypto v0.0.0-20220513210258-46612604a0f9/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
2139
golang.org/x/net v0.0.0-20220513224357-95641704303c h1:nF9mHSvoKBLkQNQhJZNsc66z2UzAMUbLGjC95CF3pU0=
2240
golang.org/x/net v0.0.0-20220513224357-95641704303c/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
23-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c h1:5KslGYwFpkhGh+Q16bwMP3cOontH8FOep7tGV86Y7SQ=
24-
golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
2541
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
26-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f h1:BLraFXnmrev5lT+xlilqcH8XK9/i0At2xKjWk4p6zsU=
27-
gopkg.in/check.v1 v1.0.0-20200227125254-8fa46927fb4f/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
42+
gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
43+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
44+
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
45+
gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
46+
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
2847
gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
2948
gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
3049
maunium.net/go/mautrix v0.11.0 h1:B1FBHcvE4Mud+AC+zgNQQOw0JxSVrt40watCejhVA7w=

‎internal/config/config.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@ import (
99

1010
type Config struct {
1111
Homeserver string `yaml:"homeserver"`
12-
Rooms []string `yaml:"rooms"`
1312
Calendar string `yaml:"calendarURL"`
1413
NotifyTime string `yaml:"nofifyTime"`
1514
Username string `yaml:"username"`
1615
Password string `yaml:"password"`
16+
Rooms []string `yaml:"rooms"`
1717
}
1818

1919
func Parse(path string) (Config, error) {

‎internal/message/message.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ import (
77
"time"
88

99
"github.com/gueldenstone/calendar-bot/pkg/calendar"
10-
1110
"maunium.net/go/mautrix/event"
1211
)
1312

@@ -24,9 +23,9 @@ type Event struct {
2423
}
2524

2625
type TemplatedMessage struct {
27-
Events []Event
2826
htmlTemplate *template.Template
2927
txtTemplate *template.Template
28+
Events []Event
3029
}
3130

3231
func NewTemplatedMessage(htmlTemplate, txtTemplate string, events []calendar.Event, tz *time.Location) (TemplatedMessage, error) {
@@ -36,7 +35,7 @@ func NewTemplatedMessage(htmlTemplate, txtTemplate string, events []calendar.Eve
3635
Summary: evt.Summary,
3736
StartTime: evt.Start.In(tz).Format(timeLayout),
3837
EndTime: evt.End.In(tz).Format(timeLayout),
39-
HtmlDescription: strings.ReplaceAll(strings.ReplaceAll(evt.Description, "\\n", "<br>"), "\\", ""),
38+
HtmlDescription: strings.ReplaceAll(strings.ReplaceAll(evt.Description, "\n", "<br>"), "\\", ""),
4039
TxtDescription: evt.Description,
4140
}
4241

@@ -72,6 +71,7 @@ func (t TemplatedMessage) RenderTxt() (string, error) {
7271
err := t.txtTemplate.Execute(&buf, t)
7372
return buf.String(), err
7473
}
74+
7575
func (t TemplatedMessage) Render() (html string, txt string, err error) {
7676
html, err = t.RenderHtml()
7777
if err != nil {

‎pkg/calendar/calendar.go

+62-187
Original file line numberDiff line numberDiff line change
@@ -1,230 +1,105 @@
11
package calendar
22

33
import (
4+
"encoding/json"
45
"fmt"
6+
"io"
57
"log"
68
"net/http"
9+
"net/url"
710
"sort"
11+
"strings"
812
"time"
913

10-
"github.com/emersion/go-ical"
14+
jcal "github.com/xHain-hackspace/go-jcal"
1115
)
1216

13-
type IcalData struct {
14-
url string
15-
tz *time.Location
16-
parsed *ical.Calendar
17-
logger *log.Logger
18-
}
19-
2017
type Event struct {
21-
UID string
2218
Start time.Time
2319
End time.Time
2420
Summary string
25-
Location string
2621
Description string
2722
}
2823

29-
// Obtains an iCal from a given URL
30-
func ImportCalendar(url string, l *log.Logger) (IcalData, error) {
31-
data := IcalData{url: url, tz: time.Local, logger: l}
32-
33-
// Download the ICS file
34-
resp, err := http.Get(url)
35-
if err != nil {
36-
return data, err
37-
}
38-
defer resp.Body.Close()
39-
40-
// Parse the ICS file
41-
parser := ical.NewDecoder(resp.Body)
42-
parsedData, err := parser.Decode()
43-
if err != nil {
44-
return data, err
45-
}
46-
47-
data.parsed = parsedData
48-
return data, nil
24+
type NextcloudCalendar struct {
25+
BaseUrl url.URL
4926
}
5027

51-
// Assembles a list of events on a given date
52-
func (data IcalData) GetEventsOn(date time.Time) ([]Event, error) {
53-
54-
allEvents := make(map[string]ical.Event)
55-
selectedEvents := make([]Event, 0)
28+
// NewNextcloudCalendar creates a new nextcloud calendar instance
29+
//
30+
// Parameters:
31+
//
32+
// baseUrlStr - the base url e.g. https://files.x-hain.de/remote.php/dav/public-calendars/Yi63cicwgDnjaBHR
33+
func NewNextcloudCalendar(baseUrlStr string) (NextcloudCalendar, error) {
34+
calendar := NextcloudCalendar{}
5635

57-
// Prepare map of all events
58-
for _, event := range data.parsed.Events() {
59-
60-
uid := event.Props.Get(ical.PropUID).Value
61-
allEvents[uid] = data.handleDuplicates(uid, event, allEvents)
62-
63-
}
36+
baseUrlStr = strings.TrimSpace(baseUrlStr)
6437

65-
for _, event := range allEvents {
66-
67-
// Checks whether event happens on the given date
68-
if data.isSingleEventOnDate(event, date) ||
69-
data.isRecurringEventOnDate(event, date) {
70-
71-
convertedEvent, err := data.convertIcal(event, date)
72-
if err != nil {
73-
return nil, err
74-
}
75-
selectedEvents = append(selectedEvents, convertedEvent)
76-
}
38+
baseUrl, err := url.Parse(baseUrlStr)
39+
if err != nil {
40+
return calendar, err
7741
}
42+
calendar.BaseUrl = *baseUrl
7843

79-
sortEvents(selectedEvents)
80-
81-
return selectedEvents, nil
44+
return calendar, nil
8245
}
8346

84-
// Checks whether the event is a single, standard event on the given date
85-
func (data IcalData) isSingleEventOnDate(event ical.Event, date time.Time) bool {
86-
87-
start, err := event.DateTimeStart(data.tz)
47+
// Assembles a list of events on a given date
48+
func (c NextcloudCalendar) GetEventsOn(date time.Time) ([]Event, error) {
49+
events := make([]Event, 0)
50+
51+
// build url params
52+
params := url.Values{}
53+
params.Add("accept", "jcal")
54+
params.Add("expand", "1")
55+
params.Add("export", "")
56+
57+
// Get the first and last date of the day
58+
dayBegin := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, time.Local)
59+
dayEnd := time.Date(date.Year(), date.Month(), date.Day(), 23, 59, 59, 0, time.Local)
60+
params.Add("start", fmt.Sprintf("%d", dayBegin.Unix()))
61+
params.Add("end", fmt.Sprintf("%d", dayEnd.Unix()))
62+
63+
// add params to url
64+
requestUrl := c.BaseUrl
65+
requestUrl.RawQuery = params.Encode()
66+
67+
// make request
68+
resp, err := http.Get(requestUrl.String())
8869
if err != nil {
89-
data.logger.Printf("could not get start time: %s\n", err)
90-
return false
70+
return events, err
9171
}
9272

93-
end, err := event.DateTimeEnd(data.tz)
73+
// read data
74+
respData, err := io.ReadAll(resp.Body)
9475
if err != nil {
95-
data.logger.Printf("could not get end time: %s\n", err)
96-
return false
76+
return events, err
9777
}
78+
resp.Body.Close()
9879

99-
todayStart := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, data.tz)
100-
todayEnd := todayStart.Add(24 * time.Hour)
101-
102-
isRegularEvent := (start.After(todayStart) || start.Equal(todayStart)) && start.Before(todayEnd)
103-
isSpanningEvent := start.Before(todayStart) && end.After(todayEnd)
104-
105-
return isRegularEvent || isSpanningEvent
106-
}
107-
108-
// Checks whether an recurring event happens on a given date
109-
func (data IcalData) isRecurringEventOnDate(event ical.Event, date time.Time) bool {
110-
recurrenceSet, err := event.RecurrenceSet(data.tz)
111-
if err != nil {
112-
data.logger.Printf("could not get recurrence set: %s\n", err)
113-
return false
114-
}
115-
if recurrenceSet == nil {
116-
return false
80+
// parse jcal
81+
var jcalObj jcal.JCalObject
82+
if err := json.Unmarshal(respData, &jcalObj); err != nil {
83+
log.Fatalf("Error parsing jCal JSON: %v", err)
11784
}
11885

119-
todayStart := time.Date(date.Year(), date.Month(), date.Day(), 0, 0, 0, 0, data.tz)
120-
121-
// Obtain the next recurrence date after todayStart.
122-
nextRecurrence := recurrenceSet.After(todayStart, true)
123-
124-
// Use components of nextRecurrence to create a new date with a specific time set to midnight.
125-
recurrenceDate := time.Date(nextRecurrence.Year(), nextRecurrence.Month(), nextRecurrence.Day(), 0, 0, 0, 0, data.tz)
126-
127-
return recurrenceDate.Equal(todayStart)
128-
}
129-
130-
// Check for a duplicate and returns the right event
131-
func (data IcalData) handleDuplicates(uid string, event ical.Event, allEvents map[string]ical.Event) ical.Event {
132-
133-
newCandidate := event
134-
135-
if _, ok := allEvents[uid]; ok {
136-
137-
existingCandidate := allEvents[uid]
138-
139-
existingCandidateCreatedProp := allEvents[uid].Props.Get(ical.PropCreated)
140-
if existingCandidateCreatedProp == nil {
141-
return existingCandidate
142-
}
143-
existingCandidateCreatedTime, err := existingCandidateCreatedProp.DateTime(data.tz)
144-
if err != nil {
145-
return existingCandidate
146-
}
147-
148-
newCandidateCreatedProp := event.Props.Get(ical.PropCreated)
149-
if newCandidateCreatedProp == nil {
150-
return existingCandidate
151-
}
152-
153-
newCandidateCreatedTime, err := newCandidateCreatedProp.DateTime(data.tz)
154-
if err != nil {
155-
return existingCandidate
156-
}
157-
158-
// If there is a duplicate select the one that was created later
159-
if existingCandidateCreatedTime.After(newCandidateCreatedTime) {
160-
return existingCandidate
161-
}
86+
// convert from jcal
87+
for _, jEvent := range jcalObj.Events {
88+
events = append(events, fromJcal(jEvent))
16289
}
16390

164-
return newCandidate
165-
}
166-
167-
// Sorts events by start time
168-
func sortEvents(events []Event) {
91+
// sort events by start time
16992
sort.SliceStable(events, func(i, j int) bool {
17093
return events[i].Start.Before(events[j].Start)
17194
})
95+
return events, nil
17296
}
17397

174-
// Builds the object that is used to represent an event
175-
func (data IcalData) convertIcal(icalEvent ical.Event, date time.Time) (Event, error) {
176-
event := Event{}
177-
178-
// Handle UID
179-
uidProp := icalEvent.Props.Get(ical.PropUID)
180-
if uidProp != nil {
181-
event.UID = uidProp.Value
182-
} else {
183-
return event, fmt.Errorf("UID is missing for event %s", icalEvent.Name)
184-
}
185-
186-
// Handle DTSTART
187-
startProp := icalEvent.Props.Get(ical.PropDateTimeStart)
188-
if startProp == nil {
189-
return event, fmt.Errorf("DTSTART is missing for event %s", icalEvent.Name)
98+
func fromJcal(jEvent jcal.Event) Event {
99+
return Event{
100+
Summary: jEvent.Summary,
101+
Description: jEvent.Description,
102+
Start: jEvent.DtStart,
103+
End: jEvent.DtEnd,
190104
}
191-
eventStart, err := startProp.DateTime(data.tz)
192-
if err != nil {
193-
return event, err
194-
}
195-
event.Start = time.Date(date.Year(), date.Month(), date.Day(), eventStart.Hour(), eventStart.Minute(), 0, 0, date.Location())
196-
197-
// Handle DTEND
198-
endProp := icalEvent.Props.Get(ical.PropDateTimeEnd)
199-
if endProp != nil {
200-
eventEnd, err := endProp.DateTime(data.tz)
201-
if err != nil {
202-
return event, err
203-
}
204-
// Calculate the difference in days and adjust Event.End
205-
daysDiff := int(eventEnd.Sub(eventStart).Hours() / 24)
206-
event.End = time.Date(date.Year(), date.Month(), date.Day()+daysDiff, eventEnd.Hour(), eventEnd.Minute(), 0, 0, date.Location())
207-
}
208-
209-
// Handle SUMMARY
210-
summaryProp := icalEvent.Props.Get(ical.PropSummary)
211-
if summaryProp != nil {
212-
event.Summary = summaryProp.Value
213-
}
214-
215-
// Handle LOCATION
216-
locationProp := icalEvent.Props.Get(ical.PropLocation)
217-
if locationProp != nil {
218-
event.Location = locationProp.Value
219-
}
220-
221-
// Handle DESCRIPTION
222-
descriptionProp := icalEvent.Props.Get(ical.PropDescription)
223-
if descriptionProp != nil {
224-
event.Description = descriptionProp.Value
225-
} else {
226-
event.Description = ""
227-
}
228-
229-
return event, nil
230105
}

‎pkg/calendar/calendar_test.go

-203
This file was deleted.

‎pkg/calendar/testData.txt

-2,351
This file was deleted.

‎templates/event.html

+8-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
11
<h3>Events on {{ today }}</h3>
22
<ul>
33
{{range .Events}}
4-
<li>{{.Summary}}{{ if ne .StartTime `` }}: {{.StartTime}} - {{.EndTime}} {{end}} {{ if ne .HtmlDescription `` }}
5-
({{.HtmlDescription}}) {{end}}</li> <br>
4+
<li>
5+
{{.StartTime}} - {{.EndTime}}<br>
6+
{{.Summary}} <br>
7+
{{ if ne .HtmlDescription `` }}
8+
({{.HtmlDescription}})
9+
{{end}}
10+
</li>
11+
<br>
612
{{end}}
713
</ul>

‎templates/event.txt

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,8 @@
11
Events on {{ today }}:
22
{{range .Events}}
3-
- {{.Summary}}{{ if ne .StartTime `` }}: {{.StartTime}} - {{.EndTime}} {{end}} {{ if ne .TxtDescription `` }}
4-
({{.TxtDescription}}) {{end}}
3+
- {{.StartTime}} - {{.EndTime}}
4+
{{.Summary}}
5+
{{ if ne .TxtDescription `` }}
6+
({{.TxtDescription}})
7+
{{end}}
58
{{end}}

0 commit comments

Comments
 (0)
Please sign in to comment.