From 57246c421df8c90ef70729acb16a072e4a9de035 Mon Sep 17 00:00:00 2001
From: 4gray <fourgray@proton.me>
Date: Sun, 4 Jan 2026 16:25:41 +0100
Subject: [PATCH] fix: timezone handling
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* EPG data is stored with ISO 8601 format including timezone offset
(e.g., 2025-12-26T16:00:00+01:00)
* When displayed, moment(isoString)
parses it correctly and converts to the user's local timezone
automatically
* No settings needed — times always show in the user's
machine timezone
---
 .../epg-list-item/epg-list-item.component.html     |  4 ++--
 .../src/lib/epg-list/epg-list.component.html       |  2 +-
 .../lib/info-overlay/info-overlay.component.html   |  4 ++--
 .../multi-epg/multi-epg-container.component.html   |  2 +-
 libs/ui/pipes/src/lib/moment-date.pipe.ts          | 14 ++++++++++----
 5 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/libs/ui/components/src/lib/epg-list/epg-list-item/epg-list-item.component.html b/libs/ui/components/src/lib/epg-list/epg-list-item/epg-list-item.component.html
index c91b6b63b..2a5af5028 100644
--- a/libs/ui/components/src/lib/epg-list/epg-list-item/epg-list-item.component.html
+++ b/libs/ui/components/src/lib/epg-list/epg-list-item/epg-list-item.component.html
@@ -1,7 +1,7 @@
 <span class="time"
-    >{{ item.start | momentDate: 'YYYYMMDDHHmm ZZ' : 'HH:mm' }}
+    >{{ item.start | momentDate: 'HH:mm' }}
     -
-    {{ item.stop | momentDate: 'YYYYMMDDHHmm ZZ' : 'HH:mm' }}</span
+    {{ item.stop | momentDate: 'HH:mm' }}</span
 >
 @if (timeNow >= item.start && timeNow <= item.stop) {
     <span class="live badge" [matTooltip]="'EPG.LIVE_NOW' | translate"
diff --git a/libs/ui/components/src/lib/epg-list/epg-list.component.html b/libs/ui/components/src/lib/epg-list/epg-list.component.html
index e2fbacf5e..a1ce59b25 100644
--- a/libs/ui/components/src/lib/epg-list/epg-list.component.html
+++ b/libs/ui/components/src/lib/epg-list/epg-list.component.html
@@ -33,7 +33,7 @@
             <mat-icon>chevron_left</mat-icon>
         </button>
         <span class="selected-date">
-            {{ dateToday | momentDate: 'YYYY-MM-DD' : 'MMMM Do, dddd' }}</span
+            {{ dateToday | momentDate: 'MMMM Do, dddd' : 'YYYY-MM-DD' }}</span
         >
         <button
             class="next-day"
diff --git a/libs/ui/components/src/lib/info-overlay/info-overlay.component.html b/libs/ui/components/src/lib/info-overlay/info-overlay.component.html
index 0066246c1..abdd6535b 100644
--- a/libs/ui/components/src/lib/info-overlay/info-overlay.component.html
+++ b/libs/ui/components/src/lib/info-overlay/info-overlay.component.html
@@ -30,9 +30,9 @@
                     }
                     <div class="program-timeline">
                         <div class="timeline-info">
-                            <span class="time-start">{{ start | momentDate: 'YYYYMMDDHHmm ZZ' : 'HH:mm' }}</span>
+                            <span class="time-start">{{ start | momentDate: 'HH:mm' }}</span>
                             <span class="time-separator">—</span>
-                            <span class="time-end">{{ stop | momentDate: 'YYYYMMDDHHmm ZZ' : 'HH:mm' }}</span>
+                            <span class="time-end">{{ stop | momentDate: 'HH:mm' }}</span>
                         </div>
                         <div class="progress-track">
                             <div
diff --git a/libs/ui/components/src/lib/multi-epg/multi-epg-container.component.html b/libs/ui/components/src/lib/multi-epg/multi-epg-container.component.html
index fbc08c92d..cffffdafd 100644
--- a/libs/ui/components/src/lib/multi-epg/multi-epg-container.component.html
+++ b/libs/ui/components/src/lib/multi-epg/multi-epg-container.component.html
@@ -14,7 +14,7 @@
     <mat-icon>chevron_left</mat-icon>
   </button>
   <div class="today-date">
-    {{ today() | momentDate: 'YYYYMMDD' : 'MMMM Do, dddd' }}
+    {{ today() | momentDate: 'MMMM Do, dddd' : 'YYYYMMDD' }}
   </div>
   <button
     [matTooltip]="'EPG.NEXT_DAY' | translate"
diff --git a/libs/ui/pipes/src/lib/moment-date.pipe.ts b/libs/ui/pipes/src/lib/moment-date.pipe.ts
index f40a084a7..ec654a4e7 100644
--- a/libs/ui/pipes/src/lib/moment-date.pipe.ts
+++ b/libs/ui/pipes/src/lib/moment-date.pipe.ts
@@ -2,7 +2,9 @@ import { Pipe, PipeTransform } from '@angular/core';
 import moment from 'moment';
 
 /**
- * Moment.js based pipe to parse and return the provided date based on given params
+ * Moment.js based pipe to parse and return the provided date based on given params.
+ * Auto-detects ISO 8601 format and converts to user's local timezone.
+ * Optionally accepts a format string for non-ISO date strings.
  */
 @Pipe({
     name: 'momentDate',
@@ -11,9 +13,13 @@ import moment from 'moment';
 export class MomentDatePipe implements PipeTransform {
     transform(
         value: string,
-        formatToParse: string,
-        formatToReturn = 'MMMM Do, dddd'
+        formatToReturn = 'MMMM Do, dddd',
+        formatToParse?: string
     ): string {
-        return moment(value, formatToParse).format(formatToReturn);
+        // If formatToParse is provided, use it; otherwise auto-detect (works for ISO 8601)
+        const parsed = formatToParse
+            ? moment(value, formatToParse)
+            : moment(value);
+        return parsed.format(formatToReturn);
     }
 }