From aec5cc4e3c508a4fda2d6b8f311be4ebd42aedca Mon Sep 17 00:00:00 2001
From: sneak <sneak@sneak.berlin>
Date: Thu, 22 May 2025 09:21:52 -0700
Subject: [PATCH] Replace client-side JS with server-side relative timestamps

---
 models.go            | 26 ++++++++++----------
 templates/index.html | 57 ++------------------------------------------
 webserver.go         | 52 ++++++++++++++++++++++++++++++++++++++++
 3 files changed, 68 insertions(+), 67 deletions(-)

diff --git a/models.go b/models.go
index fdac7a8..c481a3d 100644
--- a/models.go
+++ b/models.go
@@ -5,18 +5,20 @@ import (
 )
 
 type Article struct {
-	Title         string    `json:"title"`
-	Description   string    `json:"description"`
-	Link          string    `json:"link"`
-	Published     time.Time `json:"published"`    // When we first saw the article
-	OriginalDate  time.Time `json:"originalDate"` // Original publication date from the feed
-	Source        string    `json:"source"`
-	FirstSeen     time.Time `json:"firstseen"`
-	Seen          time.Time `json:"seen"`
-	Summary       string    `json:"summary"`
-	Importance    int       `json:"importance"`
-	ID            string    `json:"id"`
-	BroadcastTime time.Time `json:"broadcastTime,omitempty"`
+	Title                 string    `json:"title"`
+	Description           string    `json:"description"`
+	Link                  string    `json:"link"`
+	Published             time.Time `json:"published"`    // When we first saw the article
+	OriginalDate          time.Time `json:"originalDate"` // Original publication date from the feed
+	Source                string    `json:"source"`
+	FirstSeen             time.Time `json:"firstseen"`
+	Seen                  time.Time `json:"seen"`
+	Summary               string    `json:"summary"`
+	Importance            int       `json:"importance"`
+	ID                    string    `json:"id"`
+	BroadcastTime         time.Time `json:"broadcastTime,omitempty"`
+	RelativeTime          string    `json:"-"` // Relative time for FirstSeen (calculated field, not stored)
+	BroadcastRelativeTime string    `json:"-"` // Relative time for BroadcastTime (calculated field, not stored)
 }
 
 type LogEntry struct {
diff --git a/templates/index.html b/templates/index.html
index 1c4698b..3d0a06b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -235,7 +235,7 @@
                         <td class="source">{{.Source}}</td>
                         <td class="title">{{.Title}}</td>
                         <td><a href="{{.Link}}" class="article-link" target="_blank">{{.Summary}}</a></td>
-                        <td class="timestamp" title="{{.FirstSeen.Format "2006-01-02 15:04:05 MST"}}" data-timestamp="{{.FirstSeen.Unix}}"></td>
+                        <td class="timestamp" title="{{.FirstSeen.Format "2006-01-02 15:04:05 MST"}}">{{.RelativeTime}}</td>
                     </tr>
                     {{else}}
                     <tr>
@@ -263,7 +263,7 @@
                     {{range .History}}
                     <tr>
                         <td class="id">{{.ID}}</td>
-                        <td class="timestamp" title="{{.BroadcastTime.Format "2006-01-02 15:04:05 MST"}}" data-timestamp="{{.BroadcastTime.Unix}}"></td>
+                        <td class="timestamp" title="{{.BroadcastTime.Format "2006-01-02 15:04:05 MST"}}">{{.BroadcastRelativeTime}}</td>
                         <td class="importance {{if ge .Importance 70}}high{{else if ge .Importance 40}}medium{{else}}low{{end}}">{{.Importance}}</td>
                         <td class="source">{{.Source}}</td>
                         <td class="title">{{.Title}}</td>
@@ -316,58 +316,5 @@
     <div class="footer">
         <a href="https://git.eeqj.de/sneak/gomeshalerter">gomeshalerter</a> is a project by <a href="https://sneak.berlin">@sneak</a> and released under the WTFPL (<a href="https://git.eeqj.de/sneak/gomeshalerter">source</a>)
     </div>
-
-    <script>
-        // Function to format relative time
-        function formatRelativeTime(timestamp) {
-            const now = Math.floor(Date.now() / 1000);
-            const diff = now - timestamp;
-            
-            // Less than a minute
-            if (diff < 60) {
-                return 'just now';
-            }
-            
-            // Less than an hour
-            if (diff < 3600) {
-                const minutes = Math.floor(diff / 60);
-                return `${minutes}m ago`;
-            }
-            
-            // Less than a day
-            if (diff < 86400) {
-                const hours = Math.floor(diff / 3600);
-                return `${hours}h ago`;
-            }
-            
-            // Less than a week
-            if (diff < 604800) {
-                const days = Math.floor(diff / 86400);
-                return `${days}d ago`;
-            }
-            
-            // More than a week
-            const weeks = Math.floor(diff / 604800);
-            return `${weeks}w ago`;
-        }
-        
-        // Update all timestamp elements
-        function updateRelativeTimes() {
-            const timestampElements = document.querySelectorAll('.timestamp[data-timestamp]');
-            
-            timestampElements.forEach(el => {
-                const timestamp = parseInt(el.getAttribute('data-timestamp'), 10);
-                if (!isNaN(timestamp)) {
-                    el.textContent = formatRelativeTime(timestamp);
-                }
-            });
-        }
-        
-        // Update times on page load
-        document.addEventListener('DOMContentLoaded', updateRelativeTimes);
-        
-        // Update times every minute
-        setInterval(updateRelativeTimes, 60000);
-    </script>
 </body>
 </html> 
\ No newline at end of file
diff --git a/webserver.go b/webserver.go
index 07e5019..6776da8 100644
--- a/webserver.go
+++ b/webserver.go
@@ -175,6 +175,9 @@ func getDashboardData() (DashboardData, error) {
 	if err != nil {
 		return data, err
 	}
+
+	// Add relative time information to history articles
+	history = addRelativeTimes(history)
 	data.History = history
 
 	// Get next up articles (importance sorted, less than 24 hours old)
@@ -182,6 +185,9 @@ func getDashboardData() (DashboardData, error) {
 	if err != nil {
 		return data, err
 	}
+
+	// Add relative time information to next up articles
+	nextUp = addRelativeTimes(nextUp)
 	data.NextUp = nextUp
 
 	// Get recent logs
@@ -206,3 +212,49 @@ func isResponseHeaderWritten(err error) bool {
 		strings.Contains(errStr, "write: connection reset by peer") ||
 		strings.Contains(errStr, "http: superfluous response.WriteHeader")
 }
+
+// formatRelativeTime returns a human-readable relative time string
+func formatRelativeTime(t time.Time) string {
+	if t.IsZero() {
+		return ""
+	}
+
+	now := time.Now()
+	diff := now.Sub(t)
+
+	// Less than a minute
+	if diff < time.Minute {
+		return "just now"
+	}
+
+	// Less than an hour
+	if diff < time.Hour {
+		minutes := int(diff.Minutes())
+		return fmt.Sprintf("%dm ago", minutes)
+	}
+
+	// Less than a day
+	if diff < 24*time.Hour {
+		hours := int(diff.Hours())
+		return fmt.Sprintf("%dh ago", hours)
+	}
+
+	// Less than a week
+	if diff < 7*24*time.Hour {
+		days := int(diff.Hours() / 24)
+		return fmt.Sprintf("%dd ago", days)
+	}
+
+	// More than a week
+	weeks := int(diff.Hours() / 24 / 7)
+	return fmt.Sprintf("%dw ago", weeks)
+}
+
+// Add relative time information to articles
+func addRelativeTimes(articles []Article) []Article {
+	for i := range articles {
+		articles[i].RelativeTime = formatRelativeTime(articles[i].FirstSeen)
+		articles[i].BroadcastRelativeTime = formatRelativeTime(articles[i].BroadcastTime)
+	}
+	return articles
+}