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

Update FT history import to accept key lastViewedPlaylistId #4038

Merged
merged 2 commits into from
Sep 29, 2023
Merged

Update FT history import to accept key lastViewedPlaylistId #4038

merged 2 commits into from
Sep 29, 2023

Conversation

PikachuEXE
Copy link
Collaborator

Pull Request Type

  • Bugfix
  • Feature Implementation
  • Documentation
  • Other

Related issue

#3006

Description

Fix incorrect import logic & error message reported at #4017 (comment) due to lack of import logic update in #3006

Also update the strange required key check logic
Which was last changed by 58882b3
_id is now optional (it should be optional in 58882b3 I believe)
Missing keys will be printed in console too

Also removes unused video property paid (optional, can be put in another PR or discard)

Screenshots

Taken before paid removed
Screenshot 2023-09-13 at 09 05 13

Testing

If you want remove a random required key and import to see error message in console

Desktop

  • OS:
  • OS Version:
  • FreeTube version:

Additional context

@github-actions github-actions bot added the PR: waiting for review For PRs that are complete, tested, and ready for review label Sep 13, 2023
@FreeTubeBot FreeTubeBot enabled auto-merge (squash) September 13, 2023 01:29
@PikachuEXE PikachuEXE changed the title * Update FT history import to accept key lastViewedPlaylistId Update FT history import to accept key lastViewedPlaylistId Sep 13, 2023
efb4f5ff-1298-471a-8973-3d47447115dc
efb4f5ff-1298-471a-8973-3d47447115dc approved these changes Sep 25, 2023
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.

LGTM

@FreeTubeBot FreeTubeBot merged commit c936a0e into FreeTubeApp:development Sep 29, 2023
@github-actions github-actions bot removed the PR: waiting for review For PRs that are complete, tested, and ready for review label Sep 29, 2023
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Oct 8, 2023
@PikachuEXE
Merge branch 'development' into feature/playlist-2023-05
21be0b1 
* development:
  ! Fix playlist item fetching for local API (FreeTubeApp#4102)
  ! Fix watch page video published time parsing (FreeTubeApp#4105)
  Translated using Weblate (Serbian)
  Bump youtubei.js from 6.4.0 to 6.4.1 (FreeTubeApp#4090)
  Bump rimraf from 5.0.1 to 5.0.5 (FreeTubeApp#4091)
  Bump the stylelint group with 2 updates (FreeTubeApp#4088)
  Bump electron from 22.3.24 to 22.3.25 (FreeTubeApp#4089)
  Translated using Weblate (Bulgarian)
  Update FT history import to accept key lastViewedPlaylistId (FreeTubeApp#4038)
  Translated using Weblate (Dutch)
  Translated using Weblate (Lithuanian)
  Translated using Weblate (Japanese)
  Translated using Weblate (Croatian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Croatian)

# Conflicts:
#	src/renderer/components/data-settings/data-settings.js
#	src/renderer/components/ft-list-video/ft-list-video.js
#	src/renderer/components/watch-video-info/watch-video-info.js
#	src/renderer/views/Playlist/Playlist.js
#	src/renderer/views/Watch/Watch.js
PikachuEXE added a commit to PikachuEXE/FreeTube that referenced this pull request Oct 8, 2023
@PikachuEXE
Merge branch 'feature/playlist-2023-05' into custom-builds/current
4a629be 
* feature/playlist-2023-05: (176 commits)
  ! Fix playlist item fetching for local API (FreeTubeApp#4102)
  ! Fix watch page video published time parsing (FreeTubeApp#4105)
  Translated using Weblate (Serbian)
  Bump youtubei.js from 6.4.0 to 6.4.1 (FreeTubeApp#4090)
  Bump rimraf from 5.0.1 to 5.0.5 (FreeTubeApp#4091)
  Bump the stylelint group with 2 updates (FreeTubeApp#4088)
  Bump electron from 22.3.24 to 22.3.25 (FreeTubeApp#4089)
  Translated using Weblate (Bulgarian)
  Update FT history import to accept key lastViewedPlaylistId (FreeTubeApp#4038)
  ! Fix ft-video having different URLs in links
  Translated using Weblate (Dutch)
  Translated using Weblate (Lithuanian)
  Translated using Weblate (Japanese)
  Translated using Weblate (Croatian)
  Translated using Weblate (Estonian)
  Translated using Weblate (Croatian)
  ! Fix external player handling for video in local playlist
  Translated using Weblate (Finnish)
  Mobile/tablet channel page & share button visual improvements (FreeTubeApp#4061)
  Support multiple audio tracks and AV1 for Invidious by using the local API DASH manifest generator (FreeTubeApp#3942)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ChunkyProgrammer ChunkyProgrammer ChunkyProgrammer approved these changes

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

@absidue absidue absidue approved these changes

@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.
5 participants
@PikachuEXE @absidue @efb4f5ff-1298-471a-8973-3d47447115dc @ChunkyProgrammer @FreeTubeBot