From dca1c07ddd2090fecdda2a344343db6f486407b7 Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@painless-security.com>
Date: Fri, 9 Sep 2022 12:23:59 -0300
Subject: [PATCH 1/2] refactor: reimplement Meeting.end_datetime() using
 datetime_from_date helper

---
 ietf/meeting/models.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index 59e47e2b9d9..dde59f91945 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -139,10 +139,9 @@ def end_date(self):
         return self.get_meeting_date(self.days-1)
 
     def end_datetime(self):
-        """Datetime of the first instant _after_ the meeting's last day"""
-        return self.tz().localize(
-            datetime.datetime.combine(self.get_meeting_date(self.days), datetime.time())
-        )
+        """Datetime of the first instant _after_ the meeting's last day in meeting time zone"""
+        return datetime_from_date(self.get_meeting_date(self.days), self.tz())
+
     def get_00_cutoff(self):
         start_date = datetime.datetime(year=self.date.year, month=self.date.month, day=self.date.day, tzinfo=pytz.utc)
         importantdate = self.importantdate_set.filter(name_id='idcutoff').first()

From 1e62c4388e7cf24ba13be474329eff2bf478121a Mon Sep 17 00:00:00 2001
From: Jennifer Richards <jennifer@painless-security.com>
Date: Fri, 9 Sep 2022 12:24:57 -0300
Subject: [PATCH 2/2] fix: use tz-aware meeting datetime to decide when to show
 ical link

---
 ietf/meeting/models.py                      | 4 ++++
 ietf/templates/meeting/session_details.html | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/ietf/meeting/models.py b/ietf/meeting/models.py
index dde59f91945..59c9f30d12d 100644
--- a/ietf/meeting/models.py
+++ b/ietf/meeting/models.py
@@ -138,6 +138,10 @@ def get_meeting_date (self,offset):
     def end_date(self):
         return self.get_meeting_date(self.days-1)
 
+    def start_datetime(self):
+        """Start-of-day on meeting.date in meeting time zone"""
+        return datetime_from_date(self.date, self.tz())
+
     def end_datetime(self):
         """Datetime of the first instant _after_ the meeting's last day in meeting time zone"""
         return datetime_from_date(self.get_meeting_date(self.days), self.tz())
diff --git a/ietf/templates/meeting/session_details.html b/ietf/templates/meeting/session_details.html
index 2ecb7e1d5ca..c1b9f31fc7b 100644
--- a/ietf/templates/meeting/session_details.html
+++ b/ietf/templates/meeting/session_details.html
@@ -14,7 +14,7 @@ <h1>
         <br>
         <small class="text-muted">{{ acronym }}</small>
     </h1>
-    {% if meeting.date >= thisweek %}
+    {% if meeting.start_datetime >= thisweek %}
         <a class="regular float-end"
            title="icalendar entry for {{ acronym }}@{{ meeting.number }}"
            aria-label="icalendar entry for {{ acronym }}@{{ meeting.number }}"