From 739dddf74cbe45827808c4ca9ee0e1352c7f12ef Mon Sep 17 00:00:00 2001
From: Mykyta Poturai <mykyta.poturai@tutanota.com>
Date: Thu, 13 Aug 2020 17:26:20 +0300
Subject: [PATCH 01/22] Add caching for popular videos

Also add the button to refresh the cache
---
 src/renderer/store/modules/utils.js    |  9 ++++
 src/renderer/views/Popular/Popular.css |  6 +++
 src/renderer/views/Popular/Popular.js  | 58 ++++++++++++++++++--------
 src/renderer/views/Popular/Popular.vue |  6 +++
 4 files changed, 61 insertions(+), 18 deletions(-)

diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index c92cdba4..d839ae11 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -3,6 +3,7 @@ import FtToastEvents from '../../components/ft-toast/ft-toast-events'
 const state = {
   isSideNavOpen: false,
   sessionSearchHistory: [],
+  popularCache: undefined,
   searchSettings: {
     sortBy: 'relevance',
     time: '',
@@ -42,6 +43,10 @@ const getters = {
     return state.sessionSearchHistory
   },
 
+  getPopularCache () {
+    return state.popularCache
+  },
+
   getSearchSettings () {
     return state.searchSettings
   }
@@ -113,6 +118,10 @@ const mutations = {
     }
   },
 
+  setPopularCache (state, value) {
+    state.popularCache = value
+  },
+
   setSearchSortBy (state, value) {
     state.searchSettings.sortBy = value
   },
diff --git a/src/renderer/views/Popular/Popular.css b/src/renderer/views/Popular/Popular.css
index c6ad6abd..4255d98b 100644
--- a/src/renderer/views/Popular/Popular.css
+++ b/src/renderer/views/Popular/Popular.css
@@ -4,6 +4,12 @@
   margin-bottom: 60px;
 }
 
+.floatingTopButton {
+  position: absolute;
+  top: 70px;
+  right: 10px;
+}
+
 @media only screen and (max-width: 680px) {
   .card {
     width: 90%;
diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
index dc8979d4..bd0f14fb 100644
--- a/src/renderer/views/Popular/Popular.js
+++ b/src/renderer/views/Popular/Popular.js
@@ -2,13 +2,15 @@ import Vue from 'vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
+import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 
 export default Vue.extend({
   name: 'Popular',
   components: {
     'ft-loader': FtLoader,
     'ft-card': FtCard,
-    'ft-element-list': FtElementList
+    'ft-element-list': FtElementList,
+    'ft-icon-button': FtIconButton
   },
   data: function () {
     return {
@@ -16,35 +18,55 @@ export default Vue.extend({
       shownResults: []
     }
   },
+  computed: {
+    popularCache: function () {
+      return this.$store.getters.getPopularCache
+    }
+  },
   mounted: function () {
     this.getTrendingInfo()
   },
   methods: {
-    getTrendingInfo: function () {
-      this.isLoading = true
-
+    refreshTrendingInfo: async function () {
+      await this.fetchTrendingInfo()
+      await this.getTrendingInfo()
+    },
+    fetchTrendingInfo: async function () {
       const searchPayload = {
         resource: 'popular',
         id: '',
         params: {}
       }
 
-      this.$store.dispatch('invidiousAPICall', searchPayload).then((result) => {
-        if (!result) {
-          return
-        }
-
-        console.log(result)
-
-        const returnData = result.filter((item) => {
-          return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
-        })
-
-        this.shownResults = this.shownResults.concat(returnData)
-        this.isLoading = false
-      }).catch((err) => {
+      const result = await this.$store.dispatch('invidiousAPICall', searchPayload).catch((err) => {
         console.log(err)
       })
+
+      if (!result) {
+        return
+      }
+
+      console.log(result)
+
+      const returnData = result.filter((item) => {
+        return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
+      })
+      this.$store.commit('setPopularCache', returnData)
+      return returnData
+    },
+
+    getTrendingInfo: async function () {
+      this.isLoading = true
+      let data = this.popularCache
+      if (!data || data.length < 1) {
+        data = await this.fetchTrendingInfo()
+      }
+      if (!data) {
+        return
+      }
+
+      this.shownResults = this.shownResults.concat(data)
+      this.isLoading = false
     }
   }
 })
diff --git a/src/renderer/views/Popular/Popular.vue b/src/renderer/views/Popular/Popular.vue
index c148cd79..3efba2f8 100644
--- a/src/renderer/views/Popular/Popular.vue
+++ b/src/renderer/views/Popular/Popular.vue
@@ -13,6 +13,12 @@
         :data="shownResults"
       />
     </ft-card>
+    <ft-icon-button
+      icon="sync"
+      class="floatingTopButton"
+      :size="10"
+      @click="refreshTrendingInfo"
+    />
   </div>
 </template>
 

From 5bc2e70e88da155eaed5ac5afdc01e6d0a988e9b Mon Sep 17 00:00:00 2001
From: Mykyta Poturai <mykyta.poturai@tutanota.com>
Date: Tue, 18 Aug 2020 18:51:56 +0300
Subject: [PATCH 02/22] Refactor popular page

---
 src/renderer/store/modules/utils.js    |  2 +-
 src/renderer/views/Popular/Popular.js  | 30 +++++++++-----------------
 src/renderer/views/Popular/Popular.vue |  3 ++-
 3 files changed, 13 insertions(+), 22 deletions(-)

diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index d839ae11..8cd0c57d 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -3,7 +3,7 @@ import FtToastEvents from '../../components/ft-toast/ft-toast-events'
 const state = {
   isSideNavOpen: false,
   sessionSearchHistory: [],
-  popularCache: undefined,
+  popularCache: null,
   searchSettings: {
     sortBy: 'relevance',
     time: '',
diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
index bd0f14fb..cd80eeab 100644
--- a/src/renderer/views/Popular/Popular.js
+++ b/src/renderer/views/Popular/Popular.js
@@ -24,12 +24,14 @@ export default Vue.extend({
     }
   },
   mounted: function () {
-    this.getTrendingInfo()
+    this.shownResults = this.popularCache
+    if (!this.shownResults || this.shownResults.length < 1) {
+      this.fetchTrendingInfo()
+    }
   },
   methods: {
-    refreshTrendingInfo: async function () {
-      await this.fetchTrendingInfo()
-      await this.getTrendingInfo()
+    refreshTrendingInfo: function () {
+      this.fetchTrendingInfo()
     },
     fetchTrendingInfo: async function () {
       const searchPayload = {
@@ -38,35 +40,23 @@ export default Vue.extend({
         params: {}
       }
 
+      this.isLoading = true
       const result = await this.$store.dispatch('invidiousAPICall', searchPayload).catch((err) => {
         console.log(err)
       })
 
       if (!result) {
+        this.isLoading = false
         return
       }
 
       console.log(result)
 
-      const returnData = result.filter((item) => {
+      this.shownResults = result.filter((item) => {
         return item.type === 'video' || item.type === 'shortVideo' || item.type === 'channel' || item.type === 'playlist'
       })
-      this.$store.commit('setPopularCache', returnData)
-      return returnData
-    },
-
-    getTrendingInfo: async function () {
-      this.isLoading = true
-      let data = this.popularCache
-      if (!data || data.length < 1) {
-        data = await this.fetchTrendingInfo()
-      }
-      if (!data) {
-        return
-      }
-
-      this.shownResults = this.shownResults.concat(data)
       this.isLoading = false
+      this.$store.commit('setPopularCache', this.shownResults)
     }
   }
 })
diff --git a/src/renderer/views/Popular/Popular.vue b/src/renderer/views/Popular/Popular.vue
index 3efba2f8..d16346c9 100644
--- a/src/renderer/views/Popular/Popular.vue
+++ b/src/renderer/views/Popular/Popular.vue
@@ -16,7 +16,8 @@
     <ft-icon-button
       icon="sync"
       class="floatingTopButton"
-      :size="10"
+      :size="12"
+      :theme="primary"
       @click="refreshTrendingInfo"
     />
   </div>

From 60a315f360dd3f9a794addacb49a632eec4ff6d5 Mon Sep 17 00:00:00 2001
From: Mykyta Poturai <mykyta.poturai@tutanota.com>
Date: Sat, 22 Aug 2020 23:10:52 +0300
Subject: [PATCH 03/22] Refactor popular page V2

---
 src/renderer/views/Popular/Popular.js  | 7 ++-----
 src/renderer/views/Popular/Popular.vue | 4 ++--
 2 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/src/renderer/views/Popular/Popular.js b/src/renderer/views/Popular/Popular.js
index cd80eeab..e45b4a9c 100644
--- a/src/renderer/views/Popular/Popular.js
+++ b/src/renderer/views/Popular/Popular.js
@@ -26,14 +26,11 @@ export default Vue.extend({
   mounted: function () {
     this.shownResults = this.popularCache
     if (!this.shownResults || this.shownResults.length < 1) {
-      this.fetchTrendingInfo()
+      this.fetchPopularInfo()
     }
   },
   methods: {
-    refreshTrendingInfo: function () {
-      this.fetchTrendingInfo()
-    },
-    fetchTrendingInfo: async function () {
+    fetchPopularInfo: async function () {
       const searchPayload = {
         resource: 'popular',
         id: '',
diff --git a/src/renderer/views/Popular/Popular.vue b/src/renderer/views/Popular/Popular.vue
index d16346c9..b133588f 100644
--- a/src/renderer/views/Popular/Popular.vue
+++ b/src/renderer/views/Popular/Popular.vue
@@ -17,8 +17,8 @@
       icon="sync"
       class="floatingTopButton"
       :size="12"
-      :theme="primary"
-      @click="refreshTrendingInfo"
+      theme="primary"
+      @click="fetchPopularInfo"
     />
   </div>
 </template>

From 69dada2df48e87140d2d5f9b2d7a27d25e6c279a Mon Sep 17 00:00:00 2001
From: Mykyta Poturai <mykyta.poturai@tutanota.com>
Date: Sat, 22 Aug 2020 23:37:09 +0300
Subject: [PATCH 04/22] Add caching for trending videos

---
 src/renderer/store/modules/utils.js      |  9 ++++++
 src/renderer/views/Trending/Trending.css |  6 ++++
 src/renderer/views/Trending/Trending.js  | 37 +++++++++++++++++-------
 src/renderer/views/Trending/Trending.vue |  7 +++++
 4 files changed, 48 insertions(+), 11 deletions(-)

diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 8cd0c57d..c543f5d8 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -4,6 +4,7 @@ const state = {
   isSideNavOpen: false,
   sessionSearchHistory: [],
   popularCache: null,
+  trendingCache: null,
   searchSettings: {
     sortBy: 'relevance',
     time: '',
@@ -47,6 +48,10 @@ const getters = {
     return state.popularCache
   },
 
+  getTrendingCache () {
+    return state.trendingCache
+  },
+
   getSearchSettings () {
     return state.searchSettings
   }
@@ -122,6 +127,10 @@ const mutations = {
     state.popularCache = value
   },
 
+  setTrendingCache (state, value) {
+    state.trendingCache = value
+  },
+
   setSearchSortBy (state, value) {
     state.searchSettings.sortBy = value
   },
diff --git a/src/renderer/views/Trending/Trending.css b/src/renderer/views/Trending/Trending.css
index c6ad6abd..4255d98b 100644
--- a/src/renderer/views/Trending/Trending.css
+++ b/src/renderer/views/Trending/Trending.css
@@ -4,6 +4,12 @@
   margin-bottom: 60px;
 }
 
+.floatingTopButton {
+  position: absolute;
+  top: 70px;
+  right: 10px;
+}
+
 @media only screen and (max-width: 680px) {
   .card {
     width: 90%;
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
index e576ea8c..45023c12 100644
--- a/src/renderer/views/Trending/Trending.js
+++ b/src/renderer/views/Trending/Trending.js
@@ -2,6 +2,7 @@ import Vue from 'vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
+import FtIconButton from '../../components/ft-icon-button/ft-icon-button.vue'
 
 import ytrend from 'yt-trending-scraper'
 
@@ -10,7 +11,8 @@ export default Vue.extend({
   components: {
     'ft-card': FtCard,
     'ft-loader': FtLoader,
-    'ft-element-list': FtElementList
+    'ft-element-list': FtElementList,
+    'ft-icon-button': FtIconButton
   },
   data: function () {
     return {
@@ -30,23 +32,34 @@ export default Vue.extend({
     },
     invidiousInstance: function () {
       return this.$store.getters.getInvidiousInstance
+    },
+    trendingCache () {
+      return this.$store.getters.getTrendingCache
     }
   },
   mounted: function () {
-    if (!this.usingElectron) {
-      this.getVideoInformationInvidious()
+    if (this.trendingCache && this.trendingCache.length > 0) {
+      this.shownResults = this.trendingCache
     } else {
-      switch (this.backendPreference) {
-        case 'local':
-          this.getTrendingInfoLocal()
-          break
-        case 'invidious':
-          this.getTrendingInfoInvidious()
-          break
-      }
+      this.getTrendingInfo()
     }
   },
   methods: {
+    getTrendingInfo () {
+      if (!this.usingElectron) {
+        this.getVideoInformationInvidious()
+      } else {
+        switch (this.backendPreference) {
+          case 'local':
+            this.getTrendingInfoLocal()
+            break
+          case 'invidious':
+            this.getTrendingInfoInvidious()
+            break
+        }
+      }
+    },
+
     getTrendingInfoLocal: function () {
       this.isLoading = true
 
@@ -59,6 +72,7 @@ export default Vue.extend({
 
         this.shownResults = this.shownResults.concat(returnData)
         this.isLoading = false
+        this.$store.commit('setTrendingCache', this.shownResults)
       }).catch((err) => {
         console.log(err)
         const errorMessage = this.$t('Local API Error (Click to copy)')
@@ -102,6 +116,7 @@ export default Vue.extend({
 
         this.shownResults = this.shownResults.concat(returnData)
         this.isLoading = false
+        this.$store.commit('setTrendingCache', this.shownResults)
       }).catch((err) => {
         console.log(err)
         const errorMessage = this.$t('Invidious API Error (Click to copy)')
diff --git a/src/renderer/views/Trending/Trending.vue b/src/renderer/views/Trending/Trending.vue
index 54eef065..eed230d6 100644
--- a/src/renderer/views/Trending/Trending.vue
+++ b/src/renderer/views/Trending/Trending.vue
@@ -13,6 +13,13 @@
         :data="shownResults"
       />
     </ft-card>
+    <ft-icon-button
+      icon="sync"
+      class="floatingTopButton"
+      :size="12"
+      theme="primary"
+      @click="getTrendingInfo"
+    />
   </div>
 </template>
 

From 48ff7cd2a49379e5ae32173b461302e28af1b4c8 Mon Sep 17 00:00:00 2001
From: Luca <hohmann.luca@tutanota.com>
Date: Mon, 24 Aug 2020 17:01:09 +0200
Subject: [PATCH 05/22] Added Japanese, Spanish (Mexico) as languages and fixed
 the non displaying Subscribe translation

---
 src/renderer/components/watch-video-info/watch-video-info.js | 2 +-
 src/renderer/main.js                                         | 2 +-
 static/locales/{es_MX.yaml => es-MX.yaml}                    | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename static/locales/{es_MX.yaml => es-MX.yaml} (100%)

diff --git a/src/renderer/components/watch-video-info/watch-video-info.js b/src/renderer/components/watch-video-info/watch-video-info.js
index fccdd3ed..2ccb2e43 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.js
+++ b/src/renderer/components/watch-video-info/watch-video-info.js
@@ -100,7 +100,7 @@ export default Vue.extend({
     },
 
     subscribedText: function () {
-      return `${this.$t('Subscribe').toUpperCase()} ${this.subscriptionCountText}`
+      return `${this.$t('Channel.Subscribe').toUpperCase()} ${this.subscriptionCountText}`
     },
 
     dateString() {
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 1222c3cb..a98d02be 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -23,7 +23,7 @@ Vue.component('font-awesome-icon', FontAwesomeIcon)
 Vue.use(VueI18n)
 
 // List of locales approved for use
-const activeLocales = ['en-US', 'de-DE', 'fi', 'fr-FR', 'pt-BR', 'pt-PT', 'ru', 'vi', 'zh-CN', 'zh-TW']
+const activeLocales = ['en-US', 'de-DE', 'es-MX', 'fi', 'fr-FR', 'ja', 'pt-BR', 'pt-PT', 'ru', 'vi', 'zh-CN', 'zh-TW']
 const messages = {}
 
 // Take active locales and load respective YAML file
diff --git a/static/locales/es_MX.yaml b/static/locales/es-MX.yaml
similarity index 100%
rename from static/locales/es_MX.yaml
rename to static/locales/es-MX.yaml

From c1ce439399338196d42574456e176382dc8000fc Mon Sep 17 00:00:00 2001
From: Mykyta Poturai <mykyta.poturai@tutanota.com>
Date: Mon, 24 Aug 2020 22:50:03 +0300
Subject: [PATCH 06/22] Improve long list rendering time

Speed up list rendering by wrapping list elements in a lazy container.
Only the first 16 elements are loaded at first. The rest is rendered
after it becomes visible.
---
 package-lock.json                             |  5 +++
 package.json                                  |  1 +
 src/renderer/App.js                           |  3 ++
 .../ft-element-list/ft-element-list.js        |  8 +---
 .../ft-element-list/ft-element-list.vue       | 27 +++-----------
 .../ft-list-lazy-wrapper.css                  |  3 ++
 .../ft-list-lazy-wrapper.js                   | 37 +++++++++++++++++++
 .../ft-list-lazy-wrapper.vue                  | 28 ++++++++++++++
 8 files changed, 85 insertions(+), 27 deletions(-)
 create mode 100644 src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css
 create mode 100644 src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
 create mode 100644 src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue

diff --git a/package-lock.json b/package-lock.json
index 55ff0c4e..a6618763 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18872,6 +18872,11 @@
         "vue-style-loader": "^4.1.0"
       }
     },
+    "vue-observe-visibility": {
+      "version": "0.4.6",
+      "resolved": "https://registry.npmjs.org/vue-observe-visibility/-/vue-observe-visibility-0.4.6.tgz",
+      "integrity": "sha512-xo0CEVdkjSjhJoDdLSvoZoQrw/H2BlzB5jrCBKGZNXN2zdZgMuZ9BKrxXDjNP2AxlcCoKc8OahI3F3r3JGLv2Q=="
+    },
     "vue-router": {
       "version": "3.4.3",
       "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-3.4.3.tgz",
diff --git a/package.json b/package.json
index 07ba7f3b..6d211718 100644
--- a/package.json
+++ b/package.json
@@ -33,6 +33,7 @@
     "vue": "^2.6.12",
     "vue-electron": "^1.0.6",
     "vue-i18n": "^8.21.0",
+    "vue-observe-visibility": "^0.4.6",
     "vue-router": "^3.4.3",
     "vuex": "^3.5.1",
     "xml2json": "^0.12.0",
diff --git a/src/renderer/App.js b/src/renderer/App.js
index c91c064d..609c375a 100644
--- a/src/renderer/App.js
+++ b/src/renderer/App.js
@@ -1,4 +1,5 @@
 import Vue from 'vue'
+import { ObserveVisibility } from 'vue-observe-visibility'
 import TopNav from './components/top-nav/top-nav.vue'
 import SideNav from './components/side-nav/side-nav.vue'
 import FtToast from './components/ft-toast/ft-toast.vue'
@@ -7,6 +8,8 @@ import $ from 'jquery'
 let useElectron
 let shell
 
+Vue.directive('observe-visibility', ObserveVisibility)
+
 if (window && window.process && window.process.type === 'renderer') {
   /* eslint-disable-next-line */
   shell = require('electron').shell
diff --git a/src/renderer/components/ft-element-list/ft-element-list.js b/src/renderer/components/ft-element-list/ft-element-list.js
index c9cab911..744355c1 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.js
+++ b/src/renderer/components/ft-element-list/ft-element-list.js
@@ -1,18 +1,14 @@
 import Vue from 'vue'
 import FtFlexBox from '../ft-flex-box/ft-flex-box.vue'
 import FtAutoGrid from '../ft-auto-grid/ft-auto-grid.vue'
-import FtListVideo from '../ft-list-video/ft-list-video.vue'
-import FtListChannel from '../ft-list-channel/ft-list-channel.vue'
-import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
+import FtListLazyWrapper from '../ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue'
 
 export default Vue.extend({
   name: 'FtElementList',
   components: {
     'ft-flex-box': FtFlexBox,
     'ft-auto-grid': FtAutoGrid,
-    'ft-list-video': FtListVideo,
-    'ft-list-channel': FtListChannel,
-    'ft-list-playlist': FtListPlaylist
+    'ft-list-lazy-wrapper': FtListLazyWrapper
   },
   props: {
     data: {
diff --git a/src/renderer/components/ft-element-list/ft-element-list.vue b/src/renderer/components/ft-element-list/ft-element-list.vue
index 58398c57..c615b3e7 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.vue
+++ b/src/renderer/components/ft-element-list/ft-element-list.vue
@@ -2,28 +2,13 @@
   <ft-auto-grid
     :grid="listType !== 'list'"
   >
-    <template
+    <ft-list-lazy-wrapper
       v-for="(result, index) in data"
-    >
-      <ft-list-channel
-        v-if="result.type === 'channel'"
-        :key="index"
-        appearance="result"
-        :data="result"
-      />
-      <ft-list-video
-        v-if="result.type === 'video' || result.type === 'shortVideo'"
-        :key="index"
-        appearance="result"
-        :data="result"
-      />
-      <ft-list-playlist
-        v-if="result.type === 'playlist'"
-        :key="index"
-        appearance="result"
-        :data="result"
-      />
-    </template>
+      :key="index"
+      appearance="result"
+      :data="result"
+      :first-screen="index < 16"
+    />
   </ft-auto-grid>
 </template>
 
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css
new file mode 100644
index 00000000..d58d0725
--- /dev/null
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css
@@ -0,0 +1,3 @@
+.lazyWrapper {
+  min-height: 264px;
+}
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
new file mode 100644
index 00000000..67c1fdb1
--- /dev/null
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -0,0 +1,37 @@
+import Vue from 'vue'
+import FtListVideo from '../ft-list-video/ft-list-video.vue'
+import FtListChannel from '../ft-list-channel/ft-list-channel.vue'
+import FtListPlaylist from '../ft-list-playlist/ft-list-playlist.vue'
+
+export default Vue.extend({
+  name: 'FtListLazyWrapper',
+  components: {
+    'ft-list-video': FtListVideo,
+    'ft-list-channel': FtListChannel,
+    'ft-list-playlist': FtListPlaylist
+  },
+  props: {
+    data: {
+      type: Object,
+      required: true
+    },
+    appearance: {
+      type: String,
+      required: true
+    },
+    firstScreen: {
+      type: Boolean,
+      required: true
+    }
+  },
+  data: function () {
+    return {
+      visible: this.firstScreen
+    }
+  },
+  methods: {
+    onVisibilityChanged: function (visible) {
+      this.visible = visible
+    }
+  }
+})
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
new file mode 100644
index 00000000..4e83c825
--- /dev/null
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
@@ -0,0 +1,28 @@
+<template>
+  <div
+    v-observe-visibility="firstScreen ? false : {
+      callback: onVisibilityChanged,
+      once: true,
+    }"
+    class="lazyWrapper"
+  >
+    <ft-list-channel
+      v-if="data.type === 'channel' && visible"
+      :appearance="appearance"
+      :data="data"
+    />
+    <ft-list-video
+      v-if="(data.type === 'video' || data.type === 'shortVideo') && visible"
+      :appearance="appearance"
+      :data="data"
+    />
+    <ft-list-playlist
+      v-if="data.type === 'playlist' && visilbe"
+      :appearance="appearance"
+      :data="data"
+    />
+  </div>
+</template>
+
+<script src="./ft-list-lazy-wrapper.js" />
+<style scoped src="./ft-list-lazy-wrapper.css" />

From f7b17adb474a9022b8a8627352b92912f274308c Mon Sep 17 00:00:00 2001
From: Luca <hohmann.luca@tutanota.com>
Date: Mon, 24 Aug 2020 22:13:05 +0200
Subject: [PATCH 07/22] Fixed 3 static strings to use the translations

---
 src/renderer/views/Channel/Channel.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index 68ef0e41..5781b469 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -40,7 +40,7 @@
           </span>
         </div>
         <ft-button
-          label="SUBSCRIBE"
+          :label="$t('Channel.Subscribe')"
           background-color="var(--primary-color)"
           text-color="var(--text-with-main-color)"
           class="subscribeButton"
@@ -78,7 +78,7 @@
             :value="videoSelectValues[0]"
             :select-names="videoSelectNames"
             :select-values="videoSelectValues"
-            placeholder="Sort By"
+            :placeholder="$t('Search Filters.Sort By.Sort By')"
             @change="videoSortBy = $event"
           />
           <ft-select
@@ -87,7 +87,7 @@
             :value="playlistSelectValues[0]"
             :select-names="playlistSelectNames"
             :select-values="playlistSelectValues"
-            placeholder="Sort By"
+            :placeholder="$t('Search Filters.Sort By.Sort By')"
             @change="playlistSortBy = $event"
           />
         </ft-flex-box>

From c44d5f7e62d1007ac6e2ac32c5e24ce1000110a4 Mon Sep 17 00:00:00 2001
From: Luca <hohmann.luca@tutanota.com>
Date: Mon, 24 Aug 2020 23:07:38 +0200
Subject: [PATCH 08/22] Fixed a wrong translation for the history overlay
 saying watched

---
 static/locales/de-DE.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/static/locales/de-DE.yaml b/static/locales/de-DE.yaml
index 221f861d..e0abfe2f 100644
--- a/static/locales/de-DE.yaml
+++ b/static/locales/de-DE.yaml
@@ -292,7 +292,7 @@ Video:
   Views: Aufrufe
   # Context is "X People Watching"
   Watching: aktive Zuschauer
-  Watched: Aufrufe
+  Watched: Gesehen
   # As in a Live Video
   Live: Live
   Live Now: Jetzt Live

From feea541fdbf7d09e8e72d35222d849fe5d2d5a11 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Mon, 24 Aug 2020 17:52:39 -0400
Subject: [PATCH 09/22] Update Dependencies, Fix linter, Hide Refresh Button
 for Trending / Popular

---
 package-lock.json                             | 101 ++++++++----------
 package.json                                  |  14 +--
 src/main/index.js                             |   3 +-
 .../components/ft-prompt/ft-prompt.vue        |   4 +-
 src/renderer/views/Popular/Popular.vue        |   1 +
 src/renderer/views/Trending/Trending.js       |   4 +-
 src/renderer/views/Trending/Trending.vue      |   1 +
 7 files changed, 63 insertions(+), 65 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index a6618763..131405a2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2607,12 +2607,12 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.9.1.tgz",
-      "integrity": "sha512-XIr+Mfv7i4paEdBf0JFdIl9/tVxyj+rlilWIfZ97Be0lZ7hPvUbS5iHt9Glc8kRI53dsr0PcAEudbf8rO2wGgg==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.0.tgz",
+      "integrity": "sha512-Bbeg9JAnSzZ85Y0gpInZscSpifA6SbEgRryaKdP5ZlUjhTKsvZS4GUIE6xAZCjhNTrf4zXXsySo83ZdHL7it0w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "3.9.1",
+        "@typescript-eslint/experimental-utils": "3.10.0",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -2644,45 +2644,45 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.9.1.tgz",
-      "integrity": "sha512-lkiZ8iBBaYoyEKhCkkw4SAeatXyBq9Ece5bZXdLe1LWBUwTszGbmbiqmQbwWA8cSYDnjWXp9eDbXpf9Sn0hLAg==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.0.tgz",
+      "integrity": "sha512-e5ZLSTuXgqC/Gq3QzK2orjlhTZVXzwxDujQmTBOM1NIVBZgW3wiIZjaXuVutk9R4UltFlwC9UD2+bdxsA7yyNg==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.9.1",
-        "@typescript-eslint/typescript-estree": "3.9.1",
+        "@typescript-eslint/types": "3.10.0",
+        "@typescript-eslint/typescript-estree": "3.10.0",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.9.1.tgz",
-      "integrity": "sha512-y5QvPFUn4Vl4qM40lI+pNWhTcOWtpZAJ8pOEQ21fTTW4xTJkRplMjMRje7LYTXqVKKX9GJhcyweMz2+W1J5bMg==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.0.tgz",
+      "integrity": "sha512-iJyf3f2HVwscvJR7ySGMXw2DJgIAPKEz8TeU17XVKzgJRV4/VgCeDFcqLzueRe7iFI2gv+Tln4AV88ZOnsCNXg==",
       "dev": true,
       "requires": {
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.9.1",
-        "@typescript-eslint/types": "3.9.1",
-        "@typescript-eslint/typescript-estree": "3.9.1",
+        "@typescript-eslint/experimental-utils": "3.10.0",
+        "@typescript-eslint/types": "3.10.0",
+        "@typescript-eslint/typescript-estree": "3.10.0",
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.9.1.tgz",
-      "integrity": "sha512-15JcTlNQE1BsYy5NBhctnEhEoctjXOjOK+Q+rk8ugC+WXU9rAcS2BYhoh6X4rOaXJEpIYDl+p7ix+A5U0BqPTw==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.0.tgz",
+      "integrity": "sha512-ktUWSa75heQNwH85GRM7qP/UUrXqx9d6yIdw0iLO9/uE1LILW+i+3+B64dUodUS2WFWLzKTlwfi9giqrODibWg==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.9.1.tgz",
-      "integrity": "sha512-IqM0gfGxOmIKPhiHW/iyAEXwSVqMmR2wJ9uXHNdFpqVvPaQ3dWg302vW127sBpAiqM9SfHhyS40NKLsoMpN2KA==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.0.tgz",
+      "integrity": "sha512-yjuY6rmVHRhcUKgXaSPNVloRueGWpFNhxR5EQLzxXfiFSl1U/+FBqHhbaGwtPPEgCSt61QNhZgiFjWT27bgAyw==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "3.9.1",
-        "@typescript-eslint/visitor-keys": "3.9.1",
+        "@typescript-eslint/types": "3.10.0",
+        "@typescript-eslint/visitor-keys": "3.10.0",
         "debug": "^4.1.1",
         "glob": "^7.1.6",
         "is-glob": "^4.0.1",
@@ -2738,9 +2738,9 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "3.9.1",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.9.1.tgz",
-      "integrity": "sha512-zxdtUjeoSh+prCpogswMwVUJfEFmCOjdzK9rpNjNBfm6EyPt99x3RrJoBOGZO23FCt0WPKUCOL5mb/9D5LjdwQ==",
+      "version": "3.10.0",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.0.tgz",
+      "integrity": "sha512-g4qftk8lWb/rHZe9uEp8oZSvsJhUvR2cfp7F7qE6DyUD2SsovEs8JDQTRP1xHzsD+pERsEpYNqkDgQXW6+ob5A==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
@@ -6059,16 +6059,15 @@
       "dev": true
     },
     "css-loader": {
-      "version": "4.2.1",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.1.tgz",
-      "integrity": "sha512-MoqmF1if7Z0pZIEXA4ZF9PgtCXxWbfzfJM+3p+OYfhcrwcqhaCRb74DSnfzRl7e024xEiCRn5hCvfUbTf2sgFA==",
+      "version": "4.2.2",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-4.2.2.tgz",
+      "integrity": "sha512-omVGsTkZPVwVRpckeUnLshPp12KsmMSLqYxs12+RzM9jRR5Y+Idn/tBffjXRvOE+qW7if24cuceFJqYR5FmGBg==",
       "dev": true,
       "requires": {
         "camelcase": "^6.0.0",
         "cssesc": "^3.0.0",
         "icss-utils": "^4.1.1",
         "loader-utils": "^2.0.0",
-        "normalize-path": "^3.0.0",
         "postcss": "^7.0.32",
         "postcss-modules-extract-imports": "^2.0.0",
         "postcss-modules-local-by-default": "^3.0.3",
@@ -6080,9 +6079,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
@@ -6154,12 +6153,6 @@
             "json5": "^2.1.2"
           }
         },
-        "normalize-path": {
-          "version": "3.0.0",
-          "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-          "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
-          "dev": true
-        },
         "postcss": {
           "version": "7.0.32",
           "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.32.tgz",
@@ -6858,9 +6851,9 @@
       }
     },
     "electron": {
-      "version": "9.2.1",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-9.2.1.tgz",
-      "integrity": "sha512-ZsetaQjXB8+9/EFW1FnfK4ukpkwXCxMEaiKiUZhZ0ZLFlLnFCpe0Bg4vdDf7e4boWGcnlgN1jAJpBw7w0eXuqA==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0.tgz",
+      "integrity": "sha512-0XX/LqYAHHCSbfLjUk9VRDPOeYjDPEzA9i7F50AqpEpFIWR2bp++0S0beRANUpPdkvtBDp+0R6vHV3iXPvuKyA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -13857,9 +13850,9 @@
       }
     },
     "node-abi": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.0.tgz",
-      "integrity": "sha512-rpKqVe24p9GvMTgtqUXdLR1WQJBGVlkYPU10qHKv9/1i9V/k04MmFLVK2WcHBf1WKKY+ZsdvARPi8F4tfJ4opA==",
+      "version": "2.19.1",
+      "resolved": "https://registry.npmjs.org/node-abi/-/node-abi-2.19.1.tgz",
+      "integrity": "sha512-HbtmIuByq44yhAzK7b9j/FelKlHYISKQn0mtvcBrU5QBkhoCMp5bu8Hv5AI34DcKfOAcJBcOEMwLlwO62FFu9A==",
       "dev": true,
       "requires": {
         "semver": "^5.4.1"
@@ -15327,9 +15320,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.0.5.tgz",
-      "integrity": "sha512-7PtVymN48hGcO4fGjybyBSIWDsLU4H4XlvOHfq91pz9kkGlonzwTfYkaIEwiRg/dAJF9YlbsduBAgtYLi+8cFg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.0.tgz",
+      "integrity": "sha512-lz28cCbA1cDFHVuY8vvj6QuqOwIpyIfPUYkSl8AZ/vxH8qBXMMjE2knfLHCrZCmUsK/H1bg1P0tOo0dJkTJHvw==",
       "dev": true
     },
     "prettier-linter-helpers": {
@@ -16402,9 +16395,9 @@
       }
     },
     "sass-loader": {
-      "version": "9.0.3",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-9.0.3.tgz",
-      "integrity": "sha512-fOwsP98ac1VMme+V3+o0HaaMHp8Q/C9P+MUazLFVi3Jl7ORGHQXL1XeRZt3zLSGZQQPC8xE42Y2WptItvGjDQg==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.0.tgz",
+      "integrity": "sha512-DEIrVJIXf2P6jtY3fpJu+uWetALCds2PwRA2iwbpzmHvtFmX5j0aX5Uz+YZSeJpjKrpgqWNKngcVxmwVfqxMow==",
       "dev": true,
       "requires": {
         "klona": "^1.1.2",
@@ -16415,9 +16408,9 @@
       },
       "dependencies": {
         "ajv": {
-          "version": "6.12.3",
-          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.3.tgz",
-          "integrity": "sha512-4K0cK3L1hsqk9xIb2z9vs/XU+PGJZ9PNpJRDS9YLzmNdX6jmVPfamLvTJr0aDAusnHyCHO6MjzlkAsgtqp9teA==",
+          "version": "6.12.4",
+          "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.4.tgz",
+          "integrity": "sha512-eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ==",
           "dev": true,
           "requires": {
             "fast-deep-equal": "^3.1.1",
diff --git a/package.json b/package.json
index 6d211718..74b9df25 100644
--- a/package.json
+++ b/package.json
@@ -55,15 +55,15 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-typescript": "^7.10.4",
-    "@typescript-eslint/eslint-plugin": "^3.9.1",
-    "@typescript-eslint/parser": "^3.9.1",
+    "@typescript-eslint/eslint-plugin": "^3.10.0",
+    "@typescript-eslint/parser": "^3.10.0",
     "acorn": "^8.0.1",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "copy-webpack-plugin": "^6.0.3",
-    "css-loader": "^4.2.1",
+    "css-loader": "^4.2.2",
     "devtron": "^1.4.0",
-    "electron": "^9.2.1",
+    "electron": "^10.0.0",
     "electron-builder": "^22.8.0",
     "electron-builder-squirrel-windows": "^22.8.1",
     "electron-debug": "^3.1.0",
@@ -82,12 +82,12 @@
     "html-webpack-plugin": "^4.3.0",
     "jest": "^26.4.2",
     "mini-css-extract-plugin": "^0.10.0",
-    "node-abi": "^2.19.0",
+    "node-abi": "^2.19.1",
     "node-loader": "^1.0.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.0.5",
+    "prettier": "^2.1.0",
     "sass": "^1.26.10",
-    "sass-loader": "^9.0.3",
+    "sass-loader": "^10.0.0",
     "style-loader": "^1.2.1",
     "tree-kill": "1.2.2",
     "typescript": "^4.0.2",
diff --git a/src/main/index.js b/src/main/index.js
index 94070652..1227a4a3 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -74,7 +74,8 @@ function createWindow () {
       nodeIntegration: true,
       nodeIntegrationInWorker: false,
       webSecurity: false,
-      backgroundThrottling: false
+      backgroundThrottling: false,
+      enableRemoteModule: true
     },
     show: false
   })
diff --git a/src/renderer/components/ft-prompt/ft-prompt.vue b/src/renderer/components/ft-prompt/ft-prompt.vue
index 62d88ac0..1c2830fd 100644
--- a/src/renderer/components/ft-prompt/ft-prompt.vue
+++ b/src/renderer/components/ft-prompt/ft-prompt.vue
@@ -5,7 +5,9 @@
   >
     <ft-card class="promptCard">
       <slot>
-        <h2 class="center">{{ label }}</h2>
+        <h2 class="center">
+          {{ label }}
+        </h2>
         <ft-flex-box>
           <ft-button
             v-for="(option, index) in optionNames"
diff --git a/src/renderer/views/Popular/Popular.vue b/src/renderer/views/Popular/Popular.vue
index b133588f..6e6172c3 100644
--- a/src/renderer/views/Popular/Popular.vue
+++ b/src/renderer/views/Popular/Popular.vue
@@ -14,6 +14,7 @@
       />
     </ft-card>
     <ft-icon-button
+      v-if="!isLoading"
       icon="sync"
       class="floatingTopButton"
       :size="12"
diff --git a/src/renderer/views/Trending/Trending.js b/src/renderer/views/Trending/Trending.js
index 45023c12..77b125d4 100644
--- a/src/renderer/views/Trending/Trending.js
+++ b/src/renderer/views/Trending/Trending.js
@@ -70,7 +70,7 @@ export default Vue.extend({
           return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
         })
 
-        this.shownResults = this.shownResults.concat(returnData)
+        this.shownResults = returnData
         this.isLoading = false
         this.$store.commit('setTrendingCache', this.shownResults)
       }).catch((err) => {
@@ -114,7 +114,7 @@ export default Vue.extend({
           return item.type === 'video' || item.type === 'channel' || item.type === 'playlist'
         })
 
-        this.shownResults = this.shownResults.concat(returnData)
+        this.shownResults = returnData
         this.isLoading = false
         this.$store.commit('setTrendingCache', this.shownResults)
       }).catch((err) => {
diff --git a/src/renderer/views/Trending/Trending.vue b/src/renderer/views/Trending/Trending.vue
index eed230d6..5ad01e88 100644
--- a/src/renderer/views/Trending/Trending.vue
+++ b/src/renderer/views/Trending/Trending.vue
@@ -14,6 +14,7 @@
       />
     </ft-card>
     <ft-icon-button
+      v-if="!isLoading"
       icon="sync"
       class="floatingTopButton"
       :size="12"

From 0262cbfb5479ef7305b74bbc0d541a0f6badab93 Mon Sep 17 00:00:00 2001
From: stecorb <stecorb@protonmail.com>
Date: Tue, 25 Aug 2020 00:04:59 +0200
Subject: [PATCH 10/22] fix undesired search suggestions popup

---
 src/renderer/components/top-nav/top-nav.js | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/renderer/components/top-nav/top-nav.js b/src/renderer/components/top-nav/top-nav.js
index 0b60b178..e95cd834 100644
--- a/src/renderer/components/top-nav/top-nav.js
+++ b/src/renderer/components/top-nav/top-nav.js
@@ -78,6 +78,9 @@ export default Vue.extend({
         const searchContainer = $('.searchContainer').get(0)
         searchContainer.blur()
         searchContainer.style.display = 'none'
+      } else {
+        const searchInput = $('.searchInput input').get(0)
+        searchInput.blur()
       }
 
       this.$store.dispatch('getVideoIdFromUrl', query).then((result) => {

From 4a6372b6ac549d324eef3b611edaae469fd7293b Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Mon, 24 Aug 2020 19:12:38 -0400
Subject: [PATCH 11/22] Fix Typo in lazy loading logic

---
 .../components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
index 4e83c825..40fc33d2 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
@@ -17,7 +17,7 @@
       :data="data"
     />
     <ft-list-playlist
-      v-if="data.type === 'playlist' && visilbe"
+      v-if="data.type === 'playlist' && visible"
       :appearance="appearance"
       :data="data"
     />

From 87294698ad5e7235c2c3597dd33976301390b4e9 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Mon, 24 Aug 2020 21:53:02 -0400
Subject: [PATCH 12/22] Add another check for duration in a search

---
 src/renderer/views/Search/Search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index 96540404..e181d0af 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -138,7 +138,7 @@ export default Vue.extend({
             if (video.uploaded_at !== null) {
               publishDate = ytTrendScraper.calculate_published(video.uploaded_at, Date.now())
             }
-            if (video.duration !== null) {
+            if (video.duration !== null && video.duration !== '') {
               videoDuration = ytTrendScraper.calculate_length_in_seconds(video.duration)
             }
             returnDataInvidious.push(

From 781e971357b1f6463a6e80755844e2bae3ef9c1d Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Tue, 25 Aug 2020 10:18:14 -0400
Subject: [PATCH 13/22] Fix issues with playlists and fix issue with leaving
 watch page from an invalid id

---
 src/renderer/components/ft-list-video/ft-list-video.js |  3 +++
 src/renderer/main.js                                   | 10 ++--------
 src/renderer/views/Playlist/Playlist.js                |  8 +++++++-
 src/renderer/views/Watch/Watch.js                      |  3 +--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/renderer/components/ft-list-video/ft-list-video.js b/src/renderer/components/ft-list-video/ft-list-video.js
index 8f38e1b0..d1117955 100644
--- a/src/renderer/components/ft-list-video/ft-list-video.js
+++ b/src/renderer/components/ft-list-video/ft-list-video.js
@@ -202,6 +202,9 @@ export default Vue.extend({
 
     // For Invidious data, as duration is sent in seconds
     calculateVideoDuration: function (lengthSeconds) {
+      if (typeof lengthSeconds === 'string') {
+        return lengthSeconds
+      }
       let durationText = ''
       let time = lengthSeconds
       let hours = 0
diff --git a/src/renderer/main.js b/src/renderer/main.js
index a98d02be..45ce297b 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -25,22 +25,16 @@ Vue.use(VueI18n)
 // List of locales approved for use
 const activeLocales = ['en-US', 'de-DE', 'es-MX', 'fi', 'fr-FR', 'ja', 'pt-BR', 'pt-PT', 'ru', 'vi', 'zh-CN', 'zh-TW']
 const messages = {}
+const fileLocation = isDev ? 'static/locales/' : `${__dirname}/static/locales/`
 
 // Take active locales and load respective YAML file
 activeLocales.forEach((locale) => {
   try {
     // File location when running in dev
-    const doc = yaml.safeLoad(fs.readFileSync(`static/locales/${locale}.yaml`))
+    const doc = yaml.safeLoad(fs.readFileSync(`${fileLocation}${locale}.yaml`))
     messages[locale] = doc
   } catch (e) {
     console.log(e)
-    try {
-      // File location when compiled
-      const doc = yaml.safeLoad(fs.readFileSync(`${__dirname}/static/locales/${locale}.yaml`))
-      messages[locale] = doc
-    } catch (e) {
-      console.log(e)
-    }
   }
 })
 
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 7a96add1..4cb4b6c3 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -92,7 +92,13 @@ export default Vue.extend({
           infoSource: 'local'
         }
 
-        this.playlistItems = result.items
+        this.playlistItems = result.items.map((video) => {
+          video.videoId = video.id
+          video.lengthSeconds = video.duration
+          video.author = video.author.name
+
+          return video
+        })
 
         this.isLoading = false
       }).catch((err) => {
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 9c4bac09..0ec03dc0 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -700,9 +700,8 @@ export default Vue.extend({
     if (this.rememberHistory && !this.isLoading && !this.isLive) {
       const player = this.$refs.videoPlayer.player
 
-      if (typeof player !== 'undefined' && this.saveWatchedProgress) {
+      if (player !== null && this.saveWatchedProgress) {
         const currentTime = this.$refs.videoPlayer.player.currentTime()
-        console.log(currentTime)
         const payload = {
           videoId: this.videoId,
           watchProgress: currentTime

From 4dba586e0963c3f7ef24acfa9a456f96fcba4e2a Mon Sep 17 00:00:00 2001
From: Mykyta Poturai <mykyta.poturai@tutanota.com>
Date: Tue, 25 Aug 2020 21:13:25 +0300
Subject: [PATCH 14/22] Fix lazy wrapper's height in list mode

---
 src/renderer/components/ft-element-list/ft-element-list.vue | 1 +
 .../ft-list-lazy-wrapper/ft-list-lazy-wrapper.css           | 6 +++++-
 .../components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js | 4 ++++
 .../ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue           | 5 ++++-
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/renderer/components/ft-element-list/ft-element-list.vue b/src/renderer/components/ft-element-list/ft-element-list.vue
index c615b3e7..b4b000ec 100644
--- a/src/renderer/components/ft-element-list/ft-element-list.vue
+++ b/src/renderer/components/ft-element-list/ft-element-list.vue
@@ -8,6 +8,7 @@
       appearance="result"
       :data="result"
       :first-screen="index < 16"
+      :layout="listType"
     />
   </ft-auto-grid>
 </template>
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css
index d58d0725..95b1c7c7 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.css
@@ -1,3 +1,7 @@
-.lazyWrapper {
+.grid {
   min-height: 264px;
 }
+
+.list {
+  min-height: 131px;
+}
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
index 67c1fdb1..5ff6c2f7 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js
@@ -22,6 +22,10 @@ export default Vue.extend({
     firstScreen: {
       type: Boolean,
       required: true
+    },
+    layout: {
+      type: String,
+      default: 'grid'
     }
   },
   data: function () {
diff --git a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
index 40fc33d2..e49915e2 100644
--- a/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
+++ b/src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.vue
@@ -4,7 +4,10 @@
       callback: onVisibilityChanged,
       once: true,
     }"
-    class="lazyWrapper"
+    :class="{
+      grid: layout === 'grid',
+      list: layout === 'list'
+    }"
   >
     <ft-list-channel
       v-if="data.type === 'channel' && visible"

From e1f484d9b8881577d3888a9904d95549a2802191 Mon Sep 17 00:00:00 2001
From: Luca <hohmann.luca@tutanota.com>
Date: Wed, 26 Aug 2020 21:52:12 +0200
Subject: [PATCH 15/22] Fix for missing storyboards in dev mode

---
 src/renderer/views/Watch/Watch.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 0ec03dc0..cd5bd6a0 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -653,11 +653,14 @@ export default Vue.extend({
         if (this.isDev) {
           fileLocation = `storyboards/${this.videoId}.vtt`
           uriSchema = fileLocation
+          // if the location does not exist, writeFileSync will not create the directory, so we have to do that manually
+          if (!fs.existsSync('storyboards/')) {
+            fs.mkdirSync('storyboards/')
+          }
         } else {
           fileLocation = `${userData}/storyboards/${this.videoId}.vtt`
           uriSchema = `file://${fileLocation}`
         }
-
         fs.writeFileSync(fileLocation, results)
 
         this.videoStoryboardSrc = uriSchema

From 029a0bc08e71495f738c94052f5187732f1672f5 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Wed, 26 Aug 2020 16:45:20 -0400
Subject: [PATCH 16/22] Test if this fixes subtitles from sometimes not showing
 up.

---
 src/renderer/views/Watch/Watch.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 0ec03dc0..d966ffae 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -217,7 +217,7 @@ export default Vue.extend({
 
       this.$store
         .dispatch('ytGetVideoInformation', this.videoId)
-        .then(result => {
+        .then(async result => {
           console.log(result)
           this.videoTitle = result.videoDetails.title
           this.videoViewCount = parseInt(
@@ -327,7 +327,7 @@ export default Vue.extend({
               .captionTracks
 
           if (typeof captionTracks !== 'undefined') {
-            this.createCaptionUrls(captionTracks)
+            await this.createCaptionUrls(captionTracks)
           }
 
           this.isLoading = false

From 3b4cf386a8ff80a3e1fa1de8d56c6c580713833a Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Wed, 26 Aug 2020 17:06:42 -0400
Subject: [PATCH 17/22] Another potential fix for subtitles not showing up

---
 src/renderer/components/ft-video-player/ft-video-player.js | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/src/renderer/components/ft-video-player/ft-video-player.js b/src/renderer/components/ft-video-player/ft-video-player.js
index ccea821a..3fabd888 100644
--- a/src/renderer/components/ft-video-player/ft-video-player.js
+++ b/src/renderer/components/ft-video-player/ft-video-player.js
@@ -193,6 +193,11 @@ export default Vue.extend({
   watch: {
     sourceList: function () {
       this.determineFormatType()
+    },
+    captionList: function () {
+      this.player.caption({
+        data: this.captionList
+      })
     }
   },
   mounted: function () {

From 80b60f6d3221a57dca6303e0bf924d7d7610fcf9 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Wed, 26 Aug 2020 17:21:44 -0400
Subject: [PATCH 18/22] Run caption logic earlier to avoid subtitles from not
 showing up.

---
 src/renderer/views/Watch/Watch.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index d95a6817..813ba43c 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -241,6 +241,15 @@ export default Vue.extend({
           this.videoDislikeCount = result.videoDetails.dislikes
           this.isLive = result.player_response.videoDetails.isLiveContent
 
+          const captionTracks =
+            result.player_response.captions &&
+            result.player_response.captions.playerCaptionsTracklistRenderer
+              .captionTracks
+
+          if (typeof captionTracks !== 'undefined') {
+            await this.createCaptionUrls(captionTracks)
+          }
+
           if (this.videoDislikeCount === null) {
             this.videoDislikeCount = 0
           }
@@ -321,15 +330,6 @@ export default Vue.extend({
             this.createLocalStoryboardUrls(templateUrl)
           }
 
-          const captionTracks =
-            result.player_response.captions &&
-            result.player_response.captions.playerCaptionsTracklistRenderer
-              .captionTracks
-
-          if (typeof captionTracks !== 'undefined') {
-            await this.createCaptionUrls(captionTracks)
-          }
-
           this.isLoading = false
         })
         .catch(err => {

From 160eae91c5c5c758d89c74266617c82ae095829e Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Thu, 27 Aug 2020 17:40:01 -0400
Subject: [PATCH 19/22] Fix playlist user links, fix mini playlist card in
 watch page.  Update dependencies.

---
 package.json                                     | 16 ++++++++--------
 .../watch-video-playlist/watch-video-playlist.js | 16 +++++++++++++++-
 src/renderer/store/modules/ytdl.js               | 10 ++++------
 src/renderer/views/Playlist/Playlist.js          | 11 +++++++++--
 src/renderer/views/Watch/Watch.js                |  2 +-
 5 files changed, 37 insertions(+), 18 deletions(-)

diff --git a/package.json b/package.json
index 74b9df25..67df45f2 100644
--- a/package.json
+++ b/package.json
@@ -41,7 +41,7 @@
     "youtube-comments-fetch": "^1.0.1",
     "youtube-comments-task": "^1.3.15",
     "youtube-suggest": "^1.1.0",
-    "yt-channel-info": "^1.0.3",
+    "yt-channel-info": "^1.1.0",
     "yt-trending-scraper": "^1.0.3",
     "yt-xml2vtt": "^1.1.2",
     "ytdl-core": "^3.2.2",
@@ -55,19 +55,19 @@
     "@babel/plugin-proposal-object-rest-spread": "^7.11.0",
     "@babel/preset-env": "^7.11.0",
     "@babel/preset-typescript": "^7.10.4",
-    "@typescript-eslint/eslint-plugin": "^3.10.0",
-    "@typescript-eslint/parser": "^3.10.0",
+    "@typescript-eslint/eslint-plugin": "^3.10.1",
+    "@typescript-eslint/parser": "^3.10.1",
     "acorn": "^8.0.1",
     "babel-eslint": "^10.1.0",
     "babel-loader": "^8.1.0",
     "copy-webpack-plugin": "^6.0.3",
     "css-loader": "^4.2.2",
     "devtron": "^1.4.0",
-    "electron": "^10.0.0",
+    "electron": "^10.0.1",
     "electron-builder": "^22.8.0",
     "electron-builder-squirrel-windows": "^22.8.1",
     "electron-debug": "^3.1.0",
-    "electron-rebuild": "^2.0.0",
+    "electron-rebuild": "^2.0.1",
     "eslint": "^7.7.0",
     "eslint-config-prettier": "^6.11.0",
     "eslint-config-standard": "^14.1.1",
@@ -81,13 +81,13 @@
     "file-loader": "^6.0.0",
     "html-webpack-plugin": "^4.3.0",
     "jest": "^26.4.2",
-    "mini-css-extract-plugin": "^0.10.0",
+    "mini-css-extract-plugin": "^0.11.0",
     "node-abi": "^2.19.1",
     "node-loader": "^1.0.1",
     "npm-run-all": "^4.1.5",
-    "prettier": "^2.1.0",
+    "prettier": "^2.1.1",
     "sass": "^1.26.10",
-    "sass-loader": "^10.0.0",
+    "sass-loader": "^10.0.1",
     "style-loader": "^1.2.1",
     "tree-kill": "1.2.2",
     "typescript": "^4.0.2",
diff --git a/src/renderer/components/watch-video-playlist/watch-video-playlist.js b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
index 87de5ec6..886ed972 100644
--- a/src/renderer/components/watch-video-playlist/watch-video-playlist.js
+++ b/src/renderer/components/watch-video-playlist/watch-video-playlist.js
@@ -270,7 +270,21 @@ export default Vue.extend({
         this.channelThumbnail = result.author.avatar
         this.channelId = result.author.id
 
-        this.playlistItems = result.items
+        this.playlistItems = result.items.map((video) => {
+          if (video.author.name !== null) {
+            const channelName = video.author.name
+            const channelId = video.author.ref.replace(/https:\/\/(www\.)?youtube\.com\/(user|channel)\//g, '')
+            video.author = channelName
+            video.authorId = channelId
+          } else {
+            video.author = ''
+            video.authorId = ''
+          }
+          video.videoId = video.id
+          video.lengthSeconds = video.duration
+          return video
+        })
+
         this.isLoading = false
       }).catch((err) => {
         console.log(err)
diff --git a/src/renderer/store/modules/ytdl.js b/src/renderer/store/modules/ytdl.js
index 544c66ad..79b4103b 100644
--- a/src/renderer/store/modules/ytdl.js
+++ b/src/renderer/store/modules/ytdl.js
@@ -132,12 +132,10 @@ const actions = {
   ytGetVideoInformation ({}, videoId) {
     return new Promise((resolve, reject) => {
       console.log('Getting video info please wait...')
-      ytdl.getInfo(videoId).then((result, err) => {
-        if (err) {
-          reject(err)
-        } else {
-          resolve(result)
-        }
+      ytdl.getInfo(videoId).then((result) => {
+        resolve(result)
+      }).catch((err) => {
+        reject(err)
       })
     })
   }
diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js
index 4cb4b6c3..54c9983d 100644
--- a/src/renderer/views/Playlist/Playlist.js
+++ b/src/renderer/views/Playlist/Playlist.js
@@ -93,10 +93,17 @@ export default Vue.extend({
         }
 
         this.playlistItems = result.items.map((video) => {
+          if (video.author.name !== null) {
+            const channelName = video.author.name
+            const channelId = video.author.ref.replace(/https:\/\/(www\.)?youtube\.com\/(user|channel)\//g, '')
+            video.author = channelName
+            video.authorId = channelId
+          } else {
+            video.author = ''
+            video.authorId = ''
+          }
           video.videoId = video.id
           video.lengthSeconds = video.duration
-          video.author = video.author.name
-
           return video
         })
 
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 813ba43c..348db186 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -342,7 +342,7 @@ export default Vue.extend({
             }
           })
           console.log(err)
-          if (!this.usingElectron || (this.backendPreference === 'local' && this.backendFallback)) {
+          if (!this.usingElectron || (this.backendPreference === 'local' && this.backendFallback && !err.includes('private'))) {
             this.showToast({
               message: this.$t('Falling back to Invidious API')
             })

From d4c4c83f1e5c407efb9316bd4adcba2e87b4cb50 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Thu, 27 Aug 2020 22:44:09 -0400
Subject: [PATCH 20/22] Fix lock file

---
 package-lock.json | 521 +++++++++++++++++++++++++++++-----------------
 1 file changed, 330 insertions(+), 191 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 131405a2..ad650fb1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -2258,6 +2258,58 @@
         }
       }
     },
+    "@malept/cross-spawn-promise": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@malept/cross-spawn-promise/-/cross-spawn-promise-1.1.0.tgz",
+      "integrity": "sha512-GeIK5rfU1Yd7BZJQPTGZMMmcZy5nhRToPXZcjaDwQDRSewdhp648GT2E4dh+L7+Io7AOW6WQ+GR44QSzja4qxg==",
+      "dev": true,
+      "requires": {
+        "cross-spawn": "^7.0.1"
+      },
+      "dependencies": {
+        "cross-spawn": {
+          "version": "7.0.3",
+          "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz",
+          "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==",
+          "dev": true,
+          "requires": {
+            "path-key": "^3.1.0",
+            "shebang-command": "^2.0.0",
+            "which": "^2.0.1"
+          }
+        },
+        "path-key": {
+          "version": "3.1.1",
+          "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+          "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+          "dev": true
+        },
+        "shebang-command": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz",
+          "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==",
+          "dev": true,
+          "requires": {
+            "shebang-regex": "^3.0.0"
+          }
+        },
+        "shebang-regex": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz",
+          "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==",
+          "dev": true
+        },
+        "which": {
+          "version": "2.0.2",
+          "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
+          "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
+          "dev": true,
+          "requires": {
+            "isexe": "^2.0.0"
+          }
+        }
+      }
+    },
     "@nodelib/fs.scandir": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.3.tgz",
@@ -2607,12 +2659,12 @@
       "dev": true
     },
     "@typescript-eslint/eslint-plugin": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.0.tgz",
-      "integrity": "sha512-Bbeg9JAnSzZ85Y0gpInZscSpifA6SbEgRryaKdP5ZlUjhTKsvZS4GUIE6xAZCjhNTrf4zXXsySo83ZdHL7it0w==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-3.10.1.tgz",
+      "integrity": "sha512-PQg0emRtzZFWq6PxBcdxRH3QIQiyFO3WCVpRL3fgj5oQS3CDs3AeAKfv4DxNhzn8ITdNJGJ4D3Qw8eAJf3lXeQ==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/experimental-utils": "3.10.0",
+        "@typescript-eslint/experimental-utils": "3.10.1",
         "debug": "^4.1.1",
         "functional-red-black-tree": "^1.0.1",
         "regexpp": "^3.0.0",
@@ -2644,45 +2696,45 @@
       }
     },
     "@typescript-eslint/experimental-utils": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.0.tgz",
-      "integrity": "sha512-e5ZLSTuXgqC/Gq3QzK2orjlhTZVXzwxDujQmTBOM1NIVBZgW3wiIZjaXuVutk9R4UltFlwC9UD2+bdxsA7yyNg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-3.10.1.tgz",
+      "integrity": "sha512-DewqIgscDzmAfd5nOGe4zm6Bl7PKtMG2Ad0KG8CUZAHlXfAKTF9Ol5PXhiMh39yRL2ChRH1cuuUGOcVyyrhQIw==",
       "dev": true,
       "requires": {
         "@types/json-schema": "^7.0.3",
-        "@typescript-eslint/types": "3.10.0",
-        "@typescript-eslint/typescript-estree": "3.10.0",
+        "@typescript-eslint/types": "3.10.1",
+        "@typescript-eslint/typescript-estree": "3.10.1",
         "eslint-scope": "^5.0.0",
         "eslint-utils": "^2.0.0"
       }
     },
     "@typescript-eslint/parser": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.0.tgz",
-      "integrity": "sha512-iJyf3f2HVwscvJR7ySGMXw2DJgIAPKEz8TeU17XVKzgJRV4/VgCeDFcqLzueRe7iFI2gv+Tln4AV88ZOnsCNXg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-3.10.1.tgz",
+      "integrity": "sha512-Ug1RcWcrJP02hmtaXVS3axPPTTPnZjupqhgj+NnZ6BCkwSImWk/283347+x9wN+lqOdK9Eo3vsyiyDHgsmiEJw==",
       "dev": true,
       "requires": {
         "@types/eslint-visitor-keys": "^1.0.0",
-        "@typescript-eslint/experimental-utils": "3.10.0",
-        "@typescript-eslint/types": "3.10.0",
-        "@typescript-eslint/typescript-estree": "3.10.0",
+        "@typescript-eslint/experimental-utils": "3.10.1",
+        "@typescript-eslint/types": "3.10.1",
+        "@typescript-eslint/typescript-estree": "3.10.1",
         "eslint-visitor-keys": "^1.1.0"
       }
     },
     "@typescript-eslint/types": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.0.tgz",
-      "integrity": "sha512-ktUWSa75heQNwH85GRM7qP/UUrXqx9d6yIdw0iLO9/uE1LILW+i+3+B64dUodUS2WFWLzKTlwfi9giqrODibWg==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-3.10.1.tgz",
+      "integrity": "sha512-+3+FCUJIahE9q0lDi1WleYzjCwJs5hIsbugIgnbB+dSCYUxl8L6PwmsyOPFZde2hc1DlTo/xnkOgiTLSyAbHiQ==",
       "dev": true
     },
     "@typescript-eslint/typescript-estree": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.0.tgz",
-      "integrity": "sha512-yjuY6rmVHRhcUKgXaSPNVloRueGWpFNhxR5EQLzxXfiFSl1U/+FBqHhbaGwtPPEgCSt61QNhZgiFjWT27bgAyw==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-3.10.1.tgz",
+      "integrity": "sha512-QbcXOuq6WYvnB3XPsZpIwztBoquEYLXh2MtwVU+kO8jgYCiv4G5xrSP/1wg4tkvrEE+esZVquIPX/dxPlePk1w==",
       "dev": true,
       "requires": {
-        "@typescript-eslint/types": "3.10.0",
-        "@typescript-eslint/visitor-keys": "3.10.0",
+        "@typescript-eslint/types": "3.10.1",
+        "@typescript-eslint/visitor-keys": "3.10.1",
         "debug": "^4.1.1",
         "glob": "^7.1.6",
         "is-glob": "^4.0.1",
@@ -2738,9 +2790,9 @@
       }
     },
     "@typescript-eslint/visitor-keys": {
-      "version": "3.10.0",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.0.tgz",
-      "integrity": "sha512-g4qftk8lWb/rHZe9uEp8oZSvsJhUvR2cfp7F7qE6DyUD2SsovEs8JDQTRP1xHzsD+pERsEpYNqkDgQXW6+ob5A==",
+      "version": "3.10.1",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-3.10.1.tgz",
+      "integrity": "sha512-9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ==",
       "dev": true,
       "requires": {
         "eslint-visitor-keys": "^1.1.0"
@@ -5245,12 +5297,12 @@
       "dev": true
     },
     "cli-cursor": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
-      "integrity": "sha1-s12sN2R5+sw+lHR9QdDQ9SOP/LU=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-3.1.0.tgz",
+      "integrity": "sha512-I/zHAwsKf9FqGoXM4WWRACob9+SNukZTd94DWF57E4toouRulbCxcUh6RKUEOQlYTHJnzkPMySvPNaaSLNfLZw==",
       "dev": true,
       "requires": {
-        "restore-cursor": "^2.0.0"
+        "restore-cursor": "^3.1.0"
       }
     },
     "cli-spinners": {
@@ -6851,9 +6903,9 @@
       }
     },
     "electron": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/electron/-/electron-10.0.0.tgz",
-      "integrity": "sha512-0XX/LqYAHHCSbfLjUk9VRDPOeYjDPEzA9i7F50AqpEpFIWR2bp++0S0beRANUpPdkvtBDp+0R6vHV3iXPvuKyA==",
+      "version": "10.1.0",
+      "resolved": "https://registry.npmjs.org/electron/-/electron-10.1.0.tgz",
+      "integrity": "sha512-DyS6WhQ59+ZXQsI1EkpsYkOXFt0Xbp+mbxPTJS9A7O21r3JDzaTC+1Jxz7g6J+Sbi9Y7UFdRs0tn/vqhHJx2gA==",
       "dev": true,
       "requires": {
         "@electron/get": "^1.0.1",
@@ -7376,33 +7428,22 @@
       }
     },
     "electron-rebuild": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-2.0.0.tgz",
-      "integrity": "sha512-A+acX+oU2g1ImoEuQGfsYWOGKCq757KyMN/INSVMiNvjqzE6tmZ4/xim6Q1Rca9aRhep+QdMVwoIVsp/jq0woQ==",
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/electron-rebuild/-/electron-rebuild-2.0.1.tgz",
+      "integrity": "sha512-oXCnKKS+FpLxXiiSHtSCFI3zo+4H2y6zUegSQTI031RJXn2fzQV9UJMAfBrnW7Z083chIo3/L4+xFM4R8mreOQ==",
       "dev": true,
       "requires": {
+        "@malept/cross-spawn-promise": "^1.1.0",
         "colors": "^1.3.3",
         "debug": "^4.1.1",
         "detect-libc": "^1.0.3",
-        "fs-extra": "^8.1.0",
-        "node-abi": "^2.11.0",
+        "fs-extra": "^9.0.1",
+        "node-abi": "^2.19.1",
         "node-gyp": "^7.1.0",
-        "ora": "^3.4.0",
-        "spawn-rx": "^3.0.0",
-        "yargs": "^14.2.0"
+        "ora": "^5.0.0",
+        "yargs": "^15.4.1"
       },
       "dependencies": {
-        "cliui": {
-          "version": "5.0.0",
-          "resolved": "https://registry.npmjs.org/cliui/-/cliui-5.0.0.tgz",
-          "integrity": "sha512-PYeGSEmmHM6zvoef2w8TPzlrnNpXIjTipYK780YswmIP9vjxmd6Y2a3CB2Ks6/AU8NHjZugXvo8w3oWM2qnwXA==",
-          "dev": true,
-          "requires": {
-            "string-width": "^3.1.0",
-            "strip-ansi": "^5.2.0",
-            "wrap-ansi": "^5.1.0"
-          }
-        },
         "debug": {
           "version": "4.1.1",
           "resolved": "https://registry.npmjs.org/debug/-/debug-4.1.1.tgz",
@@ -7412,61 +7453,97 @@
             "ms": "^2.1.1"
           }
         },
+        "find-up": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+          "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+          "dev": true,
+          "requires": {
+            "locate-path": "^5.0.0",
+            "path-exists": "^4.0.0"
+          }
+        },
+        "fs-extra": {
+          "version": "9.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.1.tgz",
+          "integrity": "sha512-h2iAoN838FqAFJY2/qVpzFXy+EBxfVE220PalAqQLDVsFOHLJrZvut5puAbCdNv6WJk+B8ihI+k0c7JK5erwqQ==",
+          "dev": true,
+          "requires": {
+            "at-least-node": "^1.0.0",
+            "graceful-fs": "^4.2.0",
+            "jsonfile": "^6.0.1",
+            "universalify": "^1.0.0"
+          }
+        },
+        "graceful-fs": {
+          "version": "4.2.4",
+          "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz",
+          "integrity": "sha512-WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw==",
+          "dev": true
+        },
+        "jsonfile": {
+          "version": "6.0.1",
+          "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz",
+          "integrity": "sha512-jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg==",
+          "dev": true,
+          "requires": {
+            "graceful-fs": "^4.1.6",
+            "universalify": "^1.0.0"
+          }
+        },
+        "locate-path": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+          "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+          "dev": true,
+          "requires": {
+            "p-locate": "^4.1.0"
+          }
+        },
         "ms": {
           "version": "2.1.2",
           "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
           "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
           "dev": true
         },
-        "string-width": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/string-width/-/string-width-3.1.0.tgz",
-          "integrity": "sha512-vafcv6KjVZKSgz06oM/H6GDBrAtz8vdhQakGjFIvNrHA6y3HCF1CInLy+QLq8dTJPQ1b+KDUqDFctkdRW44e1w==",
+        "p-locate": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+          "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
           "dev": true,
           "requires": {
-            "emoji-regex": "^7.0.1",
-            "is-fullwidth-code-point": "^2.0.0",
-            "strip-ansi": "^5.1.0"
+            "p-limit": "^2.2.0"
           }
         },
-        "wrap-ansi": {
-          "version": "5.1.0",
-          "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-5.1.0.tgz",
-          "integrity": "sha512-QC1/iN/2/RPVJ5jYK8BGttj5z83LmSKmvbvrXPNCLZSEb32KKVDJDl/MOt2N01qU2H/FkzEa9PKto1BqDjtd7Q==",
-          "dev": true,
-          "requires": {
-            "ansi-styles": "^3.2.0",
-            "string-width": "^3.0.0",
-            "strip-ansi": "^5.0.0"
-          }
+        "path-exists": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+          "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+          "dev": true
+        },
+        "universalify": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+          "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+          "dev": true
         },
         "yargs": {
-          "version": "14.2.3",
-          "resolved": "https://registry.npmjs.org/yargs/-/yargs-14.2.3.tgz",
-          "integrity": "sha512-ZbotRWhF+lkjijC/VhmOT9wSgyBQ7+zr13+YLkhfsSiTriYsMzkTUFP18pFhWwBeMa5gUc1MzbhrO6/VB7c9Xg==",
+          "version": "15.4.1",
+          "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz",
+          "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==",
           "dev": true,
           "requires": {
-            "cliui": "^5.0.0",
+            "cliui": "^6.0.0",
             "decamelize": "^1.2.0",
-            "find-up": "^3.0.0",
+            "find-up": "^4.1.0",
             "get-caller-file": "^2.0.1",
             "require-directory": "^2.1.1",
             "require-main-filename": "^2.0.0",
             "set-blocking": "^2.0.0",
-            "string-width": "^3.0.0",
+            "string-width": "^4.2.0",
             "which-module": "^2.0.0",
             "y18n": "^4.0.0",
-            "yargs-parser": "^15.0.1"
-          }
-        },
-        "yargs-parser": {
-          "version": "15.0.1",
-          "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-15.0.1.tgz",
-          "integrity": "sha512-0OAMV2mAZQrs3FkNpDQcBk1x5HXb8X4twADss4S0Iuk+2dGnLOE/fRHrsYm542GduMveyA77OF4wrNJuanRCWw==",
-          "dev": true,
-          "requires": {
-            "camelcase": "^5.0.0",
-            "decamelize": "^1.2.0"
+            "yargs-parser": "^18.1.2"
           }
         }
       }
@@ -10723,6 +10800,12 @@
         "is-path-inside": "^3.0.1"
       }
     },
+    "is-interactive": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-interactive/-/is-interactive-1.0.0.tgz",
+      "integrity": "sha512-2HvIEKRoqS62guEC+qBjpvRubdX910WCMuJTZ+I9yvqKU2/12eSL549HMwtabb4oupdj2sMP50k+XJfB/8JE6w==",
+      "dev": true
+    },
     "is-npm": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-4.0.0.tgz",
@@ -12979,9 +13062,9 @@
       "dev": true
     },
     "klona": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/klona/-/klona-1.1.2.tgz",
-      "integrity": "sha512-xf88rTeHiXk+XE2Vhi6yj8Wm3gMZrygGdKjJqN8HkV+PwF/t50/LdAKHoHpPcxFAlmQszTZ1CugrK25S7qDRLA==",
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/klona/-/klona-2.0.3.tgz",
+      "integrity": "sha512-CgPOT3ZadDpXxKcfV56lEQ9OQSZ42Mk26gnozI+uN/k39vzD8toUhRQoqsX0m9Q3eMPEfsLWmtyUpK/yqST4yg==",
       "dev": true
     },
     "latest-version": {
@@ -13108,12 +13191,6 @@
       "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ==",
       "dev": true
     },
-    "lodash.assign": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/lodash.assign/-/lodash.assign-4.2.0.tgz",
-      "integrity": "sha1-DZnzzNem0mHRm9rrkkUAXShYCOc=",
-      "dev": true
-    },
     "lodash.assignin": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/lodash.assignin/-/lodash.assignin-4.2.0.tgz",
@@ -13209,12 +13286,64 @@
       "dev": true
     },
     "log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.0.0.tgz",
+      "integrity": "sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==",
       "dev": true,
       "requires": {
-        "chalk": "^2.0.1"
+        "chalk": "^4.0.0"
+      },
+      "dependencies": {
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
+          "dev": true,
+          "requires": {
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
+          }
+        }
       }
     },
     "loglevel": {
@@ -13520,9 +13649,9 @@
       }
     },
     "mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
       "dev": true
     },
     "mimic-response": {
@@ -13540,9 +13669,9 @@
       }
     },
     "mini-css-extract-plugin": {
-      "version": "0.10.0",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.10.0.tgz",
-      "integrity": "sha512-QgKgJBjaJhxVPwrLNqqwNS0AGkuQQ31Hp4xGXEK/P7wehEg6qmNtReHKai3zRXqY60wGVWLYcOMJK2b98aGc3A==",
+      "version": "0.11.0",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-0.11.0.tgz",
+      "integrity": "sha512-dVWGuWJlQw2lZxsxBI3hOsoxg1k3DruLR0foHQLSkQMfk+qLJbv9dUk8fjmjWQKN9ef2n54ehA2FjClAsQhrWQ==",
       "dev": true,
       "requires": {
         "loader-utils": "^1.1.0",
@@ -13765,6 +13894,12 @@
       "integrity": "sha1-iZ8R2WhuXgXLkbNdXw5jt3PPyQE=",
       "dev": true
     },
+    "mute-stream": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.8.tgz",
+      "integrity": "sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA==",
+      "dev": true
+    },
     "mux.js": {
       "version": "5.2.1",
       "resolved": "https://registry.npmjs.org/mux.js/-/mux.js-5.2.1.tgz",
@@ -14605,12 +14740,12 @@
       }
     },
     "onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha1-BnQoIw/WdEOyeUsiu6UotoZ5YtQ=",
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dev": true,
       "requires": {
-        "mimic-fn": "^1.0.0"
+        "mimic-fn": "^2.1.0"
       }
     },
     "opml-to-json": {
@@ -14682,28 +14817,84 @@
       }
     },
     "ora": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-5.0.0.tgz",
+      "integrity": "sha512-s26qdWqke2kjN/wC4dy+IQPBIMWBJlSU/0JZhk30ZDBLelW25rv66yutUWARMigpGPzcXHb+Nac5pNhN/WsARw==",
       "dev": true,
       "requires": {
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^2.0.0",
-        "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.2.0",
+        "chalk": "^4.1.0",
+        "cli-cursor": "^3.1.0",
+        "cli-spinners": "^2.4.0",
+        "is-interactive": "^1.0.0",
+        "log-symbols": "^4.0.0",
+        "mute-stream": "0.0.8",
+        "strip-ansi": "^6.0.0",
         "wcwidth": "^1.0.1"
       },
       "dependencies": {
-        "chalk": {
-          "version": "2.4.2",
-          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+        "ansi-regex": {
+          "version": "5.0.0",
+          "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.0.tgz",
+          "integrity": "sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==",
+          "dev": true
+        },
+        "ansi-styles": {
+          "version": "4.2.1",
+          "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.2.1.tgz",
+          "integrity": "sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA==",
           "dev": true,
           "requires": {
-            "ansi-styles": "^3.2.1",
-            "escape-string-regexp": "^1.0.5",
-            "supports-color": "^5.3.0"
+            "@types/color-name": "^1.1.1",
+            "color-convert": "^2.0.1"
+          }
+        },
+        "chalk": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.0.tgz",
+          "integrity": "sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^4.1.0",
+            "supports-color": "^7.1.0"
+          }
+        },
+        "color-convert": {
+          "version": "2.0.1",
+          "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+          "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+          "dev": true,
+          "requires": {
+            "color-name": "~1.1.4"
+          }
+        },
+        "color-name": {
+          "version": "1.1.4",
+          "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+          "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
+          "dev": true
+        },
+        "has-flag": {
+          "version": "4.0.0",
+          "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+          "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
+          "dev": true
+        },
+        "strip-ansi": {
+          "version": "6.0.0",
+          "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.0.tgz",
+          "integrity": "sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w==",
+          "dev": true,
+          "requires": {
+            "ansi-regex": "^5.0.0"
+          }
+        },
+        "supports-color": {
+          "version": "7.1.0",
+          "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.1.0.tgz",
+          "integrity": "sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g==",
+          "dev": true,
+          "requires": {
+            "has-flag": "^4.0.0"
           }
         }
       }
@@ -15320,9 +15511,9 @@
       "dev": true
     },
     "prettier": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.0.tgz",
-      "integrity": "sha512-lz28cCbA1cDFHVuY8vvj6QuqOwIpyIfPUYkSl8AZ/vxH8qBXMMjE2knfLHCrZCmUsK/H1bg1P0tOo0dJkTJHvw==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.1.1.tgz",
+      "integrity": "sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw==",
       "dev": true
     },
     "prettier-linter-helpers": {
@@ -16224,12 +16415,12 @@
       }
     },
     "restore-cursor": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz",
-      "integrity": "sha1-n37ih/gv0ybU/RYpI9YhKe7g368=",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/restore-cursor/-/restore-cursor-3.1.0.tgz",
+      "integrity": "sha512-l+sSefzHpj5qimhFSE5a8nufZYAM3sBSVMAPtYkmC+4EH2anSGaEMXSD0izRQbu9nfyQ9y5JrVmp7E8oZrUjvA==",
       "dev": true,
       "requires": {
-        "onetime": "^2.0.0",
+        "onetime": "^5.1.0",
         "signal-exit": "^3.0.2"
       }
     },
@@ -16323,15 +16514,6 @@
         "individual": "^2.0.0"
       }
     },
-    "rxjs": {
-      "version": "6.6.2",
-      "resolved": "https://registry.npmjs.org/rxjs/-/rxjs-6.6.2.tgz",
-      "integrity": "sha512-BHdBMVoWC2sL26w//BCu3YzKT4s2jip/WhwsGEDmeKYBhKDZeYezVUnHatYB7L85v5xs0BAQmg6BEYJEKxBabg==",
-      "dev": true,
-      "requires": {
-        "tslib": "^1.9.0"
-      }
-    },
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
@@ -16395,12 +16577,12 @@
       }
     },
     "sass-loader": {
-      "version": "10.0.0",
-      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.0.tgz",
-      "integrity": "sha512-DEIrVJIXf2P6jtY3fpJu+uWetALCds2PwRA2iwbpzmHvtFmX5j0aX5Uz+YZSeJpjKrpgqWNKngcVxmwVfqxMow==",
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-10.0.1.tgz",
+      "integrity": "sha512-b2PSldKVTS3JcFPHSrEXh3BeAfR7XknGiGCAO5aHruR3Pf3kqLP3Gb2ypXLglRrAzgZkloNxLZ7GXEGDX0hBUQ==",
       "dev": true,
       "requires": {
-        "klona": "^1.1.2",
+        "klona": "^2.0.3",
         "loader-utils": "^2.0.0",
         "neo-async": "^2.6.2",
         "schema-utils": "^2.7.0",
@@ -16998,17 +17180,6 @@
       "integrity": "sha1-PpNdfd1zYxuXZZlW1VEo6HtQhKM=",
       "dev": true
     },
-    "spawn-rx": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spawn-rx/-/spawn-rx-3.0.0.tgz",
-      "integrity": "sha512-dw4Ryg/KMNfkKa5ezAR5aZe9wNwPdKlnHEXtHOjVnyEDSPQyOpIPPRtcIiu7127SmtHhaCjw21yC43HliW0iIg==",
-      "dev": true,
-      "requires": {
-        "debug": "^2.5.1",
-        "lodash.assign": "^4.2.0",
-        "rxjs": "^6.3.1"
-      }
-    },
     "spdx-correct": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.1.0.tgz",
@@ -20093,44 +20264,12 @@
       }
     },
     "yt-channel-info": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/yt-channel-info/-/yt-channel-info-1.0.3.tgz",
-      "integrity": "sha512-AFFh403fCX+vRei+bExIwgO7OPDydbLdq57HtZIQ1bn7/f4w7Vv7Vh/G+HT9s5yIApbqrbR9uPetPWofG0KDuw==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/yt-channel-info/-/yt-channel-info-1.1.0.tgz",
+      "integrity": "sha512-BFcJvzBoLN9k7gABt11PILwk1ywgY97606He8YoCk+RP315n8uMdpPFOKx+KP/sTQV+A48oMvGvjiMU9HDnNtA==",
       "requires": {
-        "axios": "^0.18.0",
+        "axios": "^0.19.2",
         "querystring": "^0.2.0"
-      },
-      "dependencies": {
-        "axios": {
-          "version": "0.18.1",
-          "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
-          "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
-          "requires": {
-            "follow-redirects": "1.5.10",
-            "is-buffer": "^2.0.2"
-          }
-        },
-        "debug": {
-          "version": "3.1.0",
-          "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
-          "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
-          "requires": {
-            "ms": "2.0.0"
-          }
-        },
-        "follow-redirects": {
-          "version": "1.5.10",
-          "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
-          "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
-          "requires": {
-            "debug": "=3.1.0"
-          }
-        },
-        "is-buffer": {
-          "version": "2.0.4",
-          "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz",
-          "integrity": "sha512-Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="
-        }
       }
     },
     "yt-trending-scraper": {

From 1ffb013bfeed59442dcc8b58c7c8469ad1deed3a Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Fri, 28 Aug 2020 11:01:20 -0400
Subject: [PATCH 21/22] Fix links to channel view in search page

---
 src/renderer/views/Search/Search.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/renderer/views/Search/Search.js b/src/renderer/views/Search/Search.js
index e181d0af..ad731003 100644
--- a/src/renderer/views/Search/Search.js
+++ b/src/renderer/views/Search/Search.js
@@ -141,6 +141,7 @@ export default Vue.extend({
             if (video.duration !== null && video.duration !== '') {
               videoDuration = ytTrendScraper.calculate_length_in_seconds(video.duration)
             }
+            authId = authId[0].replace(/(user|channel)\//, '')
             returnDataInvidious.push(
               {
                 videoId: videoId,

From 024e1fe2eb06c7d5c36c445cb7575839e9c6bd47 Mon Sep 17 00:00:00 2001
From: Preston <freetubeapp@protonmail.com>
Date: Fri, 28 Aug 2020 15:43:10 -0400
Subject: [PATCH 22/22] Add Module to generate manifest files locally

---
 .gitignore                        |  1 +
 package-lock.json                 | 17 ++++++++
 package.json                      |  1 +
 src/renderer/views/Watch/Watch.js | 69 +++++++++++++++++++++++--------
 4 files changed, 71 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 5d78d022..82b7513e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
 .DS_Store
 dist/electron/*
 storyboards/*
+dashFiles/*
 dist/web/*
 build/*
 !build/icons
diff --git a/package-lock.json b/package-lock.json
index ad650fb1..a9b1f0f9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20095,6 +20095,14 @@
         "xtend": "^4.0.0"
       }
     },
+    "xml-js": {
+      "version": "1.6.11",
+      "resolved": "https://registry.npmjs.org/xml-js/-/xml-js-1.6.11.tgz",
+      "integrity": "sha512-7rVi2KMfwfWFl+GpPg6m80IVMWXLRjO+PxTq7V2CDhoGak0wzYzFgUY2m4XJ47OGdXd8eLE8EmwfAmdjw7lC1g==",
+      "requires": {
+        "sax": "^1.2.4"
+      }
+    },
     "xml-name-validator": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-3.0.0.tgz",
@@ -20272,6 +20280,15 @@
         "querystring": "^0.2.0"
       }
     },
+    "yt-dash-manifest-generator": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/yt-dash-manifest-generator/-/yt-dash-manifest-generator-1.0.2.tgz",
+      "integrity": "sha512-rcBsAAhwlxtW/9irXRbU8N/8Qpft96OO0pLFvF8O7nDrjRWljnJC+DheXuhYGXpMqJGksROH1xQ1bHpwwp310g==",
+      "requires": {
+        "xml-js": "^1.6.11",
+        "ytdl-core": "^3.2.2"
+      }
+    },
     "yt-trending-scraper": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/yt-trending-scraper/-/yt-trending-scraper-1.0.3.tgz",
diff --git a/package.json b/package.json
index 67df45f2..ddc904b5 100644
--- a/package.json
+++ b/package.json
@@ -42,6 +42,7 @@
     "youtube-comments-task": "^1.3.15",
     "youtube-suggest": "^1.1.0",
     "yt-channel-info": "^1.1.0",
+    "yt-dash-manifest-generator": "^1.0.2",
     "yt-trending-scraper": "^1.0.3",
     "yt-xml2vtt": "^1.1.2",
     "ytdl-core": "^3.2.2",
diff --git a/src/renderer/views/Watch/Watch.js b/src/renderer/views/Watch/Watch.js
index 348db186..d0d3f435 100644
--- a/src/renderer/views/Watch/Watch.js
+++ b/src/renderer/views/Watch/Watch.js
@@ -4,6 +4,7 @@ import xml2vtt from 'yt-xml2vtt'
 import $ from 'jquery'
 import fs from 'fs'
 import electron from 'electron'
+import ytDashGen from 'yt-dash-manifest-generator'
 import FtLoader from '../../components/ft-loader/ft-loader.vue'
 import FtCard from '../../components/ft-card/ft-card.vue'
 import FtElementList from '../../components/ft-element-list/ft-element-list.vue'
@@ -55,6 +56,7 @@ export default Vue.extend({
       videoPublished: 0,
       videoStoryboardSrc: '',
       audioUrl: '',
+      dashSrc: [],
       activeSourceList: [],
       videoSourceList: [],
       audioSourceList: [],
@@ -139,23 +141,6 @@ export default Vue.extend({
 
     youtubeNoCookieEmbeddedFrame: function () {
       return `<iframe width='560' height='315' src='https://www.youtube-nocookie.com/embed/${this.videoId}?rel=0' frameborder='0' allow='autoplay; encrypted-media' allowfullscreen></iframe>`
-    },
-
-    dashSrc: function () {
-      let url = `${this.invidiousInstance}/api/manifest/dash/id/${this.videoId}.mpd`
-
-      if (this.proxyVideos || !this.usingElectron) {
-        url = url + '?local=true'
-      }
-
-      return [
-        {
-          url: url,
-          type: 'application/dash+xml',
-          label: 'Dash',
-          qualityLabel: 'Auto'
-        }
-      ]
     }
   },
   watch: {
@@ -306,6 +291,7 @@ export default Vue.extend({
           } else {
             this.videoLengthSeconds = parseInt(result.videoDetails.lengthSeconds)
             this.videoSourceList = result.player_response.streamingData.formats
+            this.dashSrc = await this.createLocalDashManifest(result.formats)
 
             this.audioSourceList = result.player_response.streamingData.adaptiveFormats.filter((format) => {
               return format.mimeType.includes('audio')
@@ -619,6 +605,55 @@ export default Vue.extend({
       }
     },
 
+    createLocalDashManifest: function (formats) {
+      const xmlData = ytDashGen.generate_dash_file_from_formats(formats, this.videoLengthSeconds)
+      const userData = electron.remote.app.getPath('userData')
+      let fileLocation
+      let uriSchema
+      if (this.isDev) {
+        fileLocation = `dashFiles/${this.videoId}.xml`
+        uriSchema = fileLocation
+        // if the location does not exist, writeFileSync will not create the directory, so we have to do that manually
+        if (!fs.existsSync('dashFiles/')) {
+          fs.mkdirSync('dashFiles/')
+        }
+      } else {
+        fileLocation = `${userData}/dashFiles/${this.videoId}.xml`
+        uriSchema = `file://${fileLocation}`
+
+        if (!fs.existsSync(`${userData}/dashFiles/`)) {
+          fs.mkdirSync(`${userData}/dashFiles/`)
+        }
+      }
+      fs.writeFileSync(fileLocation, xmlData)
+      console.log('CREATED FILE')
+      return [
+        {
+          url: uriSchema,
+          type: 'application/dash+xml',
+          label: 'Dash',
+          qualityLabel: 'Auto'
+        }
+      ]
+    },
+
+    createInvidiousDashManifest: function () {
+      let url = `${this.invidiousInstance}/api/manifest/dash/id/${this.videoId}.mpd`
+
+      if (this.proxyVideos || !this.usingElectron) {
+        url = url + '?local=true'
+      }
+
+      return [
+        {
+          url: url,
+          type: 'application/dash+xml',
+          label: 'Dash',
+          qualityLabel: 'Auto'
+        }
+      ]
+    },
+
     createLocalStoryboardUrls: function (templateUrl) {
       const storyboards = templateUrl.split('|')
       const storyboardArray = []