From c349abfdedee93db138c4aa40080f86c57455fa6 Mon Sep 17 00:00:00 2001
From: Roan Horning <roan.horning@gmail.com>
Date: Tue, 16 Dec 2025 00:50:34 -0500
Subject: [PATCH] Calculate the start and end dates for the New Year show

---
 templates/content-index-announcement.tpl.html |  4 ++--
 templates/content-new_year.tpl.html           |  4 ++--
 templates/shared-utils.tpl.html               | 17 +++++++++++++++++
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/templates/content-index-announcement.tpl.html b/templates/content-index-announcement.tpl.html
index 07e7931..e0d6bc1 100644
--- a/templates/content-index-announcement.tpl.html
+++ b/templates/content-index-announcement.tpl.html
@@ -8,8 +8,8 @@
 		<p>
 		<em>If you keep talking, we'll keep recording.</em>
 		</p>
-		<p>For those who don't know, on New Year's Eve 2025-12-31 10:00 UTC (5:00 AM EST), we will have a recording going on the HPR Mumble server for anyone to come on and say "Happy New Year" and talk about whatever they want. 
-		We will leave the recording going until at least 2026-01-01 12:00 UTC (7:00 AM EST), and keep recording until the conversation stops.</p>
+		<p>For those who don't know, on New Year's Eve <!--% get_new_year_show_start() %-->, we will have a recording going on the HPR Mumble server for anyone to come on and say "Happy New Year" and talk about whatever they want. 
+		We will leave the recording going until at least <!--% get_new_year_show_end() %-->, and keep recording until the conversation stops.</p>
 		<p>
 		So please stop in. Say "Hi" and maybe join in the conversation with other HPR listeners and contributors. It's always a good time!!<br>
 		<audio controls preload="none">
diff --git a/templates/content-new_year.tpl.html b/templates/content-new_year.tpl.html
index 068dc04..5256d6c 100644
--- a/templates/content-new_year.tpl.html
+++ b/templates/content-new_year.tpl.html
@@ -5,8 +5,8 @@
 <p>
 <em>If you keep talking, we'll keep recording.</em>
 </p>
-<p>For those who don't know, on New Years Eve 2025-12-31 10:00 UTC (5:00 AM EST), we will have a recording going on the HPR Mumble server for anyone to come on and say "Happy New Years" and talk about whatever they want. 
-We will leave the recording going until at least 2026-01-01 12:00 UTC (7:00 AM EST), and keep recording until the conversation stops.</p>
+<p>For those who don't know, on New Years Eve <!--% get_new_year_show_start() %-->, we will have a recording going on the HPR Mumble server for anyone to come on and say "Happy New Years" and talk about whatever they want. 
+We will leave the recording going until at least <!--% get_new_year_show_end() %-->, and keep recording until the conversation stops.</p>
 <p>
 So please stop in. Say "Hi" and maybe join in the conversation with other HPR listeners and contributors. It's always a good time!!<br />
 </p>
diff --git a/templates/shared-utils.tpl.html b/templates/shared-utils.tpl.html
index 2082c7d..bc60cee 100644
--- a/templates/shared-utils.tpl.html
+++ b/templates/shared-utils.tpl.html
@@ -134,3 +134,20 @@
     <!--% END %-->
 	<span><a href="<!--% absolute_path(baseurl) %-->eps/<!--% folder %--><!--% zero_pad_left(links.latest) %-->/index.html" rel="last" aria-label="latest episode">Latest<span class="no-css"> &gt;&gt;</span><!--% INSERT $arrow_last %--></a></span></nav>
 <!--% END %-->
+
+<!--% MACRO get_new_year_show_start BLOCK %-->
+<!--% start_year = date.format(date.now, '%Y') %-->	
+<!--% IF date.format(date.now, '%m') != 12 || date.format(date.now, '%j') == 1 %-->
+	<!--% start_year = start_year - 1 %-->
+<!--% END %-->
+	<time datetime="<!--% start_year %-->-12-31T10:00Z"><!--% start_year %-->-12-31 10:00 UTC (5:00 AM EST)</time>
+<!--% END %-->
+
+<!--% MACRO get_new_year_show_end BLOCK %-->
+<!--% end_year = date.format(date.now, '%Y') %-->	
+<!--% IF date.format(date.now, '%m') == 12 || date.format(date.now, '%j') == 1 %-->
+	<!--% end_year = end_year + 1 %-->
+<!--% END %-->
+	<time datetime="<!--% end_year %-->-01-01T12:00Z"><!--% end_year %-->-01-01 12:00 UTC (7:00 AM EST)</time>
+<!--% END %-->
+