Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add DeArrow support for ft-list-video titles #3688

Merged
merged 13 commits into from
Jul 3, 2023
Merged

Add DeArrow support for ft-list-video titles #3688

merged 13 commits into from
Jul 3, 2023

Conversation

ChunkyProgrammer
Copy link
Member

@ChunkyProgrammer ChunkyProgrammer commented Jun 20, 2023 •
edited
Loading

Add DeArrow support for ft-list-video titles

Pull Request Type

  • Feature Implementation

Description

DeArrow is offered through the SponsorBlock api to remove clickbaity titles and thumbnails. This PR adds support for the titles as the thumbnails are more complicated and require communicating with another server.

Future enhancements:

  • Use duration from DeArrow for video duration for rss feed
  • Implement DeArrow thumbnails

Testing

  • Go to Mr Beast's channel (without DeArrow)
  • Notice the title of the videos
  • Turn on DeArrow
  • Go to Mr Beast's channel
  • Notice different titles for some channels

Desktop

  • OS: Windows
  • OS Version: 11
  • FreeTube version: 0.18.0

@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Jun 20, 2023
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) June 20, 2023 02:03
PikachuEXE
PikachuEXE requested changes Jun 20, 2023
View reviewed changes
Copy link
Collaborator

@PikachuEXE PikachuEXE left a comment

Choose a reason for hiding this comment

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

Better naming

src/renderer/helpers/sponsorblock.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
PikachuEXE
PikachuEXE requested changes Jun 20, 2023
View reviewed changes
Copy link
Collaborator

@PikachuEXE PikachuEXE left a comment

Choose a reason for hiding this comment

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

Current name does not reflect what it does when reading in code

src/renderer/store/modules/settings.js Outdated Show resolved Hide resolved
PikachuEXE
PikachuEXE reviewed Jun 20, 2023
View reviewed changes
src/renderer/store/modules/utils.js Outdated Show resolved Hide resolved
src/renderer/store/modules/utils.js Outdated Show resolved Hide resolved
src/renderer/store/modules/utils.js Show resolved Hide resolved
PikachuEXE
PikachuEXE requested changes Jun 20, 2023
View reviewed changes
src/renderer/helpers/sponsorblock.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.vue Outdated Show resolved Hide resolved
ChunkyProgrammer and others added 2 commits June 20, 2023 10:08
@ChunkyProgrammer @PikachuEXE
Remove some code duplication
318c882 
Co-authored-by: PikachuEXE <pikachuexe@gmail.com>
@ChunkyProgrammer
fix lint issues + exception
45d8d66
ChunkyProgrammer and others added 2 commits June 20, 2023 12:21
@ChunkyProgrammer @ajayyy
Check for vote count when title is not locked
cbff1da 
Co-authored-by: Ajay Ramachandran <dev@ajay.app>
@ChunkyProgrammer
simplify title
fd9f971
PikachuEXE
PikachuEXE requested changes Jun 20, 2023
View reviewed changes
src/renderer/store/modules/utils.js Outdated Show resolved Hide resolved
src/renderer/store/modules/utils.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
src/renderer/components/ft-list-video/ft-list-video.js Outdated Show resolved Hide resolved
@ChunkyProgrammer @PikachuEXE
Fix deArrow title
cca7448 
Co-authored-by: PikachuEXE <pikachuexe@gmail.com>
@efb4f5ff-1298-471a-8973-3d47447115dc
Copy link
Member

I'm wondering if we should merge this before RC/Release or after like the Piped comments PR

@ChunkyProgrammer
Copy link
Member Author

ChunkyProgrammer commented Jun 21, 2023 •
edited
Loading

I'm wondering if we should merge this before RC/Release or after like the Piped comments PR

Imo this can be merged before the RC as it's a small change that adds more functionality to the already existing SponsorBlock API. I guess it depends on when we actually do a RC

@PikachuEXE
Copy link
Collaborator

Also it's disabled by default
Safe to be added and shouldn't bring any major issue

PikachuEXE
PikachuEXE previously approved these changes Jun 22, 2023
View reviewed changes
@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc linked an issue Jun 24, 2023 that may be closed by this pull request
[Feature Request]: DeArrow support #3696
Closed
3 tasks
@efb4f5ff-1298-471a-8973-3d47447115dc
Copy link
Member

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

Something to note: In the past people complained to us that FT was connecting to Cloudflare telemetry/logging services when it was actually SB doing that. SB is not doing that anymore but DeArrow is also making connections to Cloudflare, idk if its enabled on that side?

@ajayyy is the logging enabled or disabled for DeArrow?

PikachuEXE
PikachuEXE previously approved these changes Jun 27, 2023
View reviewed changes
efb4f5ff-1298-471a-8973-3d47447115dc
efb4f5ff-1298-471a-8973-3d47447115dc previously approved these changes Jun 27, 2023
View reviewed changes
Copy link
Member

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc left a comment •
edited
Loading

Choose a reason for hiding this comment

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

LGTM

Edit: #3688 (comment)?

@ajayyy
Copy link
Contributor

ajayyy commented Jun 27, 2023 •
edited
Loading

Maybe change the setting name

Use DeArrow titles

to

Replace titles with user-submitted titles from DeArrow

or

Replace titles with alternatives from DeArrow

or

Replace titles using DeArrow

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) June 27, 2023 20:55
@efb4f5ff-1298-471a-8973-3d47447115dc
Copy link
Member

I like Replace titles with user-submitted titles from DeArrow because maybe users will be like: hey maybe i can submit titles too

@absidue absidue added PR: changes requested and removed PR: waiting for review For PRs that are complete, tested, and ready for review labels Jun 30, 2023
@ChunkyProgrammer ChunkyProgrammer added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Jul 2, 2023
@FreeTubeBot FreeTubeBot merged commit cf88bd7 into FreeTubeApp:development Jul 3, 2023
5 checks passed
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Jul 3, 2023
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Jul 6, 2023
@PikachuEXE
Merge branch 'development' into feature/playlist-2023-05
43aa379 
* development: (21 commits)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese (Portugal))
  Translated using Weblate (Czech)
  Translated using Weblate (French)
  Translated using Weblate (Norwegian Bokmål)
  Translated using Weblate (Japanese)
  Translated using Weblate (Spanish)
  Translated using Weblate (Hebrew)
  Translated using Weblate (Arabic)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Turkish)
  Add DeArrow support for ft-list-video titles (FreeTubeApp#3688)
  Utils: Don't provide `ytdl://` protocol links to external players (FreeTubeApp#3720)
  Bump electron from 22.3.14 to 22.3.15 (FreeTubeApp#3723)
  Bump webpack from 5.88.0 to 5.88.1 (FreeTubeApp#3722)
  Bump eslint from 8.43.0 to 8.44.0 (FreeTubeApp#3724)
  ...

# Conflicts:
#	src/renderer/components/ft-list-video/ft-list-video.js
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Jul 6, 2023
@PikachuEXE
Merge branch 'feature/playlist-2023-05' into custom-builds/tmp
f499e77 
* feature/playlist-2023-05: (21 commits)
  Translated using Weblate (Portuguese)
  Translated using Weblate (Portuguese (Portugal))
  Translated using Weblate (Czech)
  Translated using Weblate (French)
  Translated using Weblate (Norwegian Bokmål)
  Translated using Weblate (Japanese)
  Translated using Weblate (Spanish)
  Translated using Weblate (Hebrew)
  Translated using Weblate (Arabic)
  Translated using Weblate (Italian)
  Translated using Weblate (Chinese (Traditional))
  Translated using Weblate (Chinese (Simplified))
  Translated using Weblate (Ukrainian)
  Translated using Weblate (Hungarian)
  Translated using Weblate (Turkish)
  Add DeArrow support for ft-list-video titles (FreeTubeApp#3688)
  Utils: Don't provide `ytdl://` protocol links to external players (FreeTubeApp#3720)
  Bump electron from 22.3.14 to 22.3.15 (FreeTubeApp#3723)
  Bump webpack from 5.88.0 to 5.88.1 (FreeTubeApp#3722)
  Bump eslint from 8.43.0 to 8.44.0 (FreeTubeApp#3724)
  ...
@aleksejrs aleksejrs mentioned this pull request Jul 6, 2023
Closed
3 tasks
@absidue absidue mentioned this pull request Jul 29, 2023
Merged
1 task
@ChunkyProgrammer ChunkyProgrammer deleted the add-dearrow-support-for-ft-list-video branch August 15, 2023 19:20
@absidue absidue mentioned this pull request Nov 12, 2023
Closed
1 task
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ajayyy ajayyy ajayyy left review comments

@PikachuEXE PikachuEXE PikachuEXE approved these changes

@absidue absidue absidue approved these changes

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc approved these changes

@MarmadileManteater MarmadileManteater Awaiting requested review from MarmadileManteater

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[Feature Request]: DeArrow support
6 participants
@ChunkyProgrammer @efb4f5ff-1298-471a-8973-3d47447115dc @PikachuEXE @ajayyy @absidue @FreeTubeBot