From 72121dbcfeff26c004ca96c19ba964b03b008972 Mon Sep 17 00:00:00 2001
From: andig <cpuidle@gmx.de>
Date: Tue, 24 Jan 2023 18:43:38 +0100
Subject: [PATCH] chore: always publish time in RFC 3339 (#5886)

---
 assets/js/components/Savings.vue | 9 ++++++---
 assets/js/components/Site.vue    | 2 +-
 core/site.go                     | 2 +-
 server/socket.go                 | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/assets/js/components/Savings.vue b/assets/js/components/Savings.vue
index e2ceaae81..e61650148 100644
--- a/assets/js/components/Savings.vue
+++ b/assets/js/components/Savings.vue
@@ -123,7 +123,7 @@
 									<small>
 										{{
 											$t("footer.savings.since", {
-												since: fmtDayMonthYear(startDate),
+												since: startDate,
 											})
 										}}
 									</small>
@@ -157,7 +157,7 @@ export default {
 	mixins: [formatter],
 	props: {
 		selfConsumptionPercent: Number,
-		since: { type: Number, default: 0 },
+		since: String,
 		sponsor: String,
 		amount: { type: Number, default: 0 },
 		effectivePrice: { type: Number, default: 0 },
@@ -182,7 +182,10 @@ export default {
 			return { value, unit };
 		},
 		startDate() {
-			return new Date(this.since * 1000);
+			if (this.since) {
+				return this.fmtDayMonthYear(new Date(this.since));
+			}
+			return "";
 		},
 	},
 	methods: {
diff --git a/assets/js/components/Site.vue b/assets/js/components/Site.vue
index abb8fa565..5f54a1e3e 100644
--- a/assets/js/components/Site.vue
+++ b/assets/js/components/Site.vue
@@ -75,7 +75,7 @@ export default {
 		savingsGridCharged: Number,
 		savingsSelfConsumptionCharged: Number,
 		savingsSelfConsumptionPercent: Number,
-		savingsSince: Number,
+		savingsSince: String,
 		savingsTotalCharged: Number,
 		tariffFeedIn: Number,
 		tariffGrid: Number,
diff --git a/core/site.go b/core/site.go
index 5ac23a63d..e1620305a 100644
--- a/core/site.go
+++ b/core/site.go
@@ -586,7 +586,7 @@ func (site *Site) prepare() {
 	site.publish("residualPower", site.ResidualPower)
 
 	site.publish("currency", site.tariffs.Currency.String())
-	site.publish("savingsSince", site.savings.Since().Unix())
+	site.publish("savingsSince", site.savings.Since())
 
 	site.publish("vehicles", vehicleTitles(site.GetVehicles()))
 }
diff --git a/server/socket.go b/server/socket.go
index a7d812be2..1c83dcb94 100644
--- a/server/socket.go
+++ b/server/socket.go
@@ -94,7 +94,7 @@ func encode(v interface{}) (string, error) {
 	case time.Time:
 		var b []byte
 		if !val.IsZero() {
-			b, _ = val.MarshalText()
+			b, _ = val.Round(time.Second).Local().MarshalText()
 		}
 		s = fmt.Sprintf(`"%s"`, string(b))
 	case time.Duration: