From 13d73d279844e883421d1bb72ec6a8a516b66a89 Mon Sep 17 00:00:00 2001
From: Svallinn <41585298+Svallinn@users.noreply.github.com>
Date: Fri, 23 Jul 2021 23:17:45 +0100
Subject: [PATCH] Switch out deprecated `yt-comment-scraper` package and bump
 version

Closes #1490
---
 package-lock.json                             | 43 +++++--------------
 package.json                                  |  2 +-
 .../watch-video-comments.js                   |  2 +-
 3 files changed, 12 insertions(+), 35 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d802bbdc..d4b3961f 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3060,6 +3060,14 @@
         "axios": "^0.21.1"
       }
     },
+    "@freetube/yt-comment-scraper": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@freetube/yt-comment-scraper/-/yt-comment-scraper-6.0.0.tgz",
+      "integrity": "sha512-QZbfuuhjT1ZmEUd15CQ9rvBiNfW9BCtciaB06qW9z7xC22ViC9NmRTlwSXTS/a5OxUH8app13O05xgGhZbxnmA==",
+      "requires": {
+        "axios": "^0.21.1"
+      }
+    },
     "@istanbuljs/load-nyc-config": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz",
@@ -9374,7 +9382,8 @@
     "he": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw=="
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "dev": true
     },
     "hosted-git-info": {
       "version": "4.0.2",
@@ -12416,14 +12425,6 @@
       "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-0.10.0.tgz",
       "integrity": "sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA=="
     },
-    "node-html-parser": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-2.2.1.tgz",
-      "integrity": "sha512-Vccqb62t6t7DkMVwqPQgb0NWO+gUMMDm+1X3LzqbtXLqjilCTtUYTlniKk08yuA1zIhEFVzu/dozpqs5KZbRFQ==",
-      "requires": {
-        "he": "1.2.0"
-      }
-    },
     "node-int64": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
@@ -17082,30 +17083,6 @@
         }
       }
     },
-    "yt-comment-scraper": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/yt-comment-scraper/-/yt-comment-scraper-5.0.1.tgz",
-      "integrity": "sha512-FgUD7TuWD8RdleGi+0IiITE7oOfokTldXeawFwQDwYhufGkm6ttIBEmMzuGzorHN/aPinmAKYBttvaZkG4s5Yw==",
-      "requires": {
-        "axios": "^0.21.1",
-        "node-html-parser": "^2.0.2"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.21.1",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz",
-          "integrity": "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==",
-          "requires": {
-            "follow-redirects": "^1.10.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.14.1",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.1.tgz",
-          "integrity": "sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg=="
-        }
-      }
-    },
     "yt-dash-manifest-generator": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/yt-dash-manifest-generator/-/yt-dash-manifest-generator-1.1.0.tgz",
diff --git a/package.json b/package.json
index 81638a61..907a45f4 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "@fortawesome/free-solid-svg-icons": "^5.15.3",
     "@fortawesome/vue-fontawesome": "^2.0.2",
     "@freetube/youtube-chat": "^1.1.1",
+    "@freetube/yt-comment-scraper": "^6.0.0",
     "@silvermine/videojs-quality-selector": "^1.2.5",
     "autolinker": "^3.14.3",
     "bulma-pro": "^0.2.0",
@@ -88,7 +89,6 @@
     "vuex": "^3.6.2",
     "youtube-suggest": "^1.1.2",
     "yt-channel-info": "^2.2.0",
-    "yt-comment-scraper": "^5.0.1",
     "yt-dash-manifest-generator": "1.1.0",
     "yt-trending-scraper": "^2.0.1",
     "ytdl-core": "^4.8.3",
diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.js b/src/renderer/components/watch-video-comments/watch-video-comments.js
index efbe9c9e..b02b6278 100644
--- a/src/renderer/components/watch-video-comments/watch-video-comments.js
+++ b/src/renderer/components/watch-video-comments/watch-video-comments.js
@@ -5,7 +5,7 @@ import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtSelect from '../../components/ft-select/ft-select.vue'
 import FtTimestampCatcher from '../../components/ft-timestamp-catcher/ft-timestamp-catcher.vue'
 import autolinker from 'autolinker'
-import ytcm from 'yt-comment-scraper'
+import ytcm from '@freetube/yt-comment-scraper'
 
 export default Vue.extend({
   name: 'WatchVideoComments',