From 4cb8b0f4f4264edc280e882dbc8af449e5f66073 Mon Sep 17 00:00:00 2001
From: develoopeer <cooltable01@gmail.com>
Date: Thu, 14 Nov 2024 09:06:47 +0300
Subject: [PATCH] - Calendar template fixed - Bug with ics events, from another
 years fixed

---
 internal/assets/templates/calendar.html | 24 +++++++++++++-----------
 internal/feed/calendar.go               |  2 +-
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/internal/assets/templates/calendar.html b/internal/assets/templates/calendar.html
index 5feabc0..7e6708b 100644
--- a/internal/assets/templates/calendar.html
+++ b/internal/assets/templates/calendar.html
@@ -1,6 +1,6 @@
 {{ template "widget-base.html" . }}
 
-{{ define "widget-content" }} {{ define "widget-content" }}
+{{ define "widget-content" }}
 <div class="widget-small-content-bounds">
     <div class="flex justify-between items-center">
         <div class="color-highlight size-h1">{{ .Calendar.CurrentMonthName }}</div>
@@ -20,15 +20,17 @@
         <div class="calendar-day">Su</div>
     </div>
 
-<div class="flex flex-wrap justify-center items-center">
-	{{ range .Calendar.Days }}
-	<div class="calendar-day{{ if eq .Day $.Calendar.CurrentDay }} calendar-day-today{{ end }} {{ if .IsEvent}} calendar-isevent{{ end }}">
-	{{ if .IsEvent}}
-		<div class="tooltip">
-			<span class="tooltiptext">{{ .Event.EventHover }}</span>
-		</div>
-	{{ end }}
-	<span>{{ .Day }}</span>
+	<div class="flex flex-wrap justify-center items-center">
+		{{ range .Calendar.Days }}
+		<div class="calendar-day{{ if eq .Day $.Calendar.CurrentDay }} calendar-day-today{{ end }} {{ if .IsEvent}} calendar-isevent{{ end }}">
+		{{ if .IsEvent}}
+			<div class="tooltip">
+				<span class="tooltiptext">{{ .Event.EventHover }}</span>
+			</div>
+		{{ end }}
+		<span>{{ .Day }}</span>
 	</div>
+	{{ end }}
+    </div>
 </div>
-{{ end }}
\ No newline at end of file
+{{ end }}
diff --git a/internal/feed/calendar.go b/internal/feed/calendar.go
index b4e6d3e..b94c506 100644
--- a/internal/feed/calendar.go
+++ b/internal/feed/calendar.go
@@ -53,7 +53,7 @@ func NewCalendar(now time.Time, icsurl string) *Calendar {
 				if err != nil {
 					log.Panic(err)
 				}
-				if startAt.Day() == day && startAt.Month() == month {
+				if startAt.Day() == day && startAt.Month() == month && startAt.Year() == year {
 					dayEvent.StartedDay = startAt
 					dayEvent.EventHover = event.GetProperty("SUMMARY").Value
 					days[i].IsEvent = true