Skip to content
Open
Show file tree
Hide file tree
Changes from 8 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions src/renderer/components/ParentalControlSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,12 @@
:default-value="showFamilyFriendlyOnly"
@change="updateShowFamilyFriendlyOnly"
/>
<FtToggleSwitch
:label="$t('Settings.Parental Control Settings.Disable Channel Link on Videos')"
compact
:default-value="disableChannelLinks"
@change="updateDisableChannelLinks"
/>
</div>
<div class="switchColumn">
<FtToggleSwitch
Expand Down Expand Up @@ -59,6 +65,10 @@ const showFamilyFriendlyOnly = computed(() => {
return store.getters.getShowFamilyFriendlyOnly
})

const disableChannelLinks = computed(() => {
return store.getters.getDisableChannelLinks
})

/**
* @param {boolean} value
*/
Expand Down Expand Up @@ -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>
4 changes: 4 additions & 0 deletions src/renderer/components/WatchVideoInfo/WatchVideoInfo.css
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,10 @@
gap: 4px;
}

.revertCursor {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I haven't tested this yet so not sure if this is really needed

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed this to use initial instead - it just stops the cursor staying as pointer

cursor: revert;
}

@media screen and (width <= 730px) {
.videoButtons {
flex-direction: column;
Expand Down
16 changes: 16 additions & 0 deletions src/renderer/components/WatchVideoInfo/WatchVideoInfo.vue
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
v-if="!hideUploader"
>
<RouterLink
v-if="!disableChannelLinks"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not a fan of double negative

Suggested change
v-if="!disableChannelLinks"
v-if="enableChannelLinks"

:to="`/channel/${channelId}`"
>
<img
Expand All @@ -50,18 +51,31 @@
alt=""
>
</RouterLink>
<img
v-if="disableChannelLinks"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
v-if="disableChannelLinks"
v-else

:src="channelThumbnail"
class="channelThumbnail revertCursor"
alt=""
>
</div>
<div>
<div
v-if="!hideUploader"
>
<RouterLink
v-if="!disableChannelLinks"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

:to="`/channel/${channelId}`"
class="channelName"
dir="auto"
>
{{ channelName }}
</RouterLink>
<div
v-if="disableChannelLinks"
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ditto

class="channelName revertCursor"
>
{{ channelName }}
</div>
</div>
<FtSubscribeButton
v-if="!hideUnsubscribeButton"
Expand Down Expand Up @@ -503,6 +517,8 @@ function removeFromQuickBookmarkPlaylist() {
// TODO: Maybe show playlist name
showToast(t('Video.Video has been removed from your saved list'))
}

const disableChannelLinks = computed(() => store.getters.getDisableChannelLinks)
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
const disableChannelLinks = computed(() => store.getters.getDisableChannelLinks)
const enableChannelLinks = computed(() => !store.getters.getDisableChannelLinks)

</script>

<style scoped src="./WatchVideoInfo.css" />
4 changes: 4 additions & 0 deletions src/renderer/components/ft-list-video/ft-list-video.js
Original file line number Diff line number Diff line change
Expand Up @@ -546,6 +546,10 @@ export default defineComponent({
deArrowCache: function () {
return this.$store.getters.getDeArrowCache[this.id]
},

disableChannelLinks: function () {
return this.$store.getters.getDisableChannelLinks
},
},
watch: {
showAddToPlaylistPrompt(value) {
Expand Down
5 changes: 5 additions & 0 deletions src/renderer/components/ft-list-video/ft-list-video.scss
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,8 @@
.deArrowToggleIcon {
inline-size: 1em;
}

.linkDisabled {
text-decoration: none;
cursor: initial;
}
3 changes: 2 additions & 1 deletion src/renderer/components/ft-list-video/ft-list-video.vue
Original file line number Diff line number Diff line change
Expand Up @@ -126,8 +126,9 @@
<router-link
v-if="channelId !== null"
class="channelName"
:class="{ 'linkDisabled': disableChannelLinks }"
dir="auto"
:to="`/channel/${channelId}`"
:to="!disableChannelLinks ? `/channel/${channelId}`: ``"
>
{{ channelName }}
</router-link>
Expand Down
1 change: 1 addition & 0 deletions src/renderer/store/modules/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -169,6 +169,7 @@ const state = {
defaultViewingMode: 'default',
defaultVideoFormat: 'dash',
disableSmoothScrolling: false,
disableChannelLinks: false,
displayVideoPlayButton: false,
enableSearchSuggestions: true,
enableSubtitlesByDefault: false,
Expand Down
8 changes: 8 additions & 0 deletions static/locales/en-US.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -673,6 +673,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 Link on Videos : Disable Channel Link on Videos
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Probably should be renamed now because it doesnt apply only on videos

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
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am gonna guess this is from merging dev...?

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I believe so

Copy link
Copy Markdown
Member

@absidue absidue Apr 11, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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!
Expand Down