From 1d3d9dfbcc02f9188c11bec52cb2e7d82e121ba7 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Wed, 26 Jul 2023 12:24:37 -0700
Subject: [PATCH 1/2] Fix: Cannot read properties of undefined (reading
 'author')

---
 src/renderer/components/data-settings/data-settings.js | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index 877ac05ce998a..a4c8b6d22bb31 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -1035,10 +1035,9 @@ export default defineComponent({
         invidiousAPICall(subscriptionsPayload).then((response) => {
           resolve(response)
         }).catch((err) => {
-          console.error(err)
           const errorMessage = this.$t('Invidious API Error (Click to copy)')
-          showToast(`${errorMessage}: ${err.responseJSON.error}`, 10000, () => {
-            copyToClipboard(err.responseJSON.error)
+          showToast(`${errorMessage}: ${err}`, 10000, () => {
+            copyToClipboard(err)
           })
 
           if (process.env.IS_ELECTRON && this.backendFallback && this.backendPreference === 'invidious') {
@@ -1056,7 +1055,7 @@ export default defineComponent({
         const channel = await getLocalChannel(channelId)
 
         if (channel.alert) {
-          return undefined
+          return []
         }
 
         return {

From 4a86fa1b718b2b01c0c5c1a35c5bb1820b0f4f76 Mon Sep 17 00:00:00 2001
From: ChunkyProgrammer <78101139+ChunkyProgrammer@users.noreply.github.com>
Date: Wed, 26 Jul 2023 18:20:04 -0700
Subject: [PATCH 2/2] fix importing some newpipe subscriptions

only check url, not service_id
---
 src/renderer/components/data-settings/data-settings.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js
index a4c8b6d22bb31..bb2050fc8f40a 100644
--- a/src/renderer/components/data-settings/data-settings.js
+++ b/src/renderer/components/data-settings/data-settings.js
@@ -421,7 +421,7 @@ export default defineComponent({
       }
 
       const newPipeSubscriptions = newPipeData.subscriptions.filter((channel, index) => {
-        return channel.service_id === 0
+        return new URL(channel.url).hostname === 'www.youtube.com'
       })
 
       const subscriptions = []