Merge branch 'development' into update-linters-add-style-linting

FreeTubeApp · Jan 3, 2023 · 78be5e9 · 78be5e9
2 parents 34ad98d + 8c18141
commit 78be5e9
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 31 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -57,7 +57,7 @@ jobs:
     - run: yarn run ci
     - run: yarn run lint
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false
@@ -84,7 +84,7 @@ jobs:
         # script: if ${{ env.IS_DEV }} then echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER_NIGHTLY }}" else echo "::set-output name=VERSION_NUMBER::${{ env.VERSION_NUMBER }}" fi
 
     - name: Update package.json version
-      uses: jossef/action-set-json-field@v2
+      uses: jossef/action-set-json-field@v2.1
       with:
         file: package.json
         field: version

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -58,7 +58,7 @@ jobs:
     - run: yarn run lint
 
     - name: Get Version Number
-      uses: nyaayaya/package-version@v1
+      uses: jozsefsallai/node-package-version@v1.0.4
       with:
         path: 'package.json'
         follow-symlinks: false

diff --git a/package.json b/package.json
@@ -80,7 +80,7 @@
     "vue-observe-visibility": "^1.0.0",
     "vue-router": "^3.6.5",
     "vuex": "^3.6.2",
-    "youtubei.js": "^2.6.0",
+    "youtubei.js": "^2.7.0",
     "yt-channel-info": "^3.2.1",
     "yt-dash-manifest-generator": "1.1.0",
     "ytdl-core": "https://github.com/absidue/node-ytdl-core#fix-likes-extraction",

diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { Innertube, Session } from 'youtubei.js'
+import { Innertube } from 'youtubei.js'
 import { join } from 'path'
 
 import { PlayerCache } from './PlayerCache'
@@ -18,31 +18,19 @@ import { extractNumberFromString, getUserDataPath } from '../utils'
  * @returns the Innertube instance
  */
 async function createInnertube(options = { withPlayer: false, location: undefined }) {
+  let cache
   if (options.withPlayer) {
     const userData = await getUserDataPath()
-
-    return await Innertube.create({
-      // use browser fetch
-      location: options.location,
-      fetch: (input, init) => fetch(input, init),
-      cache: new PlayerCache(join(userData, 'player_cache'))
-    })
-  } else {
-    // from https://github.com/LuanRT/YouTube.js/pull/240
-    const sessionData = await Session.getSessionData(undefined, options.location)
-
-    const session = new Session(
-      sessionData.context,
-      sessionData.api_key,
-      sessionData.api_version,
-      sessionData.account_index,
-      undefined, // player
-      undefined, // cookies
-      (input, init) => fetch(input, init) // use browser fetch
-    )
-
-    return new Innertube(session)
+    cache = new PlayerCache(join(userData, 'player_cache'))
   }
+
+  return await Innertube.create({
+    retrieve_player: !!options.withPlayer,
+    location: options.location,
+    // use browser fetch
+    fetch: (input, init) => fetch(input, init),
+    cache
+  })
 }
 
 let searchSuggestionsSession = null

diff --git a/static/locales/ru.yaml b/static/locales/ru.yaml
@@ -391,6 +391,8 @@ Settings:
     Hide Upcoming Premieres: Скрыть предстоящие премьеры
     Hide Channels Placeholder: Название или идентификатор канала
     Hide Channels: Скрыть видео с каналов
+    Display Titles Without Excessive Capitalisation: Отображать заголовки без чрезмерного
+      использования заглавных букв
   The app needs to restart for changes to take effect. Restart and apply change?: Чтобы
     изменения вступили в силу, необходимо перезапустить приложение. Перезапустить
     и применить изменения?

diff --git a/yarn.lock b/yarn.lock
@@ -9244,10 +9244,10 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
-youtubei.js@^2.6.0:
-  version "2.6.0"
-  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.6.0.tgz#7ba11f0d81b2e8d76a0993524b98ca7554d1090a"
-  integrity sha512-QnpOdcCqikI5qVTmMY7Orx/CglNVfsP+OGUgavodX20MtSRYUqjR/s/HYo1vWAol1hZT+PThEnIUrX/6U9IueA==
+youtubei.js@^2.7.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/youtubei.js/-/youtubei.js-2.7.0.tgz#2b980f3e97c9b05097d3b387ff4f6a8d42a61e0d"
+  integrity sha512-npMhgWSru/tPdHvUUqgc0UZv9J7nn/o2V9cfcMS2WvnjhHW9vc9wR54QxyNxURC3uFKkk5WBouu+QjMn+bMtwg==
   dependencies:
     "@protobuf-ts/runtime" "^2.7.0"
     jintr "^0.3.1"