## How does it work?
FreeTube uses a built in extractor to grab and serve data / videos. The [Invidious API](https://github.com/iv-org/invidious) can also optionally be used. FreeTube does not use any official APIs to obtain data. While YouTube can still see your video requests, it can no
-longer track you using cookies or JavaScript. Your subscriptions and history are stored locally on your computer and never sent out. Using a VPN or Tor is highly recommended
-to hide your IP while using FreeTube.
+longer track you using cookies or JavaScript. Your subscriptions and history are stored locally on your computer and never sent out.
+
+> [!IMPORTANT]
+> Using a VPN or Tor is highly recommended to hide your IP while using FreeTube.
## Features
* Watch videos without ads
@@ -59,16 +62,26 @@ to hide your IP while using FreeTube.
* View most age restricted videos
### Browser Extension
-FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube. You must enable the option within the advanced settings of the extension for it to work.
+FreeTube is supported by the [Privacy Redirect](https://github.com/SimonBrazell/privacy-redirect) and [LibRedirect](https://github.com/libredirect/libredirect) extensions, which will allow you to open YouTube links into FreeTube.
+
+> [!IMPORTANT]
+> You must enable the option within the advanced settings of the extension for it to work.
* Download Privacy Redirect for [Firefox](https://addons.mozilla.org/en-US/firefox/addon/privacy-redirect/) or [Google Chrome](https://chrome.google.com/webstore/detail/privacy-redirect/pmcmeagblkinmogikoikkdjiligflglb).
* Download LibRedirect for [Firefox](https://addons.mozilla.org/firefox/addon/libredirect/) or [Google Chrome](https://libredirect.github.io/download_chromium.html).
-If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository. This extension does not work on Linux portable builds!
+> [!NOTE]
+> This extension does not work on Linux portable builds!
+>
+> If you have issues with the extension working with FreeTube, please create an issue in this repository instead of the extension repository.
## Download Links
### Official Downloads
+
+> [!CAUTION]
+> FreeTube is only supported on Windows 10 and later, macOS 10.15 and above, and various Linux distributions. Installing it on unsupported systems may result in unexpected issues.
+
* [GitHub Releases](https://github.com/FreeTubeApp/FreeTube/releases)
* [FreeTube Website](https://freetubeapp.io/#download)
@@ -76,18 +89,25 @@ If you have issues with the extension working with FreeTube, please create an is
* Flatpak on Flathub: [Download](https://flathub.org/apps/details/io.freetubeapp.FreeTube) and [Source Code](https://github.com/flathub/io.freetubeapp.FreeTube)
#### Automated Builds (Nightly / Weekly)
+> [!WARNING]
+> Use these builds at your own risk. These are pre-release versions and are only intended for people that want to test changes early and are willing to accept that things could break from one build to another.
+
Builds are automatically created from changes to our development branch via [GitHub Actions](https://github.com/FreeTubeApp/FreeTube/actions?query=workflow%3ABuild).
-The first build with a green check mark is the latest build. You will need to have a GitHub account to download these builds.
+The first build with a green check mark is the latest build.
+
+> [!IMPORTANT]
+> You will need to have a GitHub account to download these builds.
### Unofficial Downloads
-These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer. Make sure u always try an [official download](https://github.com/freetubeapp/freetube/#official-downloads) before reporting your issue to us!
+> [!WARNING]
+> These builds are maintained by the community. While they should be safe, download at your own risk. There may be issues with using these versus the official builds. Any issues specific with these builds should be sent to their respective maintainer. Make sure u always try an [official download](https://github.com/freetubeapp/freetube/#official-downloads) before reporting your issue to us!
* Arch User Repository (AUR): [Download](https://aur.archlinux.org/packages/freetube-bin/)
* Chocolatey: [Download](https://chocolatey.org/packages/freetube/)
-* FreeTubeCordova (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeCordova/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeCordova)
+* FreeTubeAndroid (FreeTube port for Android and PWA): [Download](https://github.com/MarmadileManteater/FreeTubeAndroid/releases) and [Source Code](https://github.com/MarmadileManteater/FreeTubeAndroid)
* Homebrew Formulae (Mac only): [Download](https://formulae.brew.sh/cask/freetube)
@@ -106,14 +126,14 @@ These builds are maintained by the community. While they should be safe, downloa
* Windows Package Manager (winget): [Usage](https://docs.microsoft.com/en-us/windows/package-manager/winget/)
## Contributing
-If you like to get your hands dirty and want to contribute, we would love to
-have your help. Send a pull request and someone will review your code. Please
-follow the [Contribution
-Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/development/CONTRIBUTING.md)
-before sending your pull request.
-
Thank you very much to the [People and Projects](https://docs.freetubeapp.io/credits/) that make FreeTube possible!
+If you like to get your hands dirty and want to contribute, we would love to
+have your help. Send a pull request and someone will review your code.
+
+> [!IMPORTANT]
+> Please follow the [Contribution Guidelines](https://github.com/FreeTubeApp/FreeTube/blob/development/CONTRIBUTING.md) before sending your pull request.
+
## Localization
@@ -124,7 +144,10 @@ We are actively looking for translations! We use [Weblate](https://hosted.webla
For the Linux Flatpak, the desktop entry comment string can be translated at our [Flatpak repository](https://github.com/flathub/io.freetubeapp.FreeTube/blob/master/io.freetubeapp.FreeTube.desktop).
## Contact
-If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org). Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
+If you ever have any questions, feel free to ask it on our [Discussions](https://github.com/FreeTubeApp/FreeTube/discussions) page. Alternatively, you can email us at FreeTubeApp@protonmail.com or you can join our [Matrix Community](https://matrix.to/#/+freetube:matrix.org).
+
+> [!IMPORTANT]
+> Don't forget to check out the [rules](https://docs.freetubeapp.io/community/matrix/) before joining.
## Donate
If you enjoy using FreeTube, you're welcome to leave a donation using the following methods.
@@ -135,7 +158,10 @@ If you enjoy using FreeTube, you're welcome to leave a donation using the follow
* Monero Address: `48WyAPdjwc6VokeXACxSZCFeKEXBiYPV6GjfvBsfg4CrUJ95LLCQSfpM9pvNKy5GE5H4hNaw99P8RZyzmaU9kb1pD7kzhCB`
-While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs. If you are using the Invidious API then we recommend that you donate to the instance that you use. You can also donate to the [Invidious team](https://invidious.io/donate/) or the [Local API developer](https://github.com/sponsors/LuanRT).
+While your donations are much appreciated, only donate if you really want to. Donations are used for keeping the website up and running and eventual code signing costs.
+
+> [!TIP]
+> If you are using the Invidious API then we recommend that you donate to the instance that you use. You can also donate to the [Invidious team](https://invidious.io/donate/) or the [Local API developer](https://github.com/sponsors/LuanRT).
## License
[](https://www.gnu.org/licenses/agpl-3.0.html)
diff --git a/_scripts/webpack.main.config.js b/_scripts/webpack.main.config.js
index 0f3c706c6..0358f7919 100644
--- a/_scripts/webpack.main.config.js
+++ b/_scripts/webpack.main.config.js
@@ -56,7 +56,7 @@ if (!isDevMode) {
to: path.join(__dirname, '../dist/static'),
globOptions: {
dot: true,
- ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/dashFiles/**', '**/storyboards/**'],
+ ignore: ['**/.*', '**/locales/**', '**/pwabuilder-sw.js', '**/manifest.json', '**/dashFiles/**', '**/storyboards/**'],
},
},
]
diff --git a/_scripts/webpack.renderer.config.js b/_scripts/webpack.renderer.config.js
index 5cb371e8a..18d778c89 100644
--- a/_scripts/webpack.renderer.config.js
+++ b/_scripts/webpack.renderer.config.js
@@ -119,6 +119,7 @@ const config = {
new webpack.DefinePlugin({
'process.env.IS_ELECTRON': true,
'process.env.IS_ELECTRON_MAIN': false,
+ 'process.env.SUPPORTS_LOCAL_API': true,
'process.env.LOCALE_NAMES': JSON.stringify(processLocalesPlugin.localeNames),
'process.env.GEOLOCATION_NAMES': JSON.stringify(readdirSync(path.join(__dirname, '..', 'static', 'geolocations')).map(filename => filename.replace('.json', ''))),
'process.env.SWIPER_VERSION': `'${swiperVersion}'`
@@ -126,10 +127,7 @@ const config = {
new HtmlWebpackPlugin({
excludeChunks: ['processTaskWorker'],
filename: 'index.html',
- template: path.resolve(__dirname, '../src/index.ejs'),
- nodeModules: isDevMode
- ? path.resolve(__dirname, '../node_modules')
- : false,
+ template: path.resolve(__dirname, '../src/index.ejs')
}),
new VueLoaderPlugin(),
new MiniCssExtractPlugin({
diff --git a/_scripts/webpack.web.config.js b/_scripts/webpack.web.config.js
index 5113f06a7..0badc63a7 100644
--- a/_scripts/webpack.web.config.js
+++ b/_scripts/webpack.web.config.js
@@ -116,6 +116,7 @@ const config = {
new webpack.DefinePlugin({
'process.env.IS_ELECTRON': false,
'process.env.IS_ELECTRON_MAIN': false,
+ 'process.env.SUPPORTS_LOCAL_API': false,
'process.env.SWIPER_VERSION': `'${swiperVersion}'`,
// video.js' vhs-utils supports both atob() in web browsers and Buffer in node
@@ -136,8 +137,7 @@ const config = {
new HtmlWebpackPlugin({
excludeChunks: ['processTaskWorker'],
filename: 'index.html',
- template: path.resolve(__dirname, '../src/index.ejs'),
- nodeModules: false,
+ template: path.resolve(__dirname, '../src/index.ejs')
}),
new VueLoaderPlugin(),
new MiniCssExtractPlugin({
diff --git a/package.json b/package.json
index d86e68a44..052bd7086 100644
--- a/package.json
+++ b/package.json
@@ -2,7 +2,7 @@
"name": "freetube",
"productName": "FreeTube",
"description": "A private YouTube client",
- "version": "0.19.1",
+ "version": "0.20.0",
"license": "AGPL-3.0-or-later",
"main": "./dist/main.js",
"private": true,
@@ -25,7 +25,7 @@
"build-release": "node _scripts/build.js",
"build-release:arm64": "node _scripts/build.js arm64",
"build-release:arm32": "node _scripts/build.js arm32",
- "clean": "rimraf build/ static/dashFiles/ dist/ static/storyboards/",
+ "clean": "rimraf build/ dist/",
"debug": "run-s rebuild:electron debug-runner",
"debug-runner": "node _scripts/dev-runner.js --remote-debug",
"dev": "run-s rebuild:electron dev-runner",
@@ -53,9 +53,9 @@
"ci": "yarn install --silent --frozen-lockfile"
},
"dependencies": {
- "@fortawesome/fontawesome-svg-core": "^6.5.1",
- "@fortawesome/free-brands-svg-icons": "^6.5.1",
- "@fortawesome/free-solid-svg-icons": "^6.5.1",
+ "@fortawesome/fontawesome-svg-core": "^6.5.2",
+ "@fortawesome/free-brands-svg-icons": "^6.5.2",
+ "@fortawesome/free-solid-svg-icons": "^6.5.2",
"@fortawesome/vue-fontawesome": "^2.0.10",
"@seald-io/nedb": "^4.0.4",
"@silvermine/videojs-quality-selector": "^1.3.1",
@@ -65,7 +65,7 @@
"marked": "^12.0.1",
"path-browserify": "^1.0.1",
"process": "^0.11.10",
- "swiper": "^11.0.7",
+ "swiper": "^11.1.0",
"video.js": "7.21.5",
"videojs-contrib-quality-levels": "^3.0.0",
"videojs-http-source-selector": "^1.1.6",
@@ -77,19 +77,20 @@
"vue-observe-visibility": "^1.0.0",
"vue-router": "^3.6.5",
"vuex": "^3.6.2",
- "youtubei.js": "^9.1.0"
+ "youtubei.js": "^9.2.0"
},
"devDependencies": {
- "@babel/core": "^7.24.3",
+ "@babel/core": "^7.24.4",
"@babel/eslint-parser": "^7.24.1",
"@babel/plugin-proposal-class-properties": "^7.18.6",
- "@babel/preset-env": "^7.24.3",
+ "@babel/preset-env": "^7.24.4",
"@double-great/stylelint-a11y": "^3.0.2",
+ "@intlify/eslint-plugin-vue-i18n": "^2.0.0",
"babel-loader": "^9.1.3",
"copy-webpack-plugin": "^12.0.2",
- "css-loader": "^6.10.0",
+ "css-loader": "^7.0.0",
"css-minimizer-webpack-plugin": "^6.0.0",
- "electron": "^29.1.5",
+ "electron": "^29.2.0",
"electron-builder": "^24.13.3",
"eslint": "^8.57.0",
"eslint-config-prettier": "^9.1.0",
@@ -100,22 +101,22 @@
"eslint-plugin-prettier": "^5.1.3",
"eslint-plugin-promise": "^6.1.1",
"eslint-plugin-unicorn": "^51.0.1",
- "eslint-plugin-vue": "^9.23.0",
+ "eslint-plugin-vue": "^9.24.0",
"eslint-plugin-vuejs-accessibility": "^2.2.1",
"eslint-plugin-yml": "^1.13.2",
"html-webpack-plugin": "^5.6.0",
"js-yaml": "^4.1.0",
"json-minimizer-webpack-plugin": "^5.0.0",
- "lefthook": "^1.6.7",
+ "lefthook": "^1.6.8",
"mini-css-extract-plugin": "^2.8.1",
"npm-run-all": "^4.1.5",
"postcss": "^8.4.38",
"postcss-scss": "^4.0.9",
"prettier": "^2.8.8",
"rimraf": "^5.0.5",
- "sass": "^1.72.0",
+ "sass": "^1.74.1",
"sass-loader": "^14.1.1",
- "stylelint": "^16.3.0",
+ "stylelint": "^16.3.1",
"stylelint-config-sass-guidelines": "^11.1.0",
"stylelint-config-standard": "^36.0.0",
"stylelint-high-performance-animation": "^1.10.0",
diff --git a/src/constants.js b/src/constants.js
index b281fb168..322472503 100644
--- a/src/constants.js
+++ b/src/constants.js
@@ -23,7 +23,10 @@ const IpcChannels = {
SYNC_SETTINGS: 'sync-settings',
SYNC_HISTORY: 'sync-history',
SYNC_PROFILES: 'sync-profiles',
- SYNC_PLAYLISTS: 'sync-playlists'
+ SYNC_PLAYLISTS: 'sync-playlists',
+
+ GET_REPLACE_HTTP_CACHE: 'get-replace-http-cache',
+ TOGGLE_REPLACE_HTTP_CACHE: 'toggle-replace-http-cache'
}
const DBActions = {
diff --git a/src/index.ejs b/src/index.ejs
index 1a224ca4a..40f7075a1 100644
--- a/src/index.ejs
+++ b/src/index.ejs
@@ -9,13 +9,6 @@
<% } %>
- Invidious
+ Invidious
{ return { @@ -2111,6 +2111,8 @@ export default defineComponent({ // Unexpected errors should be reported console.error(err) + // ignore as this will most likely be removed by shaka player changes + // eslint-disable-next-line @intlify/vue-i18n/no-missing-keys const errorMessage = this.$t('play() request Error (Click to copy)') showToast(`${errorMessage}: ${err}`, 10000, () => { copyToClipboard(err) diff --git a/src/renderer/components/general-settings/general-settings.js b/src/renderer/components/general-settings/general-settings.js index d682bbba5..5ccf21a47 100644 --- a/src/renderer/components/general-settings/general-settings.js +++ b/src/renderer/components/general-settings/general-settings.js @@ -10,6 +10,7 @@ import FtButton from '../ft-button/ft-button.vue' import debounce from 'lodash.debounce' import allLocales from '../../../../static/locales/activeLocales.json' import { showToast } from '../../helpers/utils' +import { translateWindowTitle } from '../../helpers/strings' export default defineComponent({ name: 'GeneralSettings', @@ -23,10 +24,14 @@ export default defineComponent({ }, data: function () { return { - backendValues: [ - 'invidious', - 'local' - ], + backendValues: process.env.SUPPORTS_LOCAL_API + ? [ + 'invidious', + 'local' + ] + : [ + 'invidious' + ], viewTypeValues: [ 'grid', 'list' @@ -91,13 +96,17 @@ export default defineComponent({ return this.$router.getRoutes().filter((route) => includedPageNames.includes(route.name)) }, defaultPageNames: function () { - return this.defaultPages.map((route) => this.$t(route.meta.title)) + return this.defaultPages.map((route) => translateWindowTitle(route.meta.title, this.$i18n)) }, defaultPageValues: function () { // avoid Vue parsing issues by excluding '/' from path values return this.defaultPages.map((route) => route.path.substring(1)) }, backendPreference: function () { + if (!process.env.SUPPORTS_LOCAL_API && this.$store.getters.getBackendPreference === 'local') { + this.handlePreferredApiBackend('invidious') + } + return this.$store.getters.getBackendPreference }, landingPage: function () { @@ -148,10 +157,16 @@ export default defineComponent({ }, backendNames: function () { - return [ - this.$t('Settings.General Settings.Preferred API Backend.Invidious API'), - this.$t('Settings.General Settings.Preferred API Backend.Local API') - ] + if (process.env.SUPPORTS_LOCAL_API) { + return [ + this.$t('Settings.General Settings.Preferred API Backend.Invidious API'), + this.$t('Settings.General Settings.Preferred API Backend.Local API') + ] + } else { + return [ + this.$t('Settings.General Settings.Preferred API Backend.Invidious API') + ] + } }, viewTypeNames: function () { diff --git a/src/renderer/components/player-settings/player-settings.js b/src/renderer/components/player-settings/player-settings.js index 2ff5b839a..c3d4ea78f 100644 --- a/src/renderer/components/player-settings/player-settings.js +++ b/src/renderer/components/player-settings/player-settings.js @@ -26,6 +26,7 @@ export default defineComponent({ }, data: function () { return { + usingElectron: process.env.IS_ELECTRON, formatValues: [ 'dash', 'legacy', @@ -60,10 +61,6 @@ export default defineComponent({ } }, computed: { - usingElectron: function () { - return process.env.IS_ELECTRON - }, - backendPreference: function () { return this.$store.getters.getBackendPreference }, @@ -286,7 +283,7 @@ export default defineComponent({ this.screenshotFilenameExample = `${res}.${this.screenshotFormat}` return true }).catch(err => { - this.screenshotFilenameExample = `❗ ${this.$t(`Settings.Player Settings.Screenshot.Error.${err.message}`)}` + this.screenshotFilenameExample = `❗ ${err.message}` return false }) }, diff --git a/src/renderer/components/privacy-settings/privacy-settings.js b/src/renderer/components/privacy-settings/privacy-settings.js index 8658a42d9..94ec93d8f 100644 --- a/src/renderer/components/privacy-settings/privacy-settings.js +++ b/src/renderer/components/privacy-settings/privacy-settings.js @@ -39,9 +39,6 @@ export default defineComponent({ saveVideoHistoryWithLastViewedPlaylist: function () { return this.$store.getters.getSaveVideoHistoryWithLastViewedPlaylist }, - removeVideoMetaFiles: function () { - return this.$store.getters.getRemoveVideoMetaFiles - }, profileList: function () { return this.$store.getters.getProfileList @@ -74,13 +71,6 @@ export default defineComponent({ this.updateRememberHistory(value) }, - handleVideoMetaFiles: function (value) { - if (!value) { - this.updateRemoveVideoMetaFiles(false) - } - this.updateRemoveVideoMetaFiles(value) - }, - handleRemoveHistory: function (option) { this.showRemoveHistoryPrompt = false @@ -126,7 +116,6 @@ export default defineComponent({ ...mapActions([ 'updateRememberHistory', - 'updateRemoveVideoMetaFiles', 'removeAllHistory', 'updateSaveWatchedProgress', 'updateSaveVideoHistoryWithLastViewedPlaylist', diff --git a/src/renderer/components/privacy-settings/privacy-settings.vue b/src/renderer/components/privacy-settings/privacy-settings.vue index 43ca939ad..53f944777 100644 --- a/src/renderer/components/privacy-settings/privacy-settings.vue +++ b/src/renderer/components/privacy-settings/privacy-settings.vue @@ -29,15 +29,6 @@ @change="updateSaveVideoHistoryWithLastViewedPlaylist" /> -
-
- {{ $t('Settings.Proxy Settings.Ip') }}: {{ proxyIp }} + {{ $t('Display Label', { label: $t('Settings.Proxy Settings.Ip'), value: proxyIp }) }}
- {{ $t('Settings.Proxy Settings.Country') }}: {{ proxyCountry }} + {{ $t('Display Label', { label: $t('Settings.Proxy Settings.Country'), value: proxyCountry }) }}
- {{ $t('Settings.Proxy Settings.Region') }}: {{ proxyRegion }} + {{ $t('Display Label', { label: $t('Settings.Proxy Settings.Region'), value: proxyRegion }) }}
- {{ $t('Settings.Proxy Settings.City') }}: {{ proxyCity }} + {{ $t('Display Label', { label: $t('Settings.Proxy Settings.City'), value: proxyCity }) }}
{
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendFallback && this.backendPreference === 'invidious') {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendFallback && this.backendPreference === 'invidious') {
showToast(this.$t('Falling back to Local API'))
this.getCommentDataLocal()
} else {
diff --git a/src/renderer/components/watch-video-info/watch-video-info.vue b/src/renderer/components/watch-video-info/watch-video-info.vue
index 76843dbb4..f5d36af02 100644
--- a/src/renderer/components/watch-video-info/watch-video-info.vue
+++ b/src/renderer/components/watch-video-info/watch-video-info.vue
@@ -90,7 +90,7 @@
{
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
this.getPlaylistInformationLocal()
} else {
diff --git a/src/renderer/helpers/api/invidious.js b/src/renderer/helpers/api/invidious.js
index b50c54ef4..2d5c9b726 100644
--- a/src/renderer/helpers/api/invidious.js
+++ b/src/renderer/helpers/api/invidious.js
@@ -321,10 +321,10 @@ export function filterInvidiousFormats(formats, allowAv1 = false) {
// Which is caused by Invidious API limitation on AV1 formats (see related issues)
// Commented code to be restored after Invidious issue fixed
//
- // As we generate our own DASH manifest (using YouTube.js) for multiple audio track support in Electron,
- // we can allow AV1 in that situation. If we aren't in electron,
+ // As we generate our own DASH manifest (using YouTube.js) for multiple audio track support when the local API is supported,
+ // we can allow AV1 in that situation. When the local API isn't supported,
// we still can't use them until Invidious fixes the issue on their side
- if (process.env.IS_ELECTRON && allowAv1 && av1Formats.length > 0) {
+ if (process.env.SUPPORTS_LOCAL_API && allowAv1 && av1Formats.length > 0) {
return [...audioFormats, ...av1Formats]
}
diff --git a/src/renderer/helpers/api/local.js b/src/renderer/helpers/api/local.js
index 5d14ba5bd..7b9947441 100644
--- a/src/renderer/helpers/api/local.js
+++ b/src/renderer/helpers/api/local.js
@@ -1,4 +1,4 @@
-import { ClientType, Endpoints, Innertube, Misc, Utils, YT } from 'youtubei.js'
+import { ClientType, Endpoints, Innertube, Misc, UniversalCache, Utils, YT } from 'youtubei.js'
import Autolinker from 'autolinker'
import { join } from 'path'
@@ -39,8 +39,12 @@ const TRACKING_PARAM_NAMES = [
async function createInnertube({ withPlayer = false, location = undefined, safetyMode = false, clientType = undefined, generateSessionLocally = true } = {}) {
let cache
if (withPlayer) {
- const userData = await getUserDataPath()
- cache = new PlayerCache(join(userData, 'player_cache'))
+ if (process.env.IS_ELECTRON) {
+ const userData = await getUserDataPath()
+ cache = new PlayerCache(join(userData, 'player_cache'))
+ } else {
+ cache = new UniversalCache(false)
+ }
}
return await Innertube.create({
@@ -77,8 +81,8 @@ export async function getLocalPlaylist(id) {
}
/**
- * @param {Playlist} playlist
- * @returns {Playlist|null} null when no valid playlist can be found (e.g. `empty continuation response`)
+ * @param {import('youtubei.js').YT.Playlist} playlist
+ * @returns {import('youtubei.js').YT.Playlist|null} null when no valid playlist can be found (e.g. `empty continuation response`)
*/
export async function getLocalPlaylistContinuation(playlist) {
try {
@@ -98,11 +102,11 @@ export async function getLocalPlaylistContinuation(playlist) {
* Callback for adding two numbers.
*
* @callback untilEndOfLocalPlayListCallback
- * @param {Playlist} playlist
+ * @param {import('youtubei.js').YT.Playlist} playlist
*/
/**
- * @param {Playlist} playlist
+ * @param {import('youtubei.js').YT.Playlist} playlist
* @param {untilEndOfLocalPlayListCallback} callback
* @param {object} options
* @param {boolean} options.runCallbackOnceFirst
@@ -331,7 +335,7 @@ export async function getLocalChannelLiveStreams(id) {
// it has some empty fields in the protobuf but it doesn't work if you remove them)
}))
- const liveStreamsTab = new YT.Channel(null, response)
+ let liveStreamsTab = new YT.Channel(innertube.actions, response)
const { id: channelId = id, name, thumbnailUrl } = parseLocalChannelHeader(liveStreamsTab)
let videos
@@ -339,7 +343,16 @@ export async function getLocalChannelLiveStreams(id) {
// if the channel doesn't have a live tab, YouTube returns the home tab instead
// so we need to check that we got the right tab
if (liveStreamsTab.current_tab?.endpoint.metadata.url?.endsWith('/streams')) {
- videos = parseLocalChannelVideos(liveStreamsTab.videos, channelId, name)
+ // work around YouTube bug where it will return a bunch of responses with only continuations in them
+ // e.g. https://www.youtube.com/@TWLIVES/streams
+
+ let tempVideos = liveStreamsTab.videos
+ while (tempVideos.length === 0 && liveStreamsTab.has_continuation) {
+ liveStreamsTab = await liveStreamsTab.getContinuation()
+ tempVideos = liveStreamsTab.videos
+ }
+
+ videos = parseLocalChannelVideos(tempVideos, channelId, name)
} else {
videos = []
}
@@ -513,7 +526,13 @@ export function parseLocalChannelHeader(channel) {
}
if (header.content.metadata) {
- subscriberText = header.content.metadata.metadata_rows[0].metadata_parts[1].text.text
+ // YouTube has already changed the indexes for where the information is stored once,
+ // so we should search for it instead of using hardcoded indexes, just to be safe for the future
+
+ subscriberText = header.content.metadata.metadata_rows
+ .flatMap(row => row.metadata_parts ? row.metadata_parts : [])
+ .find(part => part.text.text?.includes('subscriber'))
+ ?.text.text
}
break
@@ -567,51 +586,66 @@ export function parseLocalChannelShorts(shorts, channelId, channelName) {
}
/**
- * @typedef {import('youtubei.js').YTNodes.Playlist} Playlist
- * @typedef {import('youtubei.js').YTNodes.GridPlaylist} GridPlaylist
- */
-
-/**
- * @param {Playlist|GridPlaylist} playlist
+ * @param {import('youtubei.js').YTNodes.Playlist|import('youtubei.js').YTNodes.GridPlaylist|import('youtubei.js').YTNodes.LockupView} playlist
* @param {string} channelId
* @param {string} chanelName
*/
export function parseLocalListPlaylist(playlist, channelId = undefined, channelName = undefined) {
- let internalChannelName
- let internalChannelId = null
+ if (playlist.type === 'LockupView') {
+ /** @type {import('youtubei.js').YTNodes.LockupView} */
+ const lockupView = playlist
- if (playlist.author && playlist.author.id !== 'N/A') {
- if (playlist.author instanceof Misc.Text) {
- internalChannelName = playlist.author.text
+ /** @type {import('youtubei.js').YTNodes.ThumbnailOverlayBadgeView} */
+ const thumbnailOverlayBadgeView = lockupView.content_image.primary_thumbnail.overlays
+ .find(overlay => overlay.type === 'ThumbnailOverlayBadgeView')
- if (channelId) {
- internalChannelId = channelId
- }
- } else {
- internalChannelName = playlist.author.name
- internalChannelId = playlist.author.id
+ return {
+ type: 'playlist',
+ dataSource: 'local',
+ title: lockupView.metadata.title.text,
+ thumbnail: lockupView.content_image.primary_thumbnail.image[0].url,
+ channelName,
+ channelId,
+ playlistId: lockupView.content_id,
+ videoCount: extractNumberFromString(thumbnailOverlayBadgeView.badges[0].text)
}
- } else if (channelId || channelName) {
- internalChannelName = channelName
- internalChannelId = channelId
- } else if (playlist.author?.name) {
- // auto-generated album playlists don't have an author
- // so in search results, the author text is "Playlist" and doesn't have a link or channel ID
- internalChannelName = playlist.author.name
- }
+ } else {
+ let internalChannelName
+ let internalChannelId = null
- /** @type {import('youtubei.js').YTNodes.PlaylistVideoThumbnail} */
- const thumbnailRenderer = playlist.thumbnail_renderer
+ if (playlist.author && playlist.author.id !== 'N/A') {
+ if (playlist.author instanceof Misc.Text) {
+ internalChannelName = playlist.author.text
- return {
- type: 'playlist',
- dataSource: 'local',
- title: playlist.title.text,
- thumbnail: thumbnailRenderer ? thumbnailRenderer.thumbnail[0].url : playlist.thumbnails[0].url,
- channelName: internalChannelName,
- channelId: internalChannelId,
- playlistId: playlist.id,
- videoCount: extractNumberFromString(playlist.video_count.text)
+ if (channelId) {
+ internalChannelId = channelId
+ }
+ } else {
+ internalChannelName = playlist.author.name
+ internalChannelId = playlist.author.id
+ }
+ } else if (channelId || channelName) {
+ internalChannelName = channelName
+ internalChannelId = channelId
+ } else if (playlist.author?.name) {
+ // auto-generated album playlists don't have an author
+ // so in search results, the author text is "Playlist" and doesn't have a link or channel ID
+ internalChannelName = playlist.author.name
+ }
+
+ /** @type {import('youtubei.js').YTNodes.PlaylistVideoThumbnail} */
+ const thumbnailRenderer = playlist.thumbnail_renderer
+
+ return {
+ type: 'playlist',
+ dataSource: 'local',
+ title: playlist.title.text,
+ thumbnail: thumbnailRenderer ? thumbnailRenderer.thumbnail[0].url : playlist.thumbnails[0].url,
+ channelName: internalChannelName,
+ channelId: internalChannelId,
+ playlistId: playlist.id,
+ videoCount: extractNumberFromString(playlist.video_count.text)
+ }
}
}
@@ -738,7 +772,7 @@ export function parseLocalListVideo(item) {
let publishedText
- if (!video.published?.isEmpty()) {
+ if (video.published != null && !video.published.isEmpty()) {
publishedText = video.published.text
}
@@ -834,7 +868,7 @@ function parseListItem(item) {
export function parseLocalWatchNextVideo(video) {
let publishedText
- if (!video.published?.isEmpty()) {
+ if (video.published != null && !video.published.isEmpty()) {
publishedText = video.published.text
}
@@ -1023,7 +1057,7 @@ export function mapLocalFormat(format) {
}
/**
- * @param {import('youtubei.js').YTNodes.Comment} comment
+ * @param {import('youtubei.js').YTNodes.Comment|import('youtubei.js').YTNodes.CommentView} comment
* @param {import('youtubei.js').YTNodes.CommentThread} commentThread
*/
export function parseLocalComment(comment, commentThread = undefined) {
@@ -1035,26 +1069,48 @@ export function parseLocalComment(comment, commentThread = undefined) {
replyToken = commentThread
}
- return {
+ const parsed = {
dataType: 'local',
authorLink: comment.author.id,
author: comment.author.name,
authorId: comment.author.id,
authorThumb: comment.author.best_thumbnail.url,
isPinned: comment.is_pinned,
- isOwner: comment.author_is_channel_owner,
- isMember: comment.is_member,
- memberIconUrl: comment.is_member ? comment.sponsor_comment_badge.custom_badge[0].url : '',
+ isOwner: !!comment.author_is_channel_owner,
+ isMember: !!comment.is_member,
text: Autolinker.link(parseLocalTextRuns(comment.content.runs, 16, { looseChannelNameDetection: true })),
- time: toLocalePublicationString({ publishText: comment.published.text.replace('(edited)', '').trim() }),
- likes: comment.vote_count,
- isHearted: comment.is_hearted,
- numReplies: comment.reply_count,
+ isHearted: !!comment.is_hearted,
hasOwnerReplied,
replyToken,
showReplies: false,
- replies: []
+ replies: [],
+
+ // default values for the properties set below
+ memberIconUrl: '',
+ time: '',
+ likes: 0,
+ numReplies: 0
}
+
+ if (comment.type === 'Comment') {
+ /** @type {import('youtubei.js').YTNodes.Comment} */
+ const comment_ = comment
+
+ parsed.memberIconUrl = comment_.is_member ? comment_.sponsor_comment_badge.custom_badge[0].url : ''
+ parsed.time = toLocalePublicationString({ publishText: comment_.published.text.replace('(edited)', '').trim() })
+ parsed.likes = comment_.vote_count
+ parsed.numReplies = comment_.reply_count
+ } else {
+ /** @type {import('youtubei.js').YTNodes.CommentView} */
+ const commentView = comment
+
+ parsed.memberIconUrl = commentView.is_member ? commentView.member_badge.url : ''
+ parsed.time = toLocalePublicationString({ publishText: commentView.published_time.replace('(edited)', '').trim() })
+ parsed.likes = commentView.like_count
+ parsed.numReplies = parseLocalSubscriberCount(commentView.reply_count)
+ }
+
+ return parsed
}
/**
@@ -1088,32 +1144,40 @@ export function filterLocalFormats(formats, allowAv1 = false) {
}
/**
- * Really not a fan of this :(, YouTube returns the subscribers as "15.1M subscribers"
- * so we have to parse it somehow
* @param {string} text
*/
export function parseLocalSubscriberCount(text) {
- const match = text
- .replace(',', '.')
- .toUpperCase()
- .match(/([\d.]+)\s*([KM]?)/)
+ const match = text.match(/(\d+)(?:[,.](\d+))?\s?([BKMbkm])\b/)
- let subscribers
if (match) {
- subscribers = parseFloat(match[1])
+ let multiplier = 0
- if (match[2] === 'K') {
- subscribers *= 1000
- } else if (match[2] === 'M') {
- subscribers *= 1000_000
+ switch (match[3]) {
+ case 'K':
+ case 'k':
+ multiplier = 3
+ break
+ case 'M':
+ case 'm':
+ multiplier = 6
+ break
+ case 'B':
+ case 'b':
+ multiplier = 9
+ break
}
- subscribers = Math.trunc(subscribers)
- } else {
- subscribers = extractNumberFromString(text)
- }
+ let parsedDecimals
+ if (typeof match[2] === 'undefined') {
+ parsedDecimals = '0'.repeat(multiplier)
+ } else {
+ parsedDecimals = match[2].padEnd(multiplier, '0')
+ }
- return subscribers
+ return parseInt(match[1] + parsedDecimals)
+ } else {
+ return extractNumberFromString(text)
+ }
}
/**
diff --git a/src/renderer/helpers/channels.js b/src/renderer/helpers/channels.js
index 888c13178..e343bdbac 100644
--- a/src/renderer/helpers/channels.js
+++ b/src/renderer/helpers/channels.js
@@ -11,7 +11,7 @@ import { getLocalChannel } from './api/local'
*/
async function findChannelById(id, backendOptions) {
try {
- if (!process.env.IS_ELECTRON || backendOptions.preference === 'invidious') {
+ if (!process.env.SUPPORTS_LOCAL_API || backendOptions.preference === 'invidious') {
return await invidiousGetChannelInfo(id)
} else {
return await getLocalChannel(id)
@@ -21,7 +21,7 @@ async function findChannelById(id, backendOptions) {
if (err.message && err.message === 'This channel does not exist.') {
return { invalid: true }
}
- if (process.env.IS_ELECTRON && backendOptions.fallback) {
+ if (process.env.SUPPORTS_LOCAL_API && backendOptions.fallback) {
if (backendOptions.preference === 'invidious') {
return await getLocalChannel(id)
}
@@ -46,7 +46,7 @@ export async function findChannelTagInfo(id, backendOptions) {
if (!checkYoutubeChannelId(id)) return { invalidId: true }
try {
const channel = await findChannelById(id, backendOptions)
- if (!process.env.IS_ELECTRON || backendOptions.preference === 'invidious') {
+ if (!process.env.SUPPORTS_LOCAL_API || backendOptions.preference === 'invidious') {
if (channel.invalid) return { invalidId: true }
return {
preferredName: channel.author,
diff --git a/src/renderer/helpers/colors.js b/src/renderer/helpers/colors.js
index e09fbdd86..eb58004a0 100644
--- a/src/renderer/helpers/colors.js
+++ b/src/renderer/helpers/colors.js
@@ -1,3 +1,5 @@
+import i18n from '../i18n/index'
+
export const colors = [
{ name: 'Red', value: '#d50000' },
{ name: 'Pink', value: '#C51162' },
@@ -38,14 +40,55 @@ export const colors = [
{ name: 'CatppuccinMochaLavender', value: '#B4BEFE' }
]
+export function getColorTranslations() {
+ return [
+ i18n.t('Settings.Theme Settings.Main Color Theme.Red'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Pink'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Purple'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Deep Purple'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Indigo'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Blue'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Light Blue'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Cyan'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Teal'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Green'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Light Green'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Lime'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Yellow'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Amber'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Orange'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Deep Orange'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Cyan'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Green'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Orange'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Pink'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Purple'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Red'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Dracula Yellow'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Rosewater'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Flamingo'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Pink'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Mauve'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Red'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Maroon'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Peach'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Yellow'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Green'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Teal'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sky'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Sapphire'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Blue'),
+ i18n.t('Settings.Theme Settings.Main Color Theme.Catppuccin Mocha Lavender')
+ ]
+}
+
export function getRandomColorClass() {
- const randomInt = Math.floor(Math.random() * colors.length)
- return 'main' + colors[randomInt].name
+ return 'main' + getRandomColor().name
}
export function getRandomColor() {
const randomInt = Math.floor(Math.random() * colors.length)
- return colors[randomInt].value
+ return colors[randomInt]
}
export function calculateColorLuminance(colorValue) {
diff --git a/src/renderer/helpers/strings.js b/src/renderer/helpers/strings.js
index f83a0ea11..255630484 100644
--- a/src/renderer/helpers/strings.js
+++ b/src/renderer/helpers/strings.js
@@ -23,3 +23,32 @@ export function isKeyboardEventKeyPrintableChar(eventKey) {
return false
}
+
+export function translateWindowTitle(title, i18n) {
+ switch (title) {
+ case 'Subscriptions':
+ return i18n.t('Subscriptions.Subscriptions')
+ case 'Channels':
+ return i18n.t('Channels.Title')
+ case 'Trending':
+ return i18n.t('Trending.Trending')
+ case 'Most Popular':
+ return i18n.t('Most Popular')
+ case 'Your Playlists':
+ return i18n.t('User Playlists.Your Playlists')
+ case 'History':
+ return i18n.t('History.History')
+ case 'Settings':
+ return i18n.t('Settings.Settings')
+ case 'About':
+ return i18n.t('About.About')
+ case 'Profile Settings':
+ return i18n.t('Profile.Profile Settings')
+ case 'Search Results':
+ return i18n.t('Search Filters.Search Results')
+ case 'Playlist':
+ return i18n.t('Playlist.Playlist')
+ default:
+ return null
+ }
+}
diff --git a/src/renderer/helpers/utils.js b/src/renderer/helpers/utils.js
index fd3016062..1a0850e07 100644
--- a/src/renderer/helpers/utils.js
+++ b/src/renderer/helpers/utils.js
@@ -92,43 +92,67 @@ export function toLocalePublicationString ({ publishText, isLive = false, isUpco
const match = publishText.match(PUBLISHED_TEXT_REGEX)
const singular = (match[1] === '1')
- let translationKey = ''
+ let unit = ''
switch (match[2].substring(0, 2)) {
case 'se':
case 's':
- translationKey = 'Video.Published.Second'
+ if (singular) {
+ unit = i18n.t('Video.Published.Second')
+ } else {
+ unit = i18n.t('Video.Published.Seconds')
+ }
break
case 'mi':
case 'm':
- translationKey = 'Video.Published.Minute'
+ if (singular) {
+ unit = i18n.t('Video.Published.Minute')
+ } else {
+ unit = i18n.t('Video.Published.Minutes')
+ }
break
case 'ho':
case 'h':
- translationKey = 'Video.Published.Hour'
+ if (singular) {
+ unit = i18n.t('Video.Published.Hour')
+ } else {
+ unit = i18n.t('Video.Published.Hours')
+ }
break
case 'da':
case 'd':
- translationKey = 'Video.Published.Day'
+ if (singular) {
+ unit = i18n.t('Video.Published.Day')
+ } else {
+ unit = i18n.t('Video.Published.Days')
+ }
break
case 'we':
case 'w':
- translationKey = 'Video.Published.Week'
+ if (singular) {
+ unit = i18n.t('Video.Published.Week')
+ } else {
+ unit = i18n.t('Video.Published.Weeks')
+ }
break
case 'mo':
- translationKey = 'Video.Published.Month'
+ if (singular) {
+ unit = i18n.t('Video.Published.Month')
+ } else {
+ unit = i18n.t('Video.Published.Months')
+ }
break
case 'ye':
case 'y':
- translationKey = 'Video.Published.Year'
+ if (singular) {
+ unit = i18n.t('Video.Published.Year')
+ } else {
+ unit = i18n.t('Video.Published.Years')
+ }
break
default:
return publishText
}
- if (!singular) {
- translationKey += 's'
- }
- const unit = i18n.t(translationKey)
return i18n.t('Video.Publicationtemplate', { number: match[1], unit })
}
@@ -574,8 +598,7 @@ export function extractNumberFromString(str) {
}
}
-export function showExternalPlayerUnsupportedActionToast(externalPlayer, actionName) {
- const action = i18n.t(`Video.External Player.Unsupported Actions.${actionName}`)
+export function showExternalPlayerUnsupportedActionToast(externalPlayer, action) {
const message = i18n.t('Video.External Player.UnsupportedActionTemplate', { externalPlayer, action })
showToast(message)
}
diff --git a/src/renderer/i18n/index.js b/src/renderer/i18n/index.js
index a91568be6..454c439aa 100644
--- a/src/renderer/i18n/index.js
+++ b/src/renderer/i18n/index.js
@@ -8,7 +8,20 @@ Vue.use(VueI18n)
const i18n = new VueI18n({
locale: 'en-US',
- fallbackLocale: { default: 'en-US' }
+ fallbackLocale: {
+ // https://kazupon.github.io/vue-i18n/guide/fallback.html#explicit-fallback-with-decision-maps
+
+ // es_AR -> es -> en-US
+ es_AR: ['es'],
+ // es-MX -> es -> en-US
+ 'es-MX': ['es'],
+ // pt-BR -> pt -> en-US
+ 'pt-BR': ['pt'],
+ // pt-PT -> pt -> en-US
+ 'pt-PT': ['pt'],
+ // any -> en-US
+ default: ['en-US'],
+ }
})
export async function loadLocale(locale) {
@@ -18,6 +31,7 @@ export async function loadLocale(locale) {
}
if (!activeLocales.includes(locale)) {
console.error(`Unable to load unknown locale: "${locale}"`)
+ return
}
// locales are only compressed in our production Electron builds
@@ -45,6 +59,4 @@ export async function loadLocale(locale) {
}
}
-loadLocale('en-US')
-
export default i18n
diff --git a/src/renderer/main.js b/src/renderer/main.js
index 6a5cd9136..11d878908 100644
--- a/src/renderer/main.js
+++ b/src/renderer/main.js
@@ -63,7 +63,6 @@ import {
faShareAlt,
faSlidersH,
faSortDown,
- faStar,
faStepBackward,
faStepForward,
faSync,
@@ -143,7 +142,6 @@ library.add(
faShareAlt,
faSlidersH,
faSortDown,
- faStar,
faStepBackward,
faStepForward,
faSync,
diff --git a/src/renderer/router/index.js b/src/renderer/router/index.js
index bce2ce775..2185a7d48 100644
--- a/src/renderer/router/index.js
+++ b/src/renderer/router/index.js
@@ -23,7 +23,7 @@ const router = new Router({
path: '/',
name: 'default',
meta: {
- title: 'Subscriptions.Subscriptions'
+ title: 'Subscriptions'
},
component: Subscriptions
},
@@ -31,7 +31,7 @@ const router = new Router({
path: '/subscriptions',
name: 'subscriptions',
meta: {
- title: 'Subscriptions.Subscriptions'
+ title: 'Subscriptions'
},
component: Subscriptions
},
@@ -39,7 +39,7 @@ const router = new Router({
path: '/subscribedchannels',
name: 'subscribedChannels',
meta: {
- title: 'Channels.Title'
+ title: 'Channels'
},
component: SubscribedChannels
},
@@ -47,7 +47,7 @@ const router = new Router({
path: '/trending',
name: 'trending',
meta: {
- title: 'Trending.Trending'
+ title: 'Trending'
},
component: Trending
},
@@ -63,7 +63,7 @@ const router = new Router({
path: '/userplaylists',
name: 'userPlaylists',
meta: {
- title: 'User Playlists.Your Playlists'
+ title: 'Your Playlists'
},
component: UserPlaylists
},
@@ -71,7 +71,7 @@ const router = new Router({
path: '/history',
name: 'history',
meta: {
- title: 'History.History'
+ title: 'History'
},
component: History
},
@@ -79,7 +79,7 @@ const router = new Router({
path: '/settings',
name: 'settings',
meta: {
- title: 'Settings.Settings'
+ title: 'Settings'
},
component: Settings
},
@@ -87,7 +87,7 @@ const router = new Router({
path: '/about',
name: 'about',
meta: {
- title: 'About.About'
+ title: 'About'
},
component: About
},
@@ -95,21 +95,21 @@ const router = new Router({
path: '/settings/profile',
name: 'profileSettings',
meta: {
- title: 'Profile.Profile Settings'
+ title: 'Profile Settings'
},
component: ProfileSettings
},
{
path: '/search/:query',
meta: {
- title: 'Search Filters.Search Results'
+ title: 'Search Results'
},
component: Search
},
{
path: '/playlist/:id',
meta: {
- title: 'Playlist.Playlist'
+ title: 'Playlist'
},
component: Playlist
},
diff --git a/src/renderer/scss-partials/_ft-list-item.scss b/src/renderer/scss-partials/_ft-list-item.scss
index 624d21093..22be37765 100644
--- a/src/renderer/scss-partials/_ft-list-item.scss
+++ b/src/renderer/scss-partials/_ft-list-item.scss
@@ -366,7 +366,7 @@ $watched-transition-duration: 0.5s;
&:has(:focus-visible) .addToPlaylistIcon:not(.alwaysVisible),
&:has(:focus-visible) .quickBookmarkVideoIcon:not(.alwaysVisible),
&:has(:focus-visible) .externalPlayerIcon {
- opacity: $thumbnail-overlay-opacity;
+ opacity: 1;
}
&:hover .optionsButton,
@@ -386,45 +386,6 @@ $watched-transition-duration: 0.5s;
}
}
-.ft-list-channel {
- .infoAndSubscribe {
- display: flex;
- flex-flow: row wrap;
- justify-content: center;
- inline-size: 100%;
- }
-
- &.grid {
- align-items: center;
- text-align: center;
-
- .infoAndSubscribe {
- flex-flow: column wrap;
- align-items: center;
-
- .info {
- margin-block-end: 12px;
-
- .infoLine {
- text-align: center;
- }
- }
- }
- }
-
- &.list {
- .infoAndSubscribe {
- flex-flow: row wrap;
- justify-content: center;
-
- .channelSubscribeButton {
- margin-block: auto;
- margin-inline: 7px;
- }
- }
- }
-}
-
.videoWatched,
.live,
.upcoming {
diff --git a/src/renderer/store/modules/invidious.js b/src/renderer/store/modules/invidious.js
index b7b9aa414..90cdc1f90 100644
--- a/src/renderer/store/modules/invidious.js
+++ b/src/renderer/store/modules/invidious.js
@@ -28,7 +28,7 @@ const actions = {
return !(instance[0].includes('.onion') ||
instance[0].includes('.i2p') ||
!instance[1].api ||
- (!process.env.IS_ELECTRON && !instance[1].cors))
+ (!process.env.SUPPORTS_LOCAL_API && !instance[1].cors))
}).map((instance) => {
return instance[1].uri.replace(/\/$/, '')
})
@@ -50,7 +50,7 @@ const actions = {
console.warn('reading static file for invidious instances')
const fileData = process.env.IS_ELECTRON ? await fs.readFile(filePath, 'utf8') : await (await fetch(createWebURL(filePath))).text()
instances = JSON.parse(fileData).filter(e => {
- return process.env.IS_ELECTRON || e.cors
+ return process.env.SUPPORTS_LOCAL_API || e.cors
}).map(e => {
return e.url
})
diff --git a/src/renderer/store/modules/profiles.js b/src/renderer/store/modules/profiles.js
index 02630feff..34574b4df 100644
--- a/src/renderer/store/modules/profiles.js
+++ b/src/renderer/store/modules/profiles.js
@@ -54,7 +54,7 @@ const actions = {
if (profiles.length === 0) {
// Create a default profile and persist it
- const randomColor = getRandomColor()
+ const randomColor = getRandomColor().value
const textColor = calculateColorLuminance(randomColor)
const defaultProfile = {
_id: MAIN_PROFILE_ID,
diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js
index e510dbea0..7aa40616c 100644
--- a/src/renderer/store/modules/settings.js
+++ b/src/renderer/store/modules/settings.js
@@ -165,8 +165,8 @@ const state = {
allSettingsSectionsExpandedByDefault: false,
autoplayPlaylists: true,
autoplayVideos: true,
- backendFallback: process.env.IS_ELECTRON,
- backendPreference: !process.env.IS_ELECTRON ? 'invidious' : 'local',
+ backendFallback: process.env.SUPPORTS_LOCAL_API,
+ backendPreference: !process.env.SUPPORTS_LOCAL_API ? 'invidious' : 'local',
barColor: false,
checkForBlogPosts: true,
checkForUpdates: true,
@@ -237,10 +237,9 @@ const state = {
proxyHostname: '127.0.0.1',
proxyPort: '9050',
proxyProtocol: 'socks5',
- proxyVideos: !process.env.IS_ELECTRON,
+ proxyVideos: !process.env.SUPPORTS_LOCAL_API,
region: 'US',
rememberHistory: true,
- removeVideoMetaFiles: true,
saveWatchedProgress: true,
saveVideoHistoryWithLastViewedPlaylist: true,
showFamilyFriendlyOnly: false,
@@ -353,7 +352,34 @@ const stateWithSideEffects = {
}
}
- await loadLocale(targetLocale)
+ const loadPromises = []
+
+ if (targetLocale !== defaultLocale) {
+ // "en-US" is used as a fallback for missing strings in other locales
+ loadPromises.push(
+ loadLocale(defaultLocale)
+ )
+ }
+
+ // "es" is used as a fallback for "es_AR" and "es-MX"
+ if (targetLocale === 'es_AR' || targetLocale === 'es-MX') {
+ loadPromises.push(
+ loadLocale('es')
+ )
+ }
+
+ // "pt" is used as a fallback for "pt-PT" and "pt-BR"
+ if (targetLocale === 'pt-PT' || targetLocale === 'pt-BR') {
+ loadPromises.push(
+ loadLocale('pt')
+ )
+ }
+
+ loadPromises.push(
+ loadLocale(targetLocale)
+ )
+
+ await Promise.allSettled(loadPromises)
i18n.locale = targetLocale
await dispatch('getRegionData', {
diff --git a/src/renderer/store/modules/subscriptions.js b/src/renderer/store/modules/subscriptions.js
index c85168423..2ce05c7b6 100644
--- a/src/renderer/store/modules/subscriptions.js
+++ b/src/renderer/store/modules/subscriptions.js
@@ -1,9 +1,3 @@
-import { deepCopy } from '../../helpers/utils'
-
-const defaultCacheEntryValueForForOneChannel = {
- videos: null,
-}
-
const state = {
videoCache: {},
liveCache: {},
@@ -77,7 +71,7 @@ const actions = {
const mutations = {
updateVideoCacheByChannel(state, { channelId, videos }) {
const existingObject = state.videoCache[channelId]
- const newObject = existingObject != null ? existingObject : deepCopy(defaultCacheEntryValueForForOneChannel)
+ const newObject = existingObject ?? { videos: null }
if (videos != null) { newObject.videos = videos }
state.videoCache[channelId] = newObject
},
@@ -86,7 +80,7 @@ const mutations = {
},
updateShortsCacheByChannel(state, { channelId, videos }) {
const existingObject = state.shortsCache[channelId]
- const newObject = existingObject != null ? existingObject : deepCopy(defaultCacheEntryValueForForOneChannel)
+ const newObject = existingObject ?? { videos: null }
if (videos != null) { newObject.videos = videos }
state.shortsCache[channelId] = newObject
},
@@ -120,7 +114,7 @@ const mutations = {
},
updateLiveCacheByChannel(state, { channelId, videos }) {
const existingObject = state.liveCache[channelId]
- const newObject = existingObject != null ? existingObject : deepCopy(defaultCacheEntryValueForForOneChannel)
+ const newObject = existingObject ?? { videos: null }
if (videos != null) { newObject.videos = videos }
state.liveCache[channelId] = newObject
},
@@ -129,7 +123,7 @@ const mutations = {
},
updatePostsCacheByChannel(state, { channelId, posts }) {
const existingObject = state.postsCache[channelId]
- const newObject = existingObject != null ? existingObject : deepCopy(defaultCacheEntryValueForForOneChannel)
+ const newObject = existingObject ?? { posts: null }
if (posts != null) { newObject.posts = posts }
state.postsCache[channelId] = newObject
},
diff --git a/src/renderer/store/modules/utils.js b/src/renderer/store/modules/utils.js
index 243520044..0a52ca7c4 100644
--- a/src/renderer/store/modules/utils.js
+++ b/src/renderer/store/modules/utils.js
@@ -47,7 +47,6 @@ const state = {
duration: ''
},
externalPlayerNames: [],
- externalPlayerNameTranslationKeys: [],
externalPlayerValues: [],
externalPlayerCmdArguments: {}
}
@@ -133,10 +132,6 @@ const getters = {
return state.externalPlayerNames
},
- getExternalPlayerNameTranslationKeys () {
- return state.externalPlayerNameTranslationKeys
- },
-
getExternalPlayerValues () {
return state.externalPlayerValues
},
@@ -262,7 +257,7 @@ const actions = {
}
if (parsedString !== replaceFilenameForbiddenChars(parsedString)) {
- reject(new Error('Forbidden Characters')) // use message as translation key
+ reject(new Error(i18n.t('Settings.Player Settings.Screenshot.Error.Forbidden Characters')))
}
let filename
@@ -274,7 +269,7 @@ const actions = {
}
if (!filename) {
- reject(new Error('Empty File Name'))
+ reject(new Error(i18n.t('Settings.Player Settings.Screenshot.Error.Empty File Name')))
}
resolve(parsedString)
@@ -603,7 +598,7 @@ const actions = {
const fileData = await fs.readFile(`${fileLocation}${fileName}`)
const externalPlayerMap = JSON.parse(fileData).map((entry) => {
- return { name: entry.name, nameTranslationKey: entry.nameTranslationKey, value: entry.value, cmdArguments: entry.cmdArguments }
+ return { name: entry.name, value: entry.value, cmdArguments: entry.cmdArguments }
})
// Sort external players alphabetically & case-insensitive, keep default entry at the top
const playerNone = externalPlayerMap.shift()
@@ -611,7 +606,6 @@ const actions = {
externalPlayerMap.unshift(playerNone)
const externalPlayerNames = externalPlayerMap.map((entry) => { return entry.name })
- const externalPlayerNameTranslationKeys = externalPlayerMap.map((entry) => { return entry.nameTranslationKey })
const externalPlayerValues = externalPlayerMap.map((entry) => { return entry.value })
const externalPlayerCmdArguments = externalPlayerMap.reduce((result, item) => {
result[item.value] = item.cmdArguments
@@ -619,7 +613,6 @@ const actions = {
}, {})
commit('setExternalPlayerNames', externalPlayerNames)
- commit('setExternalPlayerNameTranslationKeys', externalPlayerNameTranslationKeys)
commit('setExternalPlayerValues', externalPlayerValues)
commit('setExternalPlayerCmdArguments', externalPlayerCmdArguments)
},
@@ -667,7 +660,7 @@ const actions = {
args.push(cmdArgs.startOffset, Math.trunc(payload.watchProgress))
}
} else if (!ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'starting video at offset')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.starting video at offset'))
}
}
@@ -675,7 +668,7 @@ const actions = {
if (typeof cmdArgs.playbackRate === 'string') {
args.push(`${cmdArgs.playbackRate}${payload.playbackRate}`)
} else if (!ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'setting a playback rate')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.setting a playback rate'))
}
}
@@ -685,7 +678,7 @@ const actions = {
if (typeof cmdArgs.playlistIndex === 'string') {
args.push(`${cmdArgs.playlistIndex}${payload.playlistIndex}`)
} else if (!ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'opening specific video in a playlist (falling back to opening the video)')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.opening specific video in a playlist (falling back to opening the video)'))
}
}
@@ -693,7 +686,7 @@ const actions = {
if (typeof cmdArgs.playlistReverse === 'string') {
args.push(cmdArgs.playlistReverse)
} else if (!ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'reversing playlists')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.reversing playlists'))
}
}
@@ -701,7 +694,7 @@ const actions = {
if (typeof cmdArgs.playlistShuffle === 'string') {
args.push(cmdArgs.playlistShuffle)
} else if (!ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'shuffling playlists')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.shuffling playlists'))
}
}
@@ -709,7 +702,7 @@ const actions = {
if (typeof cmdArgs.playlistLoop === 'string') {
args.push(cmdArgs.playlistLoop)
} else if (!ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'looping playlists')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.looping playlists'))
}
}
@@ -721,7 +714,7 @@ const actions = {
}
} else {
if (payload.playlistId != null && payload.playlistId !== '' && !ignoreWarnings) {
- showExternalPlayerUnsupportedActionToast(externalPlayer, 'opening playlists')
+ showExternalPlayerUnsupportedActionToast(externalPlayer, i18n.t('Video.External Player.Unsupported Actions.opening playlists'))
}
if (payload.videoId != null) {
args.push(`${cmdArgs.videoUrl}https://www.youtube.com/watch?v=${payload.videoId}`)
@@ -874,10 +867,6 @@ const mutations = {
state.externalPlayerNames = value
},
- setExternalPlayerNameTranslationKeys (state, value) {
- state.externalPlayerNameTranslationKeys = value
- },
-
setExternalPlayerValues (state, value) {
state.externalPlayerValues = value
},
diff --git a/src/renderer/themes.css b/src/renderer/themes.css
index fd100cc5f..f5e279ae5 100644
--- a/src/renderer/themes.css
+++ b/src/renderer/themes.css
@@ -72,7 +72,7 @@
--primary-shadow-color: rgba(232, 232, 232, 1);
--title-color: #3f7ac6;
--bg-color: #f1f1f1;
- --favorite-icon-color: #FFD600;
+ --favorite-icon-color: #00CC00;
--card-bg-color: #FFFFFF;
--secondary-card-bg-color: #eeeeee;
--scrollbar-color: #CCCCCC;
@@ -89,7 +89,7 @@
--tertiary-text-color: #999;
--title-color: #EEEEEE;
--bg-color: #212121;
- --favorite-icon-color: #FFEA00;
+ --favorite-icon-color: #00FF00;
--card-bg-color: #303030;
--secondary-card-bg-color: rgba(0, 0, 0, 0.75);
--scrollbar-color: #414141;
@@ -106,7 +106,7 @@
--tertiary-text-color: #EEEEEE;
--title-color: #EEEEEE;
--bg-color: #000000;
- --favorite-icon-color: #FFEA00;
+ --favorite-icon-color: #00FF00;
--card-bg-color: #000000;
--secondary-card-bg-color: rgba(0, 0, 0, 0.75);
--scrollbar-color: #515151;
@@ -137,7 +137,7 @@
--tertiary-text-color: #e5e8f3;
--title-color: #BD93F9;
--bg-color: #282A36;
- --favorite-icon-color: #F1FA8C;
+ --favorite-icon-color: #00FF00;
--card-bg-color: #33353F;
--secondary-card-bg-color: #282A36;
--scrollbar-color: #44475A;
@@ -156,7 +156,7 @@
--tertiary-text-color: #a6adc8;
--title-color: var(--accent-color);
--bg-color: #1e1e2e;
- --favorite-icon-color: #f9e2af;
+ --favorite-icon-color: #00FF00;
--card-bg-color: #181825;
--secondary-card-bg-color: #1e1e2e;
--scrollbar-color: #313244;
@@ -197,7 +197,7 @@
--tertiary-text-color: #FFFF;
--title-color: #000000;
--bg-color: #ff008a;
- --favorite-icon-color: #FFEA00;
+ --favorite-icon-color: #00FF00;
--card-bg-color: #DE1C85;
--secondary-card-bg-color: rgba(0, 0, 0, 0.75);
--scrollbar-color: #FFFFFF;
@@ -248,7 +248,7 @@ it can be safely elided. This looks quite pleasant on this theme. */
--tertiary-text-color: #EEEEEE;
--title-color: #EEEEEE;
--bg-color: #2b2f3a;
- --favorite-icon-color: #FFEA00;
+ --favorite-icon-color: #00FF00;
--card-bg-color: #2e3440;
--secondary-card-bg-color: rgba(59, 66, 82, 0.75);
--scrollbar-color: #4b566a;
diff --git a/src/renderer/views/Channel/Channel.js b/src/renderer/views/Channel/Channel.js
index 7ea6c27e5..5f17b1920 100644
--- a/src/renderer/views/Channel/Channel.js
+++ b/src/renderer/views/Channel/Channel.js
@@ -105,15 +105,11 @@ export default defineComponent({
errorMessage: '',
showSearchBar: true,
showShareMenu: true,
- videoLiveSelectValues: [
+ videoLiveShortSelectValues: [
'newest',
'popular',
'oldest'
],
- shortSelectValues: [
- 'newest',
- 'popular'
- ],
playlistSelectValues: [
'newest',
'last'
@@ -184,7 +180,7 @@ export default defineComponent({
return profileList[0].subscriptions.some((channel) => channel.id === this.id)
},
- videoLiveSelectNames: function () {
+ videoLiveShortSelectNames: function () {
return [
this.$t('Channel.Videos.Sort Types.Newest'),
this.$t('Channel.Videos.Sort Types.Most Popular'),
@@ -192,13 +188,6 @@ export default defineComponent({
]
},
- shortSelectNames: function () {
- return [
- this.$t('Channel.Videos.Sort Types.Newest'),
- this.$t('Channel.Videos.Sort Types.Most Popular')
- ]
- },
-
playlistSelectNames: function () {
return [
this.$t('Channel.Playlists.Sort Types.Newest'),
@@ -362,7 +351,7 @@ export default defineComponent({
this.errorMessage = ''
// Re-enable auto refresh on sort value change AFTER update done
- if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
+ if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
this.getChannelInfoInvidious()
this.autoRefreshOnSortByChangeEnabled = true
} else {
@@ -460,7 +449,7 @@ export default defineComponent({
}
// Enable auto refresh on sort value change AFTER initial update done
- if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
+ if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
this.getChannelInfoInvidious()
this.autoRefreshOnSortByChangeEnabled = true
} else {
@@ -473,7 +462,7 @@ export default defineComponent({
resolveChannelUrl: async function (url, tab = undefined) {
let id
- if (!process.env.IS_ELECTRON || this.backendPreference === 'invidious') {
+ if (!process.env.SUPPORTS_LOCAL_API || this.backendPreference === 'invidious') {
id = await invidiousGetChannelId(url)
} else {
id = await getLocalChannelId(url)
@@ -769,7 +758,7 @@ export default defineComponent({
this.showVideoSortBy = videosTab.filters.length > 1
if (this.showVideoSortBy && this.videoSortBy !== 'newest') {
- const index = this.videoLiveSelectValues.indexOf(this.videoSortBy)
+ const index = this.videoLiveShortSelectValues.indexOf(this.videoSortBy)
videosTab = await videosTab.applyFilter(videosTab.filters[index])
}
@@ -837,7 +826,7 @@ export default defineComponent({
this.showShortSortBy = shortsTab.filters.length > 1
if (this.showShortSortBy && this.shortSortBy !== 'newest') {
- const index = this.shortSelectValues.indexOf(this.shortSortBy)
+ const index = this.videoLiveShortSelectValues.indexOf(this.shortSortBy)
shortsTab = await shortsTab.applyFilter(shortsTab.filters[index])
}
@@ -905,7 +894,7 @@ export default defineComponent({
this.showLiveSortBy = liveTab.filters.length > 1
if (this.showLiveSortBy && this.liveSortBy !== 'newest') {
- const index = this.videoLiveSelectValues.indexOf(this.liveSortBy)
+ const index = this.videoLiveShortSelectValues.indexOf(this.liveSortBy)
liveTab = await liveTab.applyFilter(liveTab.filters[index])
}
@@ -913,7 +902,16 @@ export default defineComponent({
return
}
- this.latestLive = parseLocalChannelVideos(liveTab.videos, this.id, this.channelName)
+ // work around YouTube bug where it will return a bunch of responses with only continuations in them
+ // e.g. https://www.youtube.com/@TWLIVES/streams
+
+ let videos = liveTab.videos
+ while (videos.length === 0 && liveTab.has_continuation) {
+ liveTab = await liveTab.getContinuation()
+ videos = liveTab.videos
+ }
+
+ this.latestLive = parseLocalChannelVideos(videos, this.id, this.channelName)
this.liveContinuationData = liveTab.has_continuation ? liveTab : null
this.isElementListLoading = false
@@ -1053,7 +1051,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
this.getChannelLocal()
} else {
@@ -1331,7 +1329,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
if (!this.channelInstance) {
this.channelInstance = await getLocalChannel(this.id)
@@ -1372,7 +1370,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
this.getChannelLocal()
} else {
@@ -1451,7 +1449,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
if (!this.channelInstance) {
this.channelInstance = await getLocalChannel(this.id)
@@ -1485,7 +1483,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
this.getChannelLocal()
} else {
@@ -1564,7 +1562,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
if (!this.channelInstance) {
this.channelInstance = await getLocalChannel(this.id)
@@ -1598,7 +1596,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
this.getChannelLocal()
} else {
@@ -1718,7 +1716,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
if (!this.channelInstance) {
this.channelInstance = await getLocalChannel(this.id)
@@ -1927,6 +1925,7 @@ export default defineComponent({
}
invidiousAPICall(payload).then((response) => {
+ setPublishedTimestampsInvidious(response.filter(item => item.type === 'video'))
if (this.hideChannelPlaylists) {
this.searchResults = this.searchResults.concat(response.filter(item => item.type !== 'playlist'))
} else {
@@ -1940,7 +1939,7 @@ export default defineComponent({
showToast(`${errorMessage}: ${err}`, 10000, () => {
copyToClipboard(err)
})
- if (process.env.IS_ELECTRON && this.backendPreference === 'invidious' && this.backendFallback) {
+ if (process.env.SUPPORTS_LOCAL_API && this.backendPreference === 'invidious' && this.backendFallback) {
showToast(this.$t('Falling back to Local API'))
this.searchChannelLocal()
} else {
diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue
index 687ab94a4..73b20664d 100644
--- a/src/renderer/views/Channel/Channel.vue
+++ b/src/renderer/views/Channel/Channel.vue
@@ -233,27 +233,27 @@