From f39579c6d22c5bdf00918816f4d5e5eb706a7a37 Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Tue, 30 Mar 2021 03:31:35 +0100 Subject: [PATCH 1/3] Stop replacing YouTube hrefs for protocol links --- .../watch-video-description/watch-video-description.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/renderer/components/watch-video-description/watch-video-description.js b/src/renderer/components/watch-video-description/watch-video-description.js index 3773e52d..e7a2eccb 100644 --- a/src/renderer/components/watch-video-description/watch-video-description.js +++ b/src/renderer/components/watch-video-description/watch-video-description.js @@ -55,9 +55,8 @@ export default Vue.extend({ descriptionText = descriptionText.replace(/&v.+?(?=")/g, '') descriptionText = descriptionText.replace(/&redirect-token.+?(?=")/g, '') descriptionText = descriptionText.replace(/&redir_token.+?(?=")/g, '') - descriptionText = descriptionText.replace(/href="http(s)?:\/\/youtube\.com/g, 'href="freetube://https://youtube.com') - descriptionText = descriptionText.replace(/href="\/watch/g, 'href="freetube://https://youtube.com') - descriptionText = descriptionText.replace(/href="\/results\?search_query=/g, 'href="freetube://') + descriptionText = descriptionText.replace(/href="\//g, 'href="https://www.youtube.com/') + // TODO: Implement hashtag support descriptionText = descriptionText.replace(/href="\/hashtag\//g, 'href="freetube://') descriptionText = descriptionText.replace(/yt\.www\.watch\.player\.seekTo/g, 'changeDuration') From f9f49a5f6d75c7a71772f3eae6d59ebcff76cb2c Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Tue, 30 Mar 2021 03:32:17 +0100 Subject: [PATCH 2/3] Link app views to related YouTube url navigations --- src/renderer/App.js | 122 ++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 118 insertions(+), 4 deletions(-) diff --git a/src/renderer/App.js b/src/renderer/App.js index eca320ba..7d8b6891 100644 --- a/src/renderer/App.js +++ b/src/renderer/App.js @@ -269,14 +269,128 @@ export default Vue.extend({ }, openAllLinksExternally: function () { - // Open links externally by default $(document).on('click', 'a[href^="http"]', (event) => { const el = event.currentTarget console.log(useElectron) console.log(el) - if (typeof (shell) !== 'undefined') { - event.preventDefault() - shell.openExternal(el.href) + event.preventDefault() + + // Check if YouTube video, channel or playlist + const youtubeUrlPattern = /^https?:\/\/((www\.)?youtube\.com(\/embed)?|youtu\.be)\/.*$/ + const isYoutubeLink = youtubeUrlPattern.test(el.href) + + if (isYoutubeLink) { + this.handleYoutubeLink(el.href) + } else { + // Open links externally by default + if (typeof (shell) !== 'undefined') { + shell.openExternal(el.href) + } + } + }) + }, + + handleYoutubeLink: function (href) { + const v = this + + // Assume it's a video + this.$store.dispatch('getVideoParamsFromUrl', href).then(({ videoId, timestamp }) => { + if (videoId) { + v.$router.push({ + path: `/watch/${videoId}`, + query: timestamp ? { timestamp } : {} + }) + } else { + // Could be playlist, search, hashtag or channel + // For now, ignore hashtags + + const url = new URL(href) + + let urlType + const typePatterns = new Map([ + ['playlist', /\/playlist$/], + ['search', /\/results$/], + // ['hashtag', /\/hashtag\/([^/?&#]+)/], + ['channel', /\/(?:c\/|channel\/)?([^/?&#]+).*$/] + ]) + + for (const [type, pattern] of typePatterns) { + const isAMatch = pattern.test(url.pathname) + if (isAMatch) { + urlType = type + break + } + } + + switch (urlType) { + case 'playlist': { + if (!url.searchParams.has('list')) { + return + } + + const playlistId = url.searchParams.get('list') + url.searchParams.delete('list') + + const query = {} + for (const [param, value] of url.searchParams) { + query[param] = value + } + + v.$router.push({ + path: `/playlist/${playlistId}`, + query + }) + break + } + + case 'search': { + if (!url.searchParams.has('search_query')) { + return + } + + const searchQuery = url.searchParams.get('search_query') + url.searchParams.delete('search_query') + + const query = { + sortBy: this.searchSettings.sortBy, + time: this.searchSettings.time, + type: this.searchSettings.type, + duration: this.searchSettings.duration + } + + for (const [param, value] of url.searchParams) { + query[param] = value + } + + v.$router.push({ + path: `/search/${encodeURIComponent(searchQuery)}`, + query + }) + break + } + /* case 'hashtag': { + // placeholder + break + } */ + case 'channel': { + const channelId = url.pathname.match(/\/(?:c\/|channel\/)?([^/?&#]+).*$/)[1] + if (!channelId) { + return + } + + v.$router.push({ + path: `/channel/${channelId}` + }) + break + } + + default: { + if (typeof (shell) !== 'undefined') { + shell.openExternal(href) + } + break + } + } } }) }, From c56cb87f7c43af6fce24df0400858cf98220d547 Mon Sep 17 00:00:00 2001 From: Svallinn <41585298+Svallinn@users.noreply.github.com> Date: Tue, 30 Mar 2021 03:34:56 +0100 Subject: [PATCH 3/3] Gilgus did this and left it there for days -_-' --- .../components/watch-video-comments/watch-video-comments.vue | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/components/watch-video-comments/watch-video-comments.vue b/src/renderer/components/watch-video-comments/watch-video-comments.vue index 20b96740..a993a373 100644 --- a/src/renderer/components/watch-video-comments/watch-video-comments.vue +++ b/src/renderer/components/watch-video-comments/watch-video-comments.vue @@ -47,8 +47,9 @@ class="commentThumbnail" @click="goToChannel(comment.authorLink)" > -

{{ comment.author }}