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 Creative Commons License to Description of Videos #6614

Merged
merged 3 commits into from
Jan 31, 2025
Merged

Add Creative Commons License to Description of Videos #6614

merged 3 commits into from
Jan 31, 2025

Conversation

SudharakaP
Copy link
Contributor

@SudharakaP SudharakaP commented Jan 20, 2025 •
edited by absidue
Loading

Title

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Related issue

Closes #6600

Description

Add Creative Commons License to Description of Videos. In this PR it just shows the CC license if the license exists or nothing if it's standard YouTube license creating the exact same behaviour of the YouTube app. One thing we can improve is to add a link to the CC license (at, https://creativecommons.org/licenses/by/3.0/legalcode) but I thought to keep this initial PR simple by just adding the license text.

Add creative common license text to the video description if the video is licensed under creative commons.

Screenshots

image

Testing

Screenshot on Different Device Sizes with a Video with CC

image

image

Screenshot of a video without CC license

image

@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Jan 20, 2025
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) January 20, 2025 20:52
PikachuEXE
PikachuEXE reviewed Jan 21, 2025
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.

Please do not skip some of the PR template especially the testing part

Example videos:
https://youtube.com/playlist?list=PLPDjhzarwzCi_nKnIKGyX-nqUZDaeElnB

@PikachuEXE PikachuEXE requested a review from absidue January 21, 2025 01:57
@SudharakaP
Copy link
Contributor Author

Please do not skip some of the PR template especially the testing part

Example videos: https://youtube.com/playlist?list=PLPDjhzarwzCi_nKnIKGyX-nqUZDaeElnB

Sorry I thought the screenshots section is enough for the testing part. I've just tested on different screen sizes as well as a video without the CC license and uploaded the screenshot above

@SudharakaP SudharakaP requested a review from PikachuEXE January 21, 2025 03:16
@efb4f5ff-1298-471a-8973-3d47447115dc
Copy link
Member

Is it possible to make this part of the description like on YT. I dont like the current placement.

auto-merge was automatically disabled January 22, 2025 06:07

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) January 22, 2025 06:08
@SudharakaP
Copy link
Contributor Author

Is it possible to make this part of the description like on YT. I dont like the current placement.

Done; now it is in the description like so,

image

absidue
absidue reviewed Jan 22, 2025
View reviewed changes
src/renderer/views/Watch/Watch.js Outdated Show resolved Hide resolved
src/renderer/views/Watch/Watch.js Outdated Show resolved Hide resolved
auto-merge was automatically disabled January 22, 2025 23:37

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) January 22, 2025 23:38
@SudharakaP SudharakaP requested a review from absidue January 22, 2025 23:39
efb4f5ff-1298-471a-8973-3d47447115dc
efb4f5ff-1298-471a-8973-3d47447115dc requested changes Jan 27, 2025
View reviewed changes
Copy link
Member

Choose a reason for hiding this comment

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

License shouldnt show up in the preview

How the PR handles it:

VirtualBoxVM_mts39BDdtg.mp4

How YT does it:

VirtualBoxVM_y9CTHvpXgT.mp4

@efb4f5ff-1298-471a-8973-3d47447115dc 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 Jan 27, 2025
auto-merge was automatically disabled January 28, 2025 20:56

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) January 28, 2025 20:56
auto-merge was automatically disabled January 28, 2025 21:01

Head branch was pushed to by a user without write access

@FreeTubeBot FreeTubeBot enabled auto-merge (squash) January 28, 2025 21:02
@SudharakaP
Copy link
Contributor Author

License shouldnt show up in the preview

@efb4f5ff-1298-471a-8973-3d47447115dc : Makes senses and I just changed this to the behaviour you suggested. I initially did the other way intentionally as I though that was a bit better given that within the description the license is much harder to see.

@efb4f5ff-1298-471a-8973-3d47447115dc efb4f5ff-1298-471a-8973-3d47447115dc added PR: waiting for review For PRs that are complete, tested, and ready for review and removed PR: changes requested labels Jan 28, 2025
@FreeTubeBot FreeTubeBot merged commit 8de1026 into FreeTubeApp:development Jan 31, 2025
6 checks passed
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Jan 31, 2025
@SudharakaP SudharakaP deleted the feat/add-cc-license branch January 31, 2025 14:51
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Feb 1, 2025
@PikachuEXE
Merge branch 'development' into custom-builds/current
952c074 
* development:
  Translated using Weblate (Indonesian)
  Bump version number to v0.23.1
  Translated using Weblate (Portuguese (Brazil))
  Fix comment sorting when sort by newest is the default (FreeTubeApp#6702)
  ! Fix license data reading code causing some videos cannot be played (FreeTubeApp#6682)
  Translated using Weblate (Spanish)
  Update release.yml
  Update release.yml
  Bump version number to v0.23.0
  Add Creative Commons License to Description of Videos (FreeTubeApp#6614)
  Only refresh current trending tab (FreeTubeApp#6667)
  Translated using Weblate (Icelandic)
  Translated using Weblate (Chinese (Traditional Han script))
  Translated using Weblate (Arabic)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@PikachuEXE PikachuEXE PikachuEXE approved these changes

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

@MarmadileManteater MarmadileManteater MarmadileManteater approved these changes

@absidue absidue Awaiting requested review from absidue

@kommunarr kommunarr Awaiting requested review from kommunarr

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]: Show Creative Commons license in video description
6 participants
@SudharakaP @efb4f5ff-1298-471a-8973-3d47447115dc @PikachuEXE @absidue @MarmadileManteater @FreeTubeBot