Add hide channel option directly to More Options menu #4228

MitchelPaulin · 2023-10-24T23:45:06Z

Add hide channel option directly to More Options menu

Pull Request Type

Bugfix
Feature Implementation
Documentation
Other

Related issue

closes #3051
closes #4037

Description

Piggybacks off the feature that was implemented in #2849 to add an option directly to the "More Options" menu to hide a channel. Options will show up in the "Distraction Settings" afterwards and can be removed from there.

Screenshots

Hide if not hidden

Show if hidden

Testing

Selected the option in the context menu, the video is immediately filtered and a toast is thrown up to confirm it was hidden. Then I checked the "Distraction Settings" and confirmed the channel is there.

Desktop

OS: Pop_OS
OS Version: 22.04 LTS
FreeTube version: 0.19.1

Additional Info

I decided not to go with "Hide Recommendation" like mentioned in the original issue as there really isn't recommendations, just trending.

PikachuEXE · 2023-10-25T00:12:21Z

I think the new option should be added to the end with a separator
Also it might be better to add a confirmation modal/something to avoid misclick

kommunarr · 2023-10-25T03:35:05Z

Good work @MitchelPaulin!

On top of @PikachuEXE's suggestions, could you also add an "Unhide Channel" option for when the channel is hidden? That may sound silly, but hidden channel videos can still show up in other places like Subscriptions, the Channel page, and Playlists.

MitchelPaulin · 2023-10-25T04:19:11Z

Moved it into its own divider at the bottom and added the ability to show hidden channels, good suggestions.

Not sure how I feel about the confirmation popup, I feel like it might just get in the way more than anything. But if its a blocker I can add it.

kommunarr · 2023-10-26T15:35:25Z

I don't think it's strictly needed because you can always see and remove those channels from your Distraction Free Settings. Especially given that there's a toast letting you know what you did if you accidentally clicked it. @PikachuEXE Second thoughts?

PikachuEXE

Hmm? Forgot to approve after review

absidue · 2023-10-28T10:27:33Z

src/renderer/components/ft-list-video/ft-list-video.js

+    hideChannel: function(channelName) {
+      const hiddenChannels = JSON.parse(this.$store.getters.getChannelsHidden)
+      hiddenChannels.push(channelName)
+      this.updateChannelsHidden(JSON.stringify(hiddenChannels))
+
+      showToast(this.$t('Channel Hidden', { channel: channelName }))
+    },


Please change this pull request to use the channel ID, not the name. Blocking by name is unreliable as the channel owner can change the channel name, so you would have to block it again when that happens, but the ID never changes, so it will continue to work even when the name changes.

I went with the name since the Ids were very unreadable, if #4230 merges though that's no longer a concern, I can switch it to Ids

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-11-17T16:10:00Z

src/renderer/components/ft-list-video/ft-list-video.js

            }
          )
+
+          const hiddenChannels = JSON.parse(this.$store.getters.getChannelsHidden)
+          const channelShouldBeHidden = hiddenChannels.some(c => c === this.channelName || c === this.channelId)


AFAIK channelName is not a thing anymore

Would we not need the channel name checked here to support anyone that has existing legacy blocks via channel name? Or were they all migrated to reference the channel Id?

i could be missing something but

If im looking at the conversations in #4230 i think everything is based on channel ID now

it was also mentioned that we should change this PR to channel ID only when that one was merged #4230 (comment)

I was just thinking of what would happen to a user who has blocked a channel by name then updates freetube, You can no longer make new blocks by channel name but even in #4230 to me it looks like existing channel name blocks are still respected https://github.com/Benjababe/FreeTube/blob/7272fc478c9c8a5d6a17f54660a1e93ba20ca943/src/renderer/components/ft-list-video-lazy/ft-list-video-lazy.js#L72

Or is it understood that updating freetube means your existing settings might no longer work

Ah ok, scrolling through the other PR it does look like we are fine just not respecting legacy blocks #4230 (comment)

In that case I can remove the channel name check

efb4f5ff-1298-471a-8973-3d47447115dc

In the latest nightly this isnt a thing

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-11-18T15:42:50Z

I see channelName being used in more places do they also need to be removed?

MitchelPaulin · 2023-11-18T15:48:48Z

I see channelName being used in more places do they also need to be removed?

Yes, missed a spot, the rest of the uses are for the toast message though, so those need to stay

kommunarr · 2023-11-20T14:17:16Z

Getting this issue on npm run dev:

    position: 39813,
    line: 924,
    column: 26,
    snippet: ` 922 | Downloading failed: 'There was an issue downloading "{vid ...\n` +
      ' 923 | Screenshot Success: Saved screenshot as "{filePath}"\n' +
      ' 924 | Screenshot Error: Screenshot failed. {error}\n' +
      ' 925 | Channel Hidden: {channel} added to channel filter\n' +
      '---------------------------------^\n' +
      ' 926 | Channel Unhidden: {channel} removed from channel filter\n' +
      ' 927 | '

absidue · 2023-11-20T16:38:50Z

Looks like an error caused by invalid YAML. The newly added strings with the curly bracket at the start probably need to be quoted.

absidue · 2023-11-20T21:49:15Z

Thank you for your contribution! sorry for the long back-and-forwards on this.

PikachuEXE

I tested after merging development into this branch otherwise it might not work properly
All seems fine

* development: Update to silently allow channel links (with IDs) (FreeTubeApp#4347) Add hide channel option directly to More Options menu (FreeTubeApp#4228) Translated using Weblate (Chinese (Simplified)) Translated using Weblate (Spanish) Make landing page configurable (FreeTubeApp#4200) Bump @silvermine/videojs-quality-selector from 1.3.0 to 1.3.1 (FreeTubeApp#4362) Bump electron from 27.0.4 to 27.1.0 (FreeTubeApp#4363) Bump the eslint group with 1 update (FreeTubeApp#4360) Bump actions/github-script from 6 to 7 (FreeTubeApp#4361) add image to poll & updated quiz style (FreeTubeApp#4318) Move hideOutlines to the utils store instead of using provide/inject (FreeTubeApp#4246) Translated using Weblate (Kurdish (Central)) Translated using Weblate (English (United Kingdom)) Translated using Weblate (French) Translated using Weblate (German) Added translation using Weblate (Kurdish (Central)) Translated using Weblate (Slovak) # Conflicts: # src/renderer/components/ft-list-video/ft-list-video.js

Add hide channel option directly to More Options menu

cd8189b

FreeTubeBot enabled auto-merge (squash) October 24, 2023 23:45

github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Oct 24, 2023

Added ability to unhide channels as well from the same menu

5ef31b4

auto-merge was automatically disabled October 25, 2023 04:15
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) October 25, 2023 04:15

Fix issue where unhide would not work with channelId

4d654ad

auto-merge was automatically disabled October 25, 2023 04:51
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) October 25, 2023 04:51

PikachuEXE mentioned this pull request Oct 25, 2023

Add identifiers to channels hidden by ID #4230

Merged

4 tasks

Replace filter with some

0994ac9

auto-merge was automatically disabled October 25, 2023 13:39
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) October 25, 2023 13:39

Remove extra hide channel

fcdaa2d

auto-merge was automatically disabled October 26, 2023 15:21
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) October 26, 2023 15:22

PikachuEXE previously approved these changes Oct 26, 2023

View reviewed changes

absidue requested changes Oct 28, 2023

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc added PR: changes requested and removed PR: waiting for review For PRs that are complete, tested, and ready for review labels Oct 28, 2023

Hide by channelId rather than name

183b366

auto-merge was automatically disabled October 28, 2023 19:07
Head branch was pushed to by a user without write access

MitchelPaulin dismissed PikachuEXE’s stale review via 183b366 October 28, 2023 19:07

FreeTubeBot enabled auto-merge (squash) October 28, 2023 19:08

MitchelPaulin requested review from absidue and PikachuEXE October 28, 2023 19:08

FreeTubeBot enabled auto-merge (squash) November 17, 2023 15:55

MitchelPaulin requested review from efb4f5ff-1298-471a-8973-3d47447115dc, ChunkyProgrammer, PikachuEXE and kommunarr November 17, 2023 15:56

efb4f5ff-1298-471a-8973-3d47447115dc reviewed Nov 17, 2023

View reviewed changes

MitchelPaulin requested a review from efb4f5ff-1298-471a-8973-3d47447115dc November 17, 2023 21:33

Do not check channel name anymore

ef301ae

auto-merge was automatically disabled November 18, 2023 14:56
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) November 18, 2023 14:56

One more spot

96aa71d

auto-merge was automatically disabled November 18, 2023 15:47
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) November 18, 2023 15:48

Fixed lang terms

5b8a8df

auto-merge was automatically disabled November 20, 2023 20:38
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) November 20, 2023 20:38

absidue approved these changes Nov 20, 2023

View reviewed changes

PikachuEXE approved these changes Nov 21, 2023

View reviewed changes

ChunkyProgrammer approved these changes Nov 21, 2023

View reviewed changes

FreeTubeBot merged commit 86bad25 into FreeTubeApp:development Nov 21, 2023
6 checks passed

github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Nov 21, 2023

This comment was marked as abuse.

Sign in to view

kommunarr mentioned this pull request Nov 21, 2023

Way to dismiss videos or mark them as "Not Interested" #1362

Open

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add hide channel option directly to More Options menu #4228

Add hide channel option directly to More Options menu #4228

MitchelPaulin commented Oct 24, 2023 •

edited by kommunarr

Loading

PikachuEXE commented Oct 25, 2023

kommunarr commented Oct 25, 2023

MitchelPaulin commented Oct 25, 2023

kommunarr commented Oct 26, 2023

PikachuEXE left a comment

absidue Oct 28, 2023

MitchelPaulin Oct 28, 2023 •

edited

Loading

efb4f5ff-1298-471a-8973-3d47447115dc Nov 17, 2023

MitchelPaulin Nov 17, 2023 •

edited

Loading

efb4f5ff-1298-471a-8973-3d47447115dc Nov 18, 2023 •

edited

Loading

MitchelPaulin Nov 18, 2023 •

edited

Loading

MitchelPaulin Nov 18, 2023

efb4f5ff-1298-471a-8973-3d47447115dc left a comment

efb4f5ff-1298-471a-8973-3d47447115dc commented Nov 18, 2023

MitchelPaulin commented Nov 18, 2023

kommunarr commented Nov 20, 2023

absidue commented Nov 20, 2023

absidue commented Nov 20, 2023

PikachuEXE left a comment

This comment was marked as abuse.

Add hide channel option directly to More Options menu #4228

Add hide channel option directly to More Options menu #4228

Conversation

MitchelPaulin commented Oct 24, 2023 • edited by kommunarr Loading

Add hide channel option directly to More Options menu

Pull Request Type

Related issue

Description

Screenshots

Hide if not hidden

Show if hidden

Testing

Desktop

Additional Info

PikachuEXE commented Oct 25, 2023

kommunarr commented Oct 25, 2023

MitchelPaulin commented Oct 25, 2023

kommunarr commented Oct 26, 2023

PikachuEXE left a comment

Choose a reason for hiding this comment

absidue Oct 28, 2023

Choose a reason for hiding this comment

MitchelPaulin Oct 28, 2023 • edited Loading

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc Nov 17, 2023

Choose a reason for hiding this comment

MitchelPaulin Nov 17, 2023 • edited Loading

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc Nov 18, 2023 • edited Loading

Choose a reason for hiding this comment

MitchelPaulin Nov 18, 2023 • edited Loading

Choose a reason for hiding this comment

MitchelPaulin Nov 18, 2023

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc left a comment

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc commented Nov 18, 2023

MitchelPaulin commented Nov 18, 2023

kommunarr commented Nov 20, 2023

absidue commented Nov 20, 2023

absidue commented Nov 20, 2023

PikachuEXE left a comment

Choose a reason for hiding this comment

This comment was marked as abuse.

MitchelPaulin commented Oct 24, 2023 •

edited by kommunarr

Loading

MitchelPaulin Oct 28, 2023 •

edited

Loading

MitchelPaulin Nov 17, 2023 •

edited

Loading

efb4f5ff-1298-471a-8973-3d47447115dc Nov 18, 2023 •

edited

Loading

MitchelPaulin Nov 18, 2023 •

edited

Loading