From 8083b4881dd340cadaacb928df002ce3ab883d46 Mon Sep 17 00:00:00 2001 From: Aleksandr Statciuk Date: Wed, 7 Jun 2023 03:37:48 +0300 Subject: [PATCH] Update tv.mail.ru.config.js --- sites/tv.mail.ru/tv.mail.ru.config.js | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/sites/tv.mail.ru/tv.mail.ru.config.js b/sites/tv.mail.ru/tv.mail.ru.config.js index e19b989f..55e843db 100644 --- a/sites/tv.mail.ru/tv.mail.ru.config.js +++ b/sites/tv.mail.ru/tv.mail.ru.config.js @@ -1,11 +1,4 @@ -const dayjs = require('dayjs') -const utc = require('dayjs/plugin/utc') -const timezone = require('dayjs/plugin/timezone') -const customParseFormat = require('dayjs/plugin/customParseFormat') - -dayjs.extend(utc) -dayjs.extend(timezone) -dayjs.extend(customParseFormat) +const { DateTime } = require('luxon') module.exports = { site: 'tv.mail.ru', @@ -22,13 +15,13 @@ module.exports = { const prev = programs[programs.length - 1] let start = parseStart(item, date) if (prev) { - if (start.isBefore(prev.start)) { - start = start.add(1, 'd') + if (start < prev.start) { + start = start.plus({ days: 1 }) date = date.add(1, 'd') } prev.stop = start } - const stop = start.add(1, 'h') + const stop = start.plus({ hours: 1 }) programs.push({ title: item.name, category: parseCategory(item), @@ -44,7 +37,7 @@ module.exports = { function parseStart(item, date) { const dateString = `${date.format('YYYY-MM-DD')} ${item.start}` - return dayjs.tz(dateString, 'YYYY-MM-DD HH:mm', 'Europe/Moscow') + return DateTime.fromFormat(dateString, 'yyyy-MM-dd HH:mm', { zone: 'Europe/Moscow' }).toUTC() } function parseCategory(item) {