From cb1cab8241ff2a1d0ecdbe53c39dea88d320ea02 Mon Sep 17 00:00:00 2001
From: Aleksandr Statciuk <github@oiya.xyz>
Date: Sat, 29 Oct 2022 00:58:09 +0300
Subject: [PATCH] Update telsu.fi.config.js

---
 sites/telsu.fi/telsu.fi.config.js | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/sites/telsu.fi/telsu.fi.config.js b/sites/telsu.fi/telsu.fi.config.js
index 74b8281f..475e7e2f 100644
--- a/sites/telsu.fi/telsu.fi.config.js
+++ b/sites/telsu.fi/telsu.fi.config.js
@@ -23,9 +23,11 @@ module.exports = {
       if (prev) {
         if (start.isBefore(prev.start)) {
           start = start.add(1, 'd')
-          stop = stop.add(1, 'd')
         }
         prev.stop = start
+        if (stop.isBefore(prev.stop)) {
+          stop = stop.add(1, 'd')
+        }
       }
       programs.push({
         title: parseTitle($item),
@@ -63,7 +65,7 @@ function parseTitle($item) {
 }
 
 function parseDescription($item) {
-  return $item('.t > div').text().trim()
+  return $item('.t > div').clone().children().remove().end().text().trim()
 }
 
 function parseIcon($item) {
@@ -73,16 +75,16 @@ function parseIcon($item) {
 }
 
 function parseStart($item, date) {
-  const subtitle = $item('.h > h2').text().trim()
-  const [_, HH, mm] = subtitle.match(/ (\d{2})\.(\d{2}) -/) || [null, null, null]
+  const subtitle = $item('.h > h2').clone().children().remove().end().text().trim()
+  const [_, HH, mm] = subtitle.match(/(\d{2})\.(\d{2}) - (\d{2})\.(\d{2})$/) || [null, null, null]
   if (!HH || !mm) return null
 
   return dayjs.tz(`${date.format('YYYY-MM-DD')} ${HH}:${mm}`, 'YYYY-MM-DD HH:mm', 'Europe/Helsinki')
 }
 
 function parseStop($item, date) {
-  const subtitle = $item('.h > h2').text().trim()
-  const [_, HH, mm] = subtitle.match(/ - (\d{2})\.(\d{2})/) || [null, null, null]
+  const subtitle = $item('.h > h2').clone().children().remove().end().text().trim()
+  const [_, HH, mm] = subtitle.match(/ - (\d{2})\.(\d{2})$/) || [null, null, null]
   if (!HH || !mm) return null
 
   return dayjs.tz(`${date.format('YYYY-MM-DD')} ${HH}:${mm}`, 'YYYY-MM-DD HH:mm', 'Europe/Helsinki')