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

[Videos] Video player - PR #2 - better web support #4732

Merged
merged 47 commits into from
Aug 7, 2024
Merged

[Videos] Video player - PR #2 - better web support #4732

merged 47 commits into from
Aug 7, 2024

Conversation

mozzius
Copy link
Member

@mozzius mozzius commented Jul 4, 2024 •
edited
Loading

Stacked on #4638 and #4731

Autoplay support + custom player for web. Probably messes up native since I made API changes to the active video system

Screenshot 2024-07-31 at 17 36 16

@render Render
Copy link

render bot commented Jul 4, 2024

Your Render PR Server URL is https://social-app-pr-4732.onrender.com.

Follow its progress at https://dashboard.render.com/web/srv-cq3flr2j1k6c73fqd7t0.

@github-actions GitHub Actions
Copy link

github-actions bot commented Jul 4, 2024 •
edited
Loading

Old size New size Diff
7.15 MB 7.15 MB 3.64 KB (0.05%)

@mozzius mozzius changed the base branch from main to samuel/videos-player July 4, 2024 20:42
Base automatically changed from samuel/videos-player to main July 25, 2024 19:41
@mozzius mozzius force-pushed the samuel/videos-web branch 3 times, most recently from 06cff1f to 2453031 Compare July 26, 2024 13:37
@mozzius mozzius force-pushed the samuel/videos-web branch from 8ad9a70 to e7d269e Compare July 30, 2024 18:05
@mozzius mozzius marked this pull request as ready for review July 31, 2024 16:50
@mozzius
Copy link
Member Author

mozzius commented Aug 2, 2024 •
edited
Loading

As-yet-unsolved mystery - why are subtitles stuck to the bottom of the screen?

Screenshot 2024-08-02 at 23 18 38

I tried providing a custom cueHandler, but it doesn't seem to want to use it

@mozzius
Copy link
Member Author

mozzius commented Aug 2, 2024

note to self - I put some work on https://github.com/bluesky-social/social-app/tree/samuel/cue-fix

@haileyok haileyok self-requested a review August 5, 2024 19:32
This was referenced Aug 6, 2024
Merged
Merged
haileyok
haileyok reviewed Aug 7, 2024
View reviewed changes
Copy link
Contributor

@haileyok haileyok left a comment

Choose a reason for hiding this comment

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

Reviewed everything up to web controls (wow!), but this works really well. Just left mostly questions and a few things I think we might be able to simplify irt web/native split.

Re: the latter, I think my suggestion might be to - if this makes sense with your understanding of how this all works...

  • Remove <VideoPlayerProvider> from <ActiveVideoProvider>
  • Keep wrapping the web app in <ActiveVideoProvider>
  • Wrap the native app in <VideoPlayerProvider>

src/view/com/util/post-embeds/ActiveVideoContext.tsx Outdated Show resolved Hide resolved
src/view/com/util/post-embeds/VideoEmbed.web.tsx Show resolved Hide resolved
src/state/preferences/subtitles.tsx Show resolved Hide resolved
src/view/com/util/post-embeds/VideoEmbed.web.tsx
)
observer.observe(ref.current)
return () => observer.disconnect()
}, [sendPosition])
Copy link
Contributor

Choose a reason for hiding this comment

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

Is there any downside to this running each time sendPosition changes? Right now it looks like:

  • Every window size change (this one seems fine tbh)
  • Every time the activeViewId changes (maybe intentional?)
  • Every time manuallySet changes (maybe unnecessary?)

Asking because I think we could eliminate the latter two easily if you care. Otherwise LGTM.

Copy link
Member Author

Choose a reason for hiding this comment

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

I mean we could eliminate the other two but they will only change infrequently. If we could get rid of activeViewId that would be good

src/view/com/util/post-embeds/VideoEmbed.web.tsx
const position = rect.y + rect.height / 2
sendPosition(position)
}
}, [isAnyViewActive, sendPosition])
Copy link
Contributor

Choose a reason for hiding this comment

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

same question here re: sendPosition

@haileyok
Copy link
Contributor

haileyok commented Aug 7, 2024

Okay got through things I think! Definitely could have missed some weird glitchy stuff but I couldn't break it with any of the ways I was able to before! Great work!!!

Re: lint, just have to address #4732 (comment) I think.

@mozzius mozzius merged commit fff2c07 into main Aug 7, 2024
6 checks passed
@mozzius mozzius deleted the samuel/videos-web branch August 7, 2024 19:07
quiple added a commit to quiple/social-app that referenced this pull request Aug 8, 2024
@quiple
Squashed commit of the following:
ed084b7 
commit af52626
Author: Minseo Lee <itoupluk427@gmail.com>
Date:   Thu Aug 8 21:12:23 2024 +0900

    Added trans (bluesky-social#4890)

commit a864f69
Author: dan <dan.abramov@gmail.com>
Date:   Thu Aug 8 06:20:24 2024 +0100

    Keep interstitial fresh on refresh (bluesky-social#4888)

commit 00fea10
Author: dan <dan.abramov@gmail.com>
Date:   Thu Aug 8 05:56:22 2024 +0100

    Include popcluster in suggestion ranking (bluesky-social#4887)

commit b309241
Author: Hailey <me@haileyok.com>
Date:   Wed Aug 7 17:13:29 2024 -0700

    Add logging of selected feed preference when displaying the following feed (bluesky-social#4789)

commit 1b02f81
Author: Hailey <me@haileyok.com>
Date:   Wed Aug 7 14:45:06 2024 -0700

    [Video] Visibility detection view (bluesky-social#4741)

    Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com>

commit fff2c07
Author: Samuel Newman <mozzius@protonmail.com>
Date:   Wed Aug 7 18:47:51 2024 +0100

    [Videos] Video player - PR #2 - better web support (bluesky-social#4732)

    * attempt some sort of "usurping" system

    * polling-based active video approach

    * split into inner component again

    * click to steal active video

    * disable findAndActivateVideo on native

    * new intersectionobserver approach - wip

    * fix types

    * disable perf optimisation to allow overflow

    * make active player indicator subtler, clean up video utils

    * partially fix double-playing

    * start working on controls

    * fullscreen API

    * get buttons working somewhat

    * rm source from where it shouldn't be

    * use video elem as source of truth

    * fix keyboard nav + mute state

    * new icons, add fullscreen + time + fix play

    * unmount when far offscreen + round 2dp

    * listen globally to clicks rather than blur event

    * move controls to new file

    * reduce quality when not active

    * add hover state to buttons

    * stop propagation of videoplayer click

    * move around autoplay effects

    * increase background contrast

    * add subtitles button

    * add stopPropagation to root of video player

    * clean up VideoWebControls

    * fix chrome

    * change quality based on focused state

    * use autoLevelCapping instead of nextLevel

    * get subtitle track from stream

    * always use hlsjs

    * rework hls into a ref

    * render player earlier, allowing preload

    * add error boundary

    * clean up component structure and organisation

    * rework fullscreen API

    * disable fullscreen on iPhone

    * don't play when ready on pause

    * debounce buffering

    * simplify giant list of event listeners

    * update pref

    * reduce prop drilling

    * minimise rerenders in `ActiveViewContext`

    * restore prop drilling

    ---------

    Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com>
    Co-authored-by: Hailey <me@haileyok.com>

commit b701e8c
Author: Samuel Newman <mozzius@protonmail.com>
Date:   Wed Aug 7 16:56:12 2024 +0100

    [Video] Authed video upload (bluesky-social#4885)

    * add service auth call

    * update API package

    ---------

    Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com>

commit 753a233
Author: Hailey <me@haileyok.com>
Date:   Tue Aug 6 11:21:59 2024 -0700

    Tweak feed manip to show cases of A -> B without further children (bluesky-social#4883)

commit 5845e08
Author: dan <dan.abramov@gmail.com>
Date:   Tue Aug 6 17:12:27 2024 +0100

    Show own replies before follows' replies in threads (bluesky-social#4882)

commit b291a1e
Author: dan <dan.abramov@gmail.com>
Date:   Tue Aug 6 16:42:42 2024 +0100

    Show more replies in Following (different heuristic) (bluesky-social#4880)

commit 686d5eb
Author: dan <dan.abramov@gmail.com>
Date:   Tue Aug 6 01:30:52 2024 +0100

    [Persisted] Make broadcast subscriptions granular by key (bluesky-social#4874)

    * Add fast path for guaranteed noop updates

    * Change persisted.onUpdate() API to take a key

    * Implement granular broadcast listeners

commit 966f6c5
Author: dan <dan.abramov@gmail.com>
Date:   Tue Aug 6 01:03:27 2024 +0100

    [Persisted] Fix the race condition causing clobbered writes between tabs (bluesky-social#4873)

    * Broadcast the update in the same tick

    The motivation for the original code is unclear. I was not able to reproduce the described behavior and have not seen it mentioned on the web. I'll assume that this was a misunderstanding.

    * Remove defensive programming

    The only places in this code that we can expect to throw are schema.parse(), JSON.parse(), JSON.stringify(), and localStorage.getItem/setItem/removeItem. Let's push try/catch'es where we expect them to be necessary.

    * Don't write or clobber defaults

    Writing defaults to local storage is unnecessary. We would write them as a part of next update anyway. So I'm removing that to reduce the number of moving pieces.

    However, we do need to be wary of _state being set to defaults. Because _state gets mutated on write. We don't want to mutate the defaults object. To avoid having to think about this, let's copy on write. We don't write to this object very often.

    * Refactor: extract tryParse

    * Refactor: move string parsing into tryParse

    * Extract tryStringify, split logging by platform

    Shared data parsing/stringification errors are always logged. Storage errors are only logged on native because we trust the web APIs to work.

    * Add a layer of caching to readFromStorage to web

    We're going to be doing a read on every write so let's add a fast path that avoids parsing and validating.

    * Fix the race condition causing clobbered writes between tabs

commit 5bf7f37
Author: dan <dan.abramov@gmail.com>
Date:   Tue Aug 6 00:30:58 2024 +0100

    [Persisted] Fork web and native, make it synchronous on the web (bluesky-social#4872)

    * Delete logic for legacy storage

    * Delete superfluous tests

    At this point these tests aren't testing anything useful, let's just get rid of them.

    * Inline store.ts methods into persisted/index.ts

    * Fork persisted/index.ts into index.web.ts

    * Remove non-essential code and comments from both forks

    * Remove async/await from web fork of persisted/index.ts

    * Remove unused return

    * Enforce that forked types match

commit 74b0318
Author: dan <dan.abramov@gmail.com>
Date:   Mon Aug 5 20:51:41 2024 +0100

    Show replies in context of their threads (bluesky-social#4871)

    * Don't reconstruct threads from separate posts

    * Remove post-level dedupe for now

    * Change repost dedupe condition to look just at length

    * Delete unused isThread

    * Delete another isThread field

    It is now meaningless because there's nothing special about author threads.

    * Narrow down slice item shape so it does not need reply

    * Consolidate slice validation criteria in one place

    * Show replies in context

    * Make fallback marker work

    * Remove misleading and now-unused property

    It was called rootUri but it was actually the leaf URI. Regardless, it's not used anymore.

    * Add by-thread dedupe to non-author feeds

    * Add post-level dedupe

    * Always count from the start

    This is easier to think about.

    * Only tuner state need to be untouched on dry run

    * Account for threads in reply filtering

    * Remove repost deduping

    This is already being taken care of by item-level deduping. It's also now wrong and removing too much (since it wasn't filtering for reposts directly).

    * Calculate rootUri correctly

    * Apply Following settings to all lists

    * Don't dedupe intentional reposts by thread

    * Show reply parent when ambiguous

    * Explicitly remove orphaned replies from following/lists

    * Fix thread dedupe to work across pages

    * Mark grandparent-blocked as orphaned

    * Guard tuner state change by dryRun

    * Remove dead code

    * Don't dedupe feedgen threads

    * Revert "Apply Following settings to all lists"

    This reverts commit aff86be.

    Let's not do this yet and have a bit more discussion. This is a chunky change already.

    * Reason belongs to a slice, not item

    * Logically feedContext belongs to the slice

    * Update comment to reflect latest behavior

commit 18b4233
Author: Hailey <me@haileyok.com>
Date:   Mon Aug 5 12:21:34 2024 -0700

    Add `PlatformInfo` module (bluesky-social#4877)

commit fb27838
Author: bnewbold <bnewbold@robocracy.org>
Date:   Fri Aug 2 15:57:50 2024 -0700

    bskyweb: optional basic auth password middleware (bluesky-social#4759)

commit 6298e68
Author: Samuel Newman <mozzius@protonmail.com>
Date:   Sat Aug 3 00:33:45 2024 +0200

    tweak list header (bluesky-social#4870)

    Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com>

commit c3d8bee
Author: Eric Bailey <git@esb.lol>
Date:   Fri Aug 2 13:05:33 2024 -0500

    Respect labels on feeds and lists (bluesky-social#4818)

    * Prep

    * Pass in optional moderation to FeedCard

    * Compute moderation decision, filter contentList contexts, pass into card

    * Let's go a different route

    * Filter from within search queries

    * Use same search query for starter packs

    * Filter lists from profile tabs

    * Cleanup

    * Filter from profile feeds

    * Moderate post embeds

    * Memoize

    * Use ScreenHider on lists

    * Hide both list types

    * Fix crash on iOS in screen hider, fix lineheight

    * Memoize renderItem

    * Reuse objects to prevent re-renders

commit 293ac6f
Author: dan <dan.abramov@gmail.com>
Date:   Fri Aug 2 17:13:31 2024 +0100

    Only show replies in Following if following all involved actors (bluesky-social#4869)

    * Only show replies in Following for followed root and grandparent

    * Remove now-unnecessary check

    * Simplify condition

commit 7f292ab
Author: dan <dan.abramov@gmail.com>
Date:   Thu Aug 1 22:05:40 2024 +0100

    Always limit Following replies to the people you follow (bluesky-social#4868)

    * Limit feed replies to people you follow

    * Remove dead code

commit f056cb6
Author: Hailey <me@haileyok.com>
Date:   Thu Aug 1 10:32:36 2024 -0700

    Fix missing header on Likes/Reposted By, add missing perf optimizations (bluesky-social#4867)

    * fix liked by list

    * fix lists

    * tweaks to style

    * change string

commit c78e9e3
Author: Samuel Newman <mozzius@protonmail.com>
Date:   Thu Aug 1 19:14:32 2024 +0200

    Move theme controls to its own screen (bluesky-social#4866)

commit 388c157
Author: dan <dan.abramov@gmail.com>
Date:   Thu Aug 1 17:49:43 2024 +0100

    Display second-to-last rather than second post in a slice (bluesky-social#4864)

commit b0e130a
Author: Eric Bailey <git@esb.lol>
Date:   Thu Aug 1 10:29:27 2024 -0500

    Update muted words dialog with `expiresAt` and `actorTarget` (bluesky-social#4801)

    * WIP not working dropdown

    * Update MutedWords dialog

    * Add i18n formatDistance

    * Comments

    * Handle text wrapping

    * Update label copy

    Co-authored-by: Hailey <me@haileyok.com>

    * Fix alignment

    * Improve translation output

    * Revert toggle changes

    * Better types for useFormatDistance

    * Tweaks

    * Integrate new sdk version into TagMenu

    * Use ampersand

    Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>

    * Bump SDK

    ---------

    Co-authored-by: Hailey <me@haileyok.com>
    Co-authored-by: surfdude29 <149612116+surfdude29@users.noreply.github.com>

commit d2e88cc
Author: dan <dan.abramov@gmail.com>
Date:   Thu Aug 1 02:27:25 2024 +0100

    Fetch enough pages to fill a page's worth of items (bluesky-social#4863)

    * Fetch enough pages to fill a page's worth of items

    * Add failsafe in case of appview bug

commit 70ffd38
Author: Hailey <me@haileyok.com>
Date:   Wed Jul 31 11:16:14 2024 -0700

    Only show "followed you back" when appropriate (bluesky-social#4849)

    * only show followed back when we should

    * try/catch

    * log

    * Update FeedItem.tsx

    * tweak

commit 576cef8
Author: dan <dan.abramov@gmail.com>
Date:   Wed Jul 31 19:10:24 2024 +0100

    [Web] Retrigger onEndReached if needed when content height changes (bluesky-social#4859)

    * Extract EdgeVisibility

    * Key Visibility by container height instead of item count

commit c75bb65
Author: dan <dan.abramov@gmail.com>
Date:   Wed Jul 31 13:00:22 2024 +0100

    Remove unused NoopFeedTuner (bluesky-social#4856)

commit c3e77b5
Author: GSMT <samaritanojr006@gmail.com>
Date:   Wed Jul 31 00:19:23 2024 +0200

    useDedupe callback (bluesky-social#4855)

commit 8ddb28d
Author: Hailey <me@haileyok.com>
Date:   Tue Jul 30 08:25:31 2024 -0700

    [Video] Uploads (bluesky-social#4754)

    * state for video uploads

    * get upload working

    * add a debug log

    * add post progress

    * progress

    * fetch data

    * add some progress info, web uploads

    * post on finished uploading (wip)

    * add a note

    * add some todos

    * clear video

    * merge some stuff

    * convert to `createUploadTask`

    * patch expo modules core

    * working native upload progress

    * platform fork

    * upload progress for web

    * cleanup

    * cleanup

    * more tweaks

    * simplify

    * fix type errors

    ---------

    Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com>
Merge remote-tracking branch 'upstream/main' into Improve-notification-localization
estrattonbailey added a commit that referenced this pull request Aug 8, 2024
@estrattonbailey
Merge remote-tracking branch 'origin/main' into follow-is-as-follow-does
aa8b783 
* origin/main: (45 commits)
  Added trans (#4890)
  Keep interstitial fresh on refresh (#4888)
  Include popcluster in suggestion ranking (#4887)
  Add logging of selected feed preference when displaying the following feed (#4789)
  [Video] Visibility detection view (#4741)
  [Videos] Video player - PR #2 - better web support (#4732)
  [Video] Authed video upload (#4885)
  Tweak feed manip to show cases of A -> B without further children (#4883)
  Show own replies before follows' replies in threads (#4882)
  Show more replies in Following (different heuristic) (#4880)
  [Persisted] Make broadcast subscriptions granular by key (#4874)
  [Persisted] Fix the race condition causing clobbered writes between tabs (#4873)
  [Persisted] Fork web and native, make it synchronous on the web (#4872)
  Show replies in context of their threads (#4871)
  Add `PlatformInfo` module (#4877)
  bskyweb: optional basic auth password middleware (#4759)
  tweak list header (#4870)
  Respect labels on feeds and lists (#4818)
  Only show replies in Following if following all involved actors (#4869)
  Always limit Following replies to the people you follow (#4868)
  ...
@mozzius mozzius mentioned this pull request Aug 8, 2024
Merged
estrattonbailey added a commit that referenced this pull request Aug 8, 2024
@estrattonbailey
Merge remote-tracking branch 'origin/main' into reply-qp-moderation
b2c9dc4 
* origin/main: (30 commits)
  Show just-posted replies above OP replies (#4901)
  Remove client filtering of starter packs (#4753)
  Remove show_avi_follow_button (#4900)
  Remove native_pwi_disabled (#4896)
  Fix overflow on posts (#4899)
  Move onPressReply into child component (#4898)
  Remove new_user_progress_guide (#4895)
  Remove explore_page_profile_card_social_proof (#4894)
  Remove ungroup_follow_backs gate (#4893)
  Remove unnecessary state update for reply gate (#4897)
  Include follow-based suggestions in interstitial (#4889)
  Cleanup flags (#4891)
  ALF suggested follows in profile header (#4828)
  Added trans (#4890)
  Keep interstitial fresh on refresh (#4888)
  Include popcluster in suggestion ranking (#4887)
  Add logging of selected feed preference when displaying the following feed (#4789)
  [Video] Visibility detection view (#4741)
  [Videos] Video player - PR #2 - better web support (#4732)
  [Video] Authed video upload (#4885)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@haileyok haileyok haileyok approved these changes

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

Successfully merging this pull request may close these issues.
2 participants
@mozzius @haileyok