Fix Hide Channels and Hide Premier settings #3673

petaded · 2023-06-18T10:36:57Z

Fix Hide Channels and Hide Premier settings

Pull Request Type

Bugfix
Feature Implementation
Documentation
Other

Related issue

PR #3091 broke the hide channels and hide upcoming premiers option.
fixes #3419

Description

This PR fixes the showResult function to actually be run after PR #3091 stopped it working.
Having a v-if="method" means that it doesn't actually run the method instead just evaluates it (which always evaluates to true).

You can easily test this yourself by adding a console log in showResult and it will currently never be run.

To fix this and keep the wanted fix from 3091. I have changed showResult to a computed property from a method which means it does get run and will be re-evaluated on change (which is what 3091 wanted).

Also this fixes the hide premiere setting which was broken both because of the above issue and because youtube has changed since it was originally implemented. Now instead of checking durationText === 'PREMIERE' which it no longer is. We can instead just check the premiereDate which if its not null is a premiere video.
Note: when you are subscribed to a channel and using RSS premiereDate is not included hence we still need the data.isRSS && data.viewCount === '0' check.

Screenshots

Testing

Tested that this PR keeps the fix that #3091 wanted by doing the same test as them
yarn dev:web and going to channel https://youtube.com/channel/UC1BWMtZbNLVMSFgwSukjqCw

Also tested that the hide channels option is working again. by entering "Linus Tech Tips" into it and searching for LTT. Videos and channel are hidden.

No LTT videos are shown now if searching LTT

Testing the hide premiere option.

with hide premiere disabled	with hide premiere enabled:

Testing hide premiere on the subscription page with isRSS enabled.

with hide premiere disabled	with hide premiere enabled:

Desktop

OS: Manjaro Linux
OS Version: 5.15.94-1-MANJARO
FreeTube version: development branch (0.18.0)

Additional context

Note: the file preview shown by git doesn't seem to show the correct moved section. If you check the real difference you can see I just moved the showResult from the methods: {} to the computed: {} section.

PikachuEXE · 2023-06-18T12:39:02Z

There is another durationText in src/renderer/views/Subscriptions/Subscriptions.js
Can you also fix that?
I search with durationText

FreeTube/src/renderer/views/Subscriptions/Subscriptions.js

Line 209 in 447078a

return item.durationText !== 'PREMIERE'

petaded · 2023-06-18T12:47:56Z

There is another durationText in src/renderer/views/Subscriptions/Subscriptions.js Can you also fix that? I search with durationText

FreeTube/src/renderer/views/Subscriptions/Subscriptions.js

Line 209 in 447078a

return item.durationText !== 'PREMIERE'

have updated :)

PikachuEXE · 2023-06-19T05:47:42Z

I am using https://www.youtube.com/channel/UCUKPG1-r4WFyxpyhIuCs86Q for testing premiere

PikachuEXE

Tested https://youtube.com/channel/UC1BWMtZbNLVMSFgwSukjqCw on yarn dev:web
Tested hide channels option (Using Linux Tech Tips)
Tested with hide premiere (Local API, RSS on & off)

PikachuEXE · 2023-06-22T00:46:55Z

@absidue @efb4f5ff-1298-471a-8973-3d47447115dc ?

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-06-26T16:28:53Z

Hi @petaded thanks for opening this PR. If i search Linus Tech Tips and apply the playlist filter i get playlists created by LTT

PikachuEXE · 2023-06-27T07:12:53Z

For local API playlist channelId and channelName should be checked

For local API channel id and name should be checked

efb4f5ff-1298-471a-8973-3d47447115dc

Filter out playlists

PikachuEXE · 2023-06-30T23:26:36Z

src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js

        if (this.hideUpcomingPremieres &&
            // Observed for premieres in Local API Channels.
-            (data.durationText === 'PREMIERE' ||
+            (data.premiereDate != null ||


Since Invidious API is mentioned might as well
https://docs.invidious.io/api/common_types/#videoobject

Suggested change

(data.premiereDate != null ||

(data.premiereDate != null ||

// Invidious API

// `premiereTimestamp` only available on premiered videos

// https://docs.invidious.io/api/common_types/#videoobject

data.premiereTimestamp != null ||

PikachuEXE · 2023-06-30T23:27:38Z

src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js

+        if (this.channelsHidden.includes(data.id) || this.channelsHidden.includes(data.name) ||
+              this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {


Better doc

Suggested change

if (this.channelsHidden.includes(data.id) || this.channelsHidden.includes(data.name) ||

this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {

const attrsToCheck = [

// Local API

data.id,

data.name,

// Invidious API

// https://docs.invidious.io/api/common_types/#channelobject

data.author,

data.authorId,

]

if (attrsToCheck.some(a => a != null && this.channelsHidden.includes(a))) {

PikachuEXE · 2023-06-30T23:27:53Z

src/renderer/components/ft-list-lazy-wrapper/ft-list-lazy-wrapper.js

+        if (this.channelsHidden.includes(data.channelId) || this.channelsHidden.includes(data.channelName) ||
+              this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {


Better doc

Suggested change

if (this.channelsHidden.includes(data.channelId) || this.channelsHidden.includes(data.channelName) ||

this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {

const attrsToCheck = [

// Local API

data.channelId,

data.channelName,

// Invidious API

// https://docs.invidious.io/api/common_types/#playlistobject

data.author,

data.authorId,

]

if (attrsToCheck.some(a => a != null && this.channelsHidden.includes(a))) {

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-07-01T20:50:28Z

Test results after latest commit IV fix commit:

Hide Premiere + IV API = Not hidden
Hide Premiere + IV API + RSS = Hidden
Hide Premiere + Local API + RSS = Hidden
Hide Premiere + Local API = Hidden

PikachuEXE · 2023-07-02T00:33:53Z

Hide Premiere + IV API = Not hidden

Which is why I request change :)

…er channel (#3668) * Changes from PR #3673 * * Update subscription view to be able to load videos from video cache again * * Update subscription view to be able to load videos from video cache per channel * * Remove meaningless argument `allowUseOfChannelCache` * $ Remove unused imports --------- Co-authored-by: petaded <code@zikl.co.uk>

github-actions · 2023-07-02T14:39:45Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

PikachuEXE · 2023-07-02T14:53:51Z

@petaded
If you wish I can rebase this on development since the conflict is caused by merging #3668 which is made by me
But do let me know since I assume you might want to do it yourself

petaded · 2023-07-02T18:02:47Z

@petaded If you wish I can rebase this on development since the conflict is caused by merging #3668 which is made by me But do let me know since I assume you might want to do it yourself

That would be helpful thank you. I currently don't have access to any computer I can develop on atm.

I have seen your recent replies about updates to the PR but same as above, until I have somewhere I can make changes I'm stuck.

Squashed commits: [65932b4] update playlist and channel filtering [952a721] update subscriptions js to use premiereDate over durationText [530dea9] Add back isRSS and viewcount check to fix when in subscriptions page [93ebb76] Fix hide premiere [de7a8b4] ft-list-lazy-wrapper put whitespace back to what it was [8dadb59] move showResult from a method to a computed to work with v-if

github-actions · 2023-07-03T03:12:09Z

Conflicts have been resolved. A maintainer will review the pull request shortly.

PikachuEXE · 2023-07-03T03:16:14Z

@petaded
I have just rebased
You will see some code changes are gone since they were merged with #3668 (I rebased it on this branch earlier to solve conflict early) and it was supposed to be merged after this is merged

#3668 (comment)

So now the remaining changes are for Invidious API

PikachuEXE · 2023-07-09T11:31:56Z

@efb4f5ff-1298-471a-8973-3d47447115dc / @ChunkyProgrammer ?

efb4f5ff-1298-471a-8973-3d47447115dc

LGTM

efb4f5ff-1298-471a-8973-3d47447115dc · 2023-07-09T12:53:36Z

Created discussion #3744!

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

FreeTubeBot enabled auto-merge (squash) June 18, 2023 10:37

auto-merge was automatically disabled June 18, 2023 11:01
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 18, 2023 11:01

auto-merge was automatically disabled June 18, 2023 11:12
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 18, 2023 11:13

auto-merge was automatically disabled June 18, 2023 12:45
Head branch was pushed to by a user without write access

FreeTubeBot enabled auto-merge (squash) June 18, 2023 12:45

ChunkyProgrammer requested review from PikachuEXE, absidue, efb4f5ff-1298-471a-8973-3d47447115dc and ChunkyProgrammer June 19, 2023 00:57

PikachuEXE previously approved these changes Jun 19, 2023

View reviewed changes

PikachuEXE pushed a commit to PikachuEXE/FreeTube that referenced this pull request Jun 20, 2023

Changes from PR FreeTubeApp#3673

59ea17d

ChunkyProgrammer previously approved these changes Jun 20, 2023

View reviewed changes

PikachuEXE mentioned this pull request Jun 21, 2023

Update subscription view to be able to load videos from video cache per channel #3668

Merged

4 tasks

PikachuEXE pushed a commit to PikachuEXE/FreeTube that referenced this pull request Jun 28, 2023

Changes from PR FreeTubeApp#3673

2512f9c

PikachuEXE pushed a commit to PikachuEXE/FreeTube that referenced this pull request Jun 28, 2023

Changes from PR FreeTubeApp#3673

56aff33

efb4f5ff-1298-471a-8973-3d47447115dc requested changes Jun 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 Jun 28, 2023

auto-merge was automatically disabled June 28, 2023 08:18
Head branch was pushed to by a user without write access

petaded dismissed stale reviews from ChunkyProgrammer and PikachuEXE via 65932b4 June 28, 2023 08:18

petaded dismissed stale reviews from ChunkyProgrammer and PikachuEXE via e9b039c June 30, 2023 20:21

FreeTubeBot enabled auto-merge (squash) June 30, 2023 20:21

efb4f5ff-1298-471a-8973-3d47447115dc requested review from absidue, PikachuEXE and ChunkyProgrammer June 30, 2023 21:13

PikachuEXE requested changes Jun 30, 2023

View reviewed changes

github-actions bot added the PR: merge conflicts / rebase needed label Jul 2, 2023

petaded and others added 3 commits July 3, 2023 11:05

Fix Hide Premier for Invidous API

3989a79

Refactor code to be more redable with better doc

aa67d05

PikachuEXE force-pushed the dev/petaded/fix_hide_videos branch from e9b039c to aa67d05 Compare July 3, 2023 03:11

github-actions bot removed the PR: merge conflicts / rebase needed label Jul 3, 2023

PikachuEXE approved these changes Jul 5, 2023

View reviewed changes

PikachuEXE added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Jul 5, 2023

absidue approved these changes Jul 9, 2023

View reviewed changes

efb4f5ff-1298-471a-8973-3d47447115dc approved these changes Jul 9, 2023

View reviewed changes

FreeTubeBot merged commit 3eb657c into FreeTubeApp:development Jul 9, 2023
5 checks passed

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

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix Hide Channels and Hide Premier settings #3673

Fix Hide Channels and Hide Premier settings #3673

petaded commented Jun 18, 2023 •

edited

PikachuEXE commented Jun 18, 2023

petaded commented Jun 18, 2023

PikachuEXE commented Jun 19, 2023

PikachuEXE left a comment

PikachuEXE commented Jun 22, 2023

efb4f5ff-1298-471a-8973-3d47447115dc commented Jun 26, 2023 •

edited

PikachuEXE commented Jun 27, 2023

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

PikachuEXE Jun 30, 2023

PikachuEXE Jun 30, 2023

PikachuEXE Jun 30, 2023

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 1, 2023

PikachuEXE commented Jul 2, 2023

github-actions bot commented Jul 2, 2023

PikachuEXE commented Jul 2, 2023

petaded commented Jul 2, 2023 •

edited

github-actions bot commented Jul 3, 2023

PikachuEXE commented Jul 3, 2023

PikachuEXE commented Jul 9, 2023

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

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 9, 2023

-            (data.premiereDate != null ||
+            (data.premiereDate != null ||
+              // Invidious API
+              // `premiereTimestamp` only available on premiered videos
+              // https://docs.invidious.io/api/common_types/#videoobject
+              data.premiereTimestamp != null ||

		if (this.channelsHidden.includes(data.id) \|\| this.channelsHidden.includes(data.name) \|\|
		this.channelsHidden.includes(data.authorId) \|\| this.channelsHidden.includes(data.author)) {

-        if (this.channelsHidden.includes(data.id) || this.channelsHidden.includes(data.name) ||
-              this.channelsHidden.includes(data.authorId) || this.channelsHidden.includes(data.author)) {
+        const attrsToCheck = [
+          // Local API
+          data.id,
+          data.name,
+          // Invidious API
+          // https://docs.invidious.io/api/common_types/#channelobject
+          data.author,
+          data.authorId,
+        ]
+        if (attrsToCheck.some(a => a != null && this.channelsHidden.includes(a))) {

		if (this.channelsHidden.includes(data.channelId) \|\| this.channelsHidden.includes(data.channelName) \|\|
		this.channelsHidden.includes(data.authorId) \|\| this.channelsHidden.includes(data.author)) {

Fix Hide Channels and Hide Premier settings #3673

Fix Hide Channels and Hide Premier settings #3673

Conversation

petaded commented Jun 18, 2023 • edited

Fix Hide Channels and Hide Premier settings

Pull Request Type

Related issue

Description

Screenshots

Testing

Desktop

Additional context

PikachuEXE commented Jun 18, 2023

petaded commented Jun 18, 2023

PikachuEXE commented Jun 19, 2023

PikachuEXE left a comment

Choose a reason for hiding this comment

PikachuEXE commented Jun 22, 2023

efb4f5ff-1298-471a-8973-3d47447115dc commented Jun 26, 2023 • edited

PikachuEXE commented Jun 27, 2023

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

Choose a reason for hiding this comment

PikachuEXE Jun 30, 2023

Choose a reason for hiding this comment

PikachuEXE Jun 30, 2023

Choose a reason for hiding this comment

PikachuEXE Jun 30, 2023

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 1, 2023

PikachuEXE commented Jul 2, 2023

github-actions bot commented Jul 2, 2023

PikachuEXE commented Jul 2, 2023

petaded commented Jul 2, 2023 • edited

github-actions bot commented Jul 3, 2023

PikachuEXE commented Jul 3, 2023

PikachuEXE commented Jul 9, 2023

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

Choose a reason for hiding this comment

efb4f5ff-1298-471a-8973-3d47447115dc commented Jul 9, 2023

petaded commented Jun 18, 2023 •

edited

efb4f5ff-1298-471a-8973-3d47447115dc commented Jun 26, 2023 •

edited

petaded commented Jul 2, 2023 •

edited