diff --git a/package.json b/package.json index 692604f50..45a3e54d5 100644 --- a/package.json +++ b/package.json @@ -62,7 +62,7 @@ "autolinker": "^4.0.0", "electron-context-menu": "^3.6.1", "lodash.debounce": "^4.0.8", - "marked": "^11.2.0", + "marked": "^12.0.0", "path-browserify": "^1.0.1", "process": "^0.11.10", "swiper": "^11.0.6", diff --git a/src/renderer/components/data-settings/data-settings.js b/src/renderer/components/data-settings/data-settings.js index 2444f3c08..c4685db58 100644 --- a/src/renderer/components/data-settings/data-settings.js +++ b/src/renderer/components/data-settings/data-settings.js @@ -1137,7 +1137,7 @@ export default defineComponent({ }) if (process.env.IS_ELECTRON && this.backendFallback && this.backendPreference === 'invidious') { - showToast(this.$t('Falling back to the local API')) + showToast(this.$t('Falling back to Local API')) resolve(this.getChannelInfoLocal(channelId)) } else { resolve([]) diff --git a/src/renderer/components/ft-age-restricted/ft-age-restricted.js b/src/renderer/components/ft-age-restricted/ft-age-restricted.js index 7e925441b..c9cd917bc 100644 --- a/src/renderer/components/ft-age-restricted/ft-age-restricted.js +++ b/src/renderer/components/ft-age-restricted/ft-age-restricted.js @@ -3,10 +3,14 @@ import { defineComponent } from 'vue' export default defineComponent({ name: 'FtAgeRestricted', props: { - contentTypeString: { - type: String, - required: true - } + isChannel: { + type: Boolean, + default: false, + }, + isVideo: { + type: Boolean, + default: false, + }, }, computed: { emoji: function () { @@ -15,8 +19,11 @@ export default defineComponent({ }, restrictedMessage: function () { - const contentType = this.$t('Age Restricted.Type.' + this.contentTypeString) - return this.$t('Age Restricted.This {videoOrPlaylist} is age restricted', { videoOrPlaylist: contentType }) + if (this.isChannel) { + return this.$t('Age Restricted.This channel is age restricted') + } + + return this.$t('Age Restricted.This video is age restricted:') } } }) diff --git a/src/renderer/components/ft-list-video/ft-list-video.vue b/src/renderer/components/ft-list-video/ft-list-video.vue index d8e373d2b..a50e91067 100644 --- a/src/renderer/components/ft-list-video/ft-list-video.vue +++ b/src/renderer/components/ft-list-video/ft-list-video.vue @@ -152,7 +152,7 @@ diff --git a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue index 8d2e8725a..c42e3cf5e 100644 --- a/src/renderer/components/side-nav-more-options/side-nav-more-options.vue +++ b/src/renderer/components/side-nav-more-options/side-nav-more-options.vue @@ -44,6 +44,7 @@ />

- {{ $t("There are no comments available for this video") }} + {{ $t("Comments.There are no comments available for this video") }}

{ @@ -634,7 +635,10 @@ export function toDistractionFreeTitle(title, minUpperCase = 3) { } const reg = RegExp(`[\\p{Lu}|']{${minUpperCase},}`, 'ug') - return title.replace(reg, x => capitalizedWord(x.toLowerCase())) + return title + .replaceAll(/!{2,}/g, '!') + .replaceAll(/[!?]{2,}/g, '?') + .replace(reg, x => capitalizedWord(x.toLowerCase())) } export function formatNumber(number, options = undefined) { diff --git a/src/renderer/store/modules/invidious.js b/src/renderer/store/modules/invidious.js index 759632e2d..b7b9aa414 100644 --- a/src/renderer/store/modules/invidious.js +++ b/src/renderer/store/modules/invidious.js @@ -39,6 +39,7 @@ const actions = { console.error(err) } } + // If the invidious instance fetch isn't returning anything interpretable if (instances.length === 0) { // Fallback: read from static file @@ -46,15 +47,13 @@ const actions = { /* eslint-disable-next-line n/no-path-concat */ const fileLocation = process.env.NODE_ENV === 'development' ? './static/' : `${__dirname}/static/` const filePath = `${fileLocation}${fileName}` - if (!process.env.IS_ELECTRON) { - 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 - }).map(e => { - return e.url - }) - } + 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 + }).map(e => { + return e.url + }) } commit('setInvidiousInstancesList', instances) }, diff --git a/src/renderer/store/modules/settings.js b/src/renderer/store/modules/settings.js index 5445bc2fc..048f9574a 100644 --- a/src/renderer/store/modules/settings.js +++ b/src/renderer/store/modules/settings.js @@ -290,7 +290,7 @@ const state = { videoPlaybackRateInterval: 0.25, downloadAskPath: true, downloadFolderPath: '', - downloadBehavior: 'download', + downloadBehavior: 'open', enableScreenshot: false, screenshotFormat: 'png', screenshotQuality: 95, diff --git a/src/renderer/views/Channel/Channel.vue b/src/renderer/views/Channel/Channel.vue index 55ae33644..687ab94a4 100644 --- a/src/renderer/views/Channel/Channel.vue +++ b/src/renderer/views/Channel/Channel.vue @@ -417,7 +417,7 @@ diff --git a/src/renderer/views/Playlist/Playlist.js b/src/renderer/views/Playlist/Playlist.js index cd20fcfbe..fc3f4977d 100644 --- a/src/renderer/views/Playlist/Playlist.js +++ b/src/renderer/views/Playlist/Playlist.js @@ -280,7 +280,7 @@ export default defineComponent({ const dateString = new Date(result.updated * 1000) this.lastUpdated = dateString.toLocaleDateString(this.currentLocale, { year: 'numeric', month: 'short', day: 'numeric' }) - this.allPlaylistItems = result.videos + this.playlistItems = result.videos this.isLoading = false }).catch((err) => { diff --git a/src/renderer/views/Playlist/Playlist.scss b/src/renderer/views/Playlist/Playlist.scss index e8c2b7681..939f3a5cc 100644 --- a/src/renderer/views/Playlist/Playlist.scss +++ b/src/renderer/views/Playlist/Playlist.scss @@ -7,7 +7,6 @@ box-sizing: border-box; block-size: calc(100vh - 132px); margin-inline-end: 1em; - overflow-y: auto; padding: 10px; position: sticky; inset-block-start: 96px; diff --git a/src/renderer/views/Watch/Watch.vue b/src/renderer/views/Watch/Watch.vue index 707090c04..a6d805b05 100644 --- a/src/renderer/views/Watch/Watch.vue +++ b/src/renderer/views/Watch/Watch.vue @@ -87,7 +87,7 @@