From e2ba9cc7d693417dae8ebcf2468d78951d479a89 Mon Sep 17 00:00:00 2001
From: freearhey <free.arhey@gmail.com>
Date: Fri, 2 Apr 2021 20:33:58 +0300
Subject: [PATCH] Upgraded epg-grabber package

---
 package-lock.json            | 26 +++++++++++++++++++-------
 package.json                 |  2 +-
 sites/tv.yandex.ru.config.js |  9 ++++++---
 3 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index fe1e3aab..b999eade 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7,7 +7,7 @@
       "license": "MIT",
       "dependencies": {
         "dayjs": "^1.10.4",
-        "epg-grabber": "^0.4.1",
+        "epg-grabber": "^0.5.1",
         "glob": "^7.1.6",
         "html-to-text": "^7.0.0",
         "iconv-lite": "^0.4.24",
@@ -365,15 +365,16 @@
       }
     },
     "node_modules/epg-grabber": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.4.1.tgz",
-      "integrity": "sha512-TpNobY5+mImAFfabRuA+edpTFNAZXZQV9Pwh61tNfE9R/fxO0FavRwDxnB8hgn0EpNvKm/kuGXl0AK57rB2+ug==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.5.1.tgz",
+      "integrity": "sha512-Wl8RIRHazHlnQUXyF8hK97IT36mfSkhBwQ3gGuC/5esSc5+hacClB26jTAILypSjHsu175Im5EAo8GtWlJGChA==",
       "dependencies": {
         "axios": "^0.21.1",
         "axios-cookiejar-support": "^1.0.1",
         "commander": "^7.1.0",
         "dayjs": "^1.10.4",
         "glob": "^7.1.6",
+        "lodash.merge": "^4.6.2",
         "tough-cookie": "^4.0.0",
         "xml-js": "^1.6.11"
       },
@@ -766,6 +767,11 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
     "node_modules/lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
@@ -1549,15 +1555,16 @@
       "integrity": "sha512-hCx1oky9PFrJ611mf0ifBLBRW8lUUVRlFolb5gWRfIELabBlbp9xZvrqZLZAs+NxFnbfQoeGd8wDkygjg7U85w=="
     },
     "epg-grabber": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.4.1.tgz",
-      "integrity": "sha512-TpNobY5+mImAFfabRuA+edpTFNAZXZQV9Pwh61tNfE9R/fxO0FavRwDxnB8hgn0EpNvKm/kuGXl0AK57rB2+ug==",
+      "version": "0.5.1",
+      "resolved": "https://registry.npmjs.org/epg-grabber/-/epg-grabber-0.5.1.tgz",
+      "integrity": "sha512-Wl8RIRHazHlnQUXyF8hK97IT36mfSkhBwQ3gGuC/5esSc5+hacClB26jTAILypSjHsu175Im5EAo8GtWlJGChA==",
       "requires": {
         "axios": "^0.21.1",
         "axios-cookiejar-support": "^1.0.1",
         "commander": "^7.1.0",
         "dayjs": "^1.10.4",
         "glob": "^7.1.6",
+        "lodash.merge": "^4.6.2",
         "tough-cookie": "^4.0.0",
         "xml-js": "^1.6.11"
       }
@@ -1839,6 +1846,11 @@
       "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
       "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
+    "lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="
+    },
     "lodash.sortby": {
       "version": "4.7.0",
       "resolved": "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz",
diff --git a/package.json b/package.json
index bbac0c9d..f350c072 100644
--- a/package.json
+++ b/package.json
@@ -8,7 +8,7 @@
   "license": "MIT",
   "dependencies": {
     "dayjs": "^1.10.4",
-    "epg-grabber": "^0.4.1",
+    "epg-grabber": "^0.5.1",
     "glob": "^7.1.6",
     "html-to-text": "^7.0.0",
     "iconv-lite": "^0.4.24",
diff --git a/sites/tv.yandex.ru.config.js b/sites/tv.yandex.ru.config.js
index b9e97429..bc5ce382 100644
--- a/sites/tv.yandex.ru.config.js
+++ b/sites/tv.yandex.ru.config.js
@@ -1,4 +1,3 @@
-const urlParser = require('url')
 const jsdom = require('jsdom')
 const { JSDOM } = jsdom
 
@@ -7,8 +6,12 @@ module.exports = {
   site: 'tv.yandex.ru',
   channels: 'tv.yandex.ru.channels.xml',
   output: '.gh-pages/guides/tv.yandex.ru.guide.xml',
-  cookie:
-    'yandexuid=8747786251615498142; Expires=Tue, 11 Mar 2031 21:29:02 GMT; Domain=yandex.ru; Path=/',
+  request: {
+    headers: {
+      Cookie:
+        'yandexuid=8747786251615498142; Expires=Tue, 11 Mar 2031 21:29:02 GMT; Domain=yandex.ru; Path=/'
+    }
+  },
   url: function ({ date, channel }) {
     const [region, id] = channel.site_id.split('#')
     return `https://tv.yandex.ru/${region}/channel/${id}?date=${date.format('YYYY-MM-DD')}`