Add Parental Control toggle to disable channel link from videos #8502
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -47,7 +47,7 @@ | |
| </RouterLink> | ||
| <div class="infoLine"> | ||
| <RouterLink | ||
| v-if="channelId && enableChannelLinks" | ||
| class="channelName" | ||
| dir="auto" | ||
| :to="`/channel/${channelId}`" | ||
|
|
@@ -268,6 +268,8 @@ const externalPlayer = computed(() => store.getters.getExternalPlayer) | |
| /** @type {import('vue').ComputedRef<number>} */ | ||
| const defaultPlayback = computed(() => store.getters.getDefaultPlayback) | ||
|
|
||
| const enableChannelLinks = computed(() => !store.getters.getDisableChannelLinks) | ||
|
|
||
| function handleExternalPlayer() { | ||
| if (process.env.IS_ELECTRON) { | ||
| window.ftElectron.openInExternalPlayer({ | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -16,6 +16,12 @@ | |
| :default-value="showFamilyFriendlyOnly" | ||
| @change="updateShowFamilyFriendlyOnly" | ||
| /> | ||
| <FtToggleSwitch | ||
| :label="$t('Settings.Parental Control Settings.Disable Channel Links')" | ||
| compact | ||
| :default-value="disableChannelLinks" | ||
| @change="updateDisableChannelLinks" | ||
| /> | ||
| </div> | ||
| <div class="switchColumn"> | ||
| <FtToggleSwitch | ||
|
|
@@ -59,6 +65,10 @@ const showFamilyFriendlyOnly = computed(() => { | |
| return store.getters.getShowFamilyFriendlyOnly | ||
| }) | ||
|
|
||
| const disableChannelLinks = computed(() => { | ||
| return store.getters.getDisableChannelLinks | ||
| }) | ||
|
|
||
| /** | ||
| * @param {boolean} value | ||
| */ | ||
|
|
@@ -86,4 +96,11 @@ function updateHideUploader(value) { | |
| function updateShowFamilyFriendlyOnly(value) { | ||
| store.dispatch('updateShowFamilyFriendlyOnly', value) | ||
| } | ||
|
|
||
| /** | ||
| * @param {boolean} value | ||
| */ | ||
| function updateDisableChannelLinks(value) { | ||
| store.dispatch('updateDisableChannelLinks', value) | ||
| } | ||
| </script> | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||||||
|---|---|---|---|---|---|---|---|---|---|---|---|---|
|
|
@@ -109,7 +109,7 @@ | |||||||||||
| class="channelShareWrapper" | ||||||||||||
| > | ||||||||||||
| <router-link | ||||||||||||
| v-if="!isUserPlaylist && channelId && enableChannelLinks" | ||||||||||||
| class="playlistChannel" | ||||||||||||
| :to="`/channel/${channelId}`" | ||||||||||||
| > | ||||||||||||
|
|
@@ -129,6 +129,11 @@ | |||||||||||
| v-else | ||||||||||||
| class="playlistChannel" | ||||||||||||
| > | ||||||||||||
| <img | ||||||||||||
| class="channelThumbnail" | ||||||||||||
|
Comment on lines
+132
to
+133
Member
There was a problem hiding this comment. The channel thumbnail wasn't here before, because when YouTube doesn't return a channel link here it also doesn't return a thumbnail, so you need to wrap the channel thumbnail in a if statement.
Suggested change
|
||||||||||||
| :src="channelThumbnail" | ||||||||||||
| alt="" | ||||||||||||
| > | ||||||||||||
| <h3 | ||||||||||||
| class="channelName" | ||||||||||||
| dir="auto" | ||||||||||||
|
|
@@ -957,6 +962,8 @@ onMounted(() => { | |||||||||||
| onBeforeUnmount(() => { | ||||||||||||
| document.removeEventListener('keydown', keyboardShortcutHandler) | ||||||||||||
| }) | ||||||||||||
|
|
||||||||||||
| const enableChannelLinks = computed(() => !store.getters.getDisableChannelLinks) | ||||||||||||
| </script> | ||||||||||||
|
|
||||||||||||
| <style scoped lang="scss" src="./PlaylistInfo.scss" /> | ||||||||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -97,6 +97,10 @@ | |
| gap: 4px; | ||
| } | ||
|
|
||
| .initialCursor { | ||
| cursor: initial; | ||
| } | ||
|
|
||
| @media screen and (width <= 730px) { | ||
| .videoButtons { | ||
| flex-direction: column; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
|
|
@@ -42,6 +42,7 @@ | |||||
| v-if="!hideUploader" | ||||||
| > | ||||||
| <RouterLink | ||||||
| v-if="enableChannelLinks" | ||||||
| :to="`/channel/${channelId}`" | ||||||
| > | ||||||
| <img | ||||||
|
|
@@ -50,18 +51,31 @@ | |||||
| alt="" | ||||||
| > | ||||||
| </RouterLink> | ||||||
| <img | ||||||
| v-if="!enableChannelLinks" | ||||||
| :src="channelThumbnail" | ||||||
| class="channelThumbnail initialCursor" | ||||||
| alt="" | ||||||
| > | ||||||
| </div> | ||||||
| <div> | ||||||
| <div | ||||||
| v-if="!hideUploader" | ||||||
| > | ||||||
| <RouterLink | ||||||
| v-if="enableChannelLinks" | ||||||
| :to="`/channel/${channelId}`" | ||||||
| class="channelName" | ||||||
| dir="auto" | ||||||
| > | ||||||
| {{ channelName }} | ||||||
| </RouterLink> | ||||||
| <div | ||||||
| v-if="!enableChannelLinks" | ||||||
|
Member
There was a problem hiding this comment.
Suggested change
|
||||||
| class="channelName initialCursor" | ||||||
| > | ||||||
| {{ channelName }} | ||||||
| </div> | ||||||
| </div> | ||||||
| <FtSubscribeButton | ||||||
| v-if="!hideUnsubscribeButton" | ||||||
|
|
@@ -503,6 +517,8 @@ function removeFromQuickBookmarkPlaylist() { | |||||
| // TODO: Maybe show playlist name | ||||||
| showToast(t('Video.Video has been removed from your saved list')) | ||||||
| } | ||||||
|
|
||||||
| const enableChannelLinks = computed(() => !store.getters.getDisableChannelLinks) | ||||||
| </script> | ||||||
|
|
||||||
| <style scoped src="./WatchVideoInfo.css" /> | ||||||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -550,6 +550,10 @@ export default defineComponent({ | |
| deArrowCache: function () { | ||
| return this.$store.getters.getDeArrowCache[this.id] | ||
| }, | ||
|
|
||
| disableChannelLinks: function () { | ||
| return this.$store.getters.getDisableChannelLinks | ||
| }, | ||
| }, | ||
| watch: { | ||
| showAddToPlaylistPrompt(value) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -124,14 +124,14 @@ | |
| </router-link> | ||
| <div class="infoLine"> | ||
| <router-link | ||
| v-if="channelId !== null && !disableChannelLinks" | ||
| class="channelName" | ||
| dir="auto" | ||
| :to="`/channel/${channelId}`" | ||
| > | ||
| {{ channelName }} | ||
| </router-link> | ||
| <bdi v-else-if="channelName !== null || disableChannelLinks"> | ||
| {{ channelName }} | ||
| </bdi> | ||
| <span | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -169,6 +169,7 @@ const state = { | |
| defaultViewingMode: 'default', | ||
| defaultVideoFormat: 'dash', | ||
| disableSmoothScrolling: false, | ||
| disableChannelLinks: false, | ||
| displayVideoPlayButton: false, | ||
| enableSearchSuggestions: true, | ||
| enableSubtitlesByDefault: false, | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -671,6 +671,14 @@ Settings: | |
| Hide Uploader on Watch page: Hide Uploader on Watch page | ||
| Show Family Friendly Only: Show Family Friendly Only | ||
| Hide Search Bar: Hide Search Bar | ||
| Disable Channel Links: Disable Channel Links | ||
| Download Settings: | ||
| Download Settings: Download | ||
| Ask Download Path: Ask for download path | ||
| Choose Path: Choose Path | ||
| Download Behavior: Download Behavior | ||
| Download in app: Download in app | ||
| Open in web browser: Open in web browser | ||
|
Comment on lines
+675
to
+681
Member
There was a problem hiding this comment. I am gonna guess this is from merging dev...?
Contributor
Author
There was a problem hiding this comment. Yeah, I believe so
Member
There was a problem hiding this comment. Even if this came from a merge, the fact that it is still here means the merge wasn't clean and as those download strings no longer exist on the development branch, merging this pull request as is would add those strings back. |
||
| Experimental Settings: | ||
| Experimental Settings: Experimental | ||
| Warning: These settings are experimental, they may cause crashes while enabled. Making backups is highly recommended. Use at your own risk! | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.