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.

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

Update muted words dialog with expiresAt and actorTarget #4801

Merged
merged 15 commits into from
Aug 1, 2024

Conversation

estrattonbailey
Copy link
Member

@estrattonbailey estrattonbailey commented Jul 19, 2024

Relies on bluesky-social/atproto#2276

Adds support for timed mute words, as well as targeting only those users whom you don't follow. Also integrates new handlers into the TagMenu (when clicking or long-pressing on a tag).

This PR also adds a new hook useFormatDistance, with the intent that we can add more in the pattern of use<method> where method is a date-fns method that accepts localization. Right now, all our app languages are supported with the exception of Gaelic. In the interest of time and stability (I'd like to use a library for this) I think this is an OK trade-off. We can help facilitate a ga translation in the near future.

image

i18n works:
CleanShot 2024-07-19 at 14 24 27@2x

Copy link

render bot commented Jul 19, 2024

Copy link

github-actions bot commented Jul 19, 2024

Old size New size Diff
7.02 MB 7.15 MB 132.99 KB (1.85%)

@surfdude29
Copy link
Contributor

surfdude29 commented Jul 19, 2024

While you're working on updating the muted words dialog, might it be possible to squeeze in a fix for #3311? 🙏

This issue currently affects the web interface in Catalan, Finnish, French, German, Irish, Portuguese and Ukrainian.

EDIT: In fact, looking at the screenshots, it seems that the shorter English string combined with the design changes might well already fix this for some, maybe even all, languages at the default font size (when the shorter, updated strings are localized). Although it perhaps might still be an issue at larger font sizes.

EDIT 2: Also, I just wanted to say that these are very cool changes, excellent work! 💫

EDIT 3: The branch name? 🤌

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.

Cooooool 😎

Just gave it a quick glance, highlighting these few things since i noticed them

Should align the text w/ the icon and "selected" state here

Screenshot 2024-07-23 at 12 38 02 PM

Seems the list of words is borked on iOS/Android (weirdly in different ways on both platforms heh).

Screenshot 2024-07-23 at 11 30 25 AM
Screenshot 2024-07-23 at 12 40 06 PM

src/components/dialogs/MutedWords.tsx Outdated Show resolved Hide resolved
src/components/dialogs/MutedWords.tsx Outdated Show resolved Hide resolved
@estrattonbailey
Copy link
Member Author

Contrived example, but text can now handle wrapping for languages with longer transations.

CleanShot 2024-07-23 at 15 17 22@2x

@estrattonbailey
Copy link
Member Author

estrattonbailey commented Jul 23, 2024

Not sure how ya saw those borked views, might be without proper types/validation if you didn't have the linked API SDK built and installed, was not able to repro. Included the label alignment fix in #4814

@estrattonbailey estrattonbailey marked this pull request as ready for review July 23, 2024 23:18
@surfdude29
Copy link
Contributor

Contrived example, but text can now handle wrapping for languages with longer transations.

Excellent, thanks! :)

estrattonbailey and others added 4 commits July 31, 2024 16:18
Co-authored-by: surfdude29 <[email protected]>
* origin/main: (37 commits)
  Only show "followed you back" when appropriate (#4849)
  [Web] Retrigger onEndReached if needed when content height changes (#4859)
  Remove unused NoopFeedTuner (#4856)
  useDedupe callback (#4855)
  [Video] Uploads (#4754)
  Make label required in link components (#4844)
  Boolean filter improvement alternative: TS upgrade (#4840)
  Add label to profile card (#4843)
  Improve a11y on noty feed (#4842)
  Add labels in feed card (#4836)
  Add labels to mod details dialog (#4839)
  Add labels to a few missing places (#4838)
  Add labels in list card (#4837)
  Refactor feed slices (#4834)
  `true` (#4833)
  Replace `import hairlineWidth =` with const (#4831)
  [Videos] Video player - PR #1 - basic player (#4731)
  Bump 1.90 (#4832)
  Fix sloppy filter(Boolean) types (#4830)
  Fuggedaboudit (#4829)
  ...
Copy link
Collaborator

@pfrazee pfrazee left a comment

Choose a reason for hiding this comment

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

Tested on all platforms, didn't test new logic correctness but the tests in the api seemed solid

LGTM!

@estrattonbailey estrattonbailey merged commit b0e130a into main Aug 1, 2024
6 checks passed
quiple added a commit to quiple/social-app that referenced this pull request Aug 8, 2024
commit af52626
Author: Minseo Lee <[email protected]>
Date:   Thu Aug 8 21:12:23 2024 +0900

    Added trans (bluesky-social#4890)

commit a864f69
Author: dan <[email protected]>
Date:   Thu Aug 8 06:20:24 2024 +0100

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

commit 00fea10
Author: dan <[email protected]>
Date:   Thu Aug 8 05:56:22 2024 +0100

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

commit b309241
Author: Hailey <[email protected]>
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 <[email protected]>
Date:   Wed Aug 7 14:45:06 2024 -0700

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

    Co-authored-by: Samuel Newman <[email protected]>

commit fff2c07
Author: Samuel Newman <[email protected]>
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 <[email protected]>
    Co-authored-by: Hailey <[email protected]>

commit b701e8c
Author: Samuel Newman <[email protected]>
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 <[email protected]>

commit 753a233
Author: Hailey <[email protected]>
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 <[email protected]>
Date:   Tue Aug 6 17:12:27 2024 +0100

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

commit b291a1e
Author: dan <[email protected]>
Date:   Tue Aug 6 16:42:42 2024 +0100

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

commit 686d5eb
Author: dan <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 aff86be6d37b60cc5d0ac38f22c31a4808342cf4.

    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 <[email protected]>
Date:   Mon Aug 5 12:21:34 2024 -0700

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

commit fb27838
Author: bnewbold <[email protected]>
Date:   Fri Aug 2 15:57:50 2024 -0700

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

commit 6298e68
Author: Samuel Newman <[email protected]>
Date:   Sat Aug 3 00:33:45 2024 +0200

    tweak list header (bluesky-social#4870)

    Co-authored-by: Samuel Newman <[email protected]>

commit c3d8bee
Author: Eric Bailey <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Thu Aug 1 19:14:32 2024 +0200

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

commit 388c157
Author: dan <[email protected]>
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 <[email protected]>
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 <[email protected]>

    * 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 <[email protected]>

    * Bump SDK

    ---------

    Co-authored-by: Hailey <[email protected]>
    Co-authored-by: surfdude29 <[email protected]>

commit d2e88cc
Author: dan <[email protected]>
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 <[email protected]>
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 <[email protected]>
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 <[email protected]>
Date:   Wed Jul 31 13:00:22 2024 +0100

    Remove unused NoopFeedTuner (bluesky-social#4856)

commit c3e77b5
Author: GSMT <[email protected]>
Date:   Wed Jul 31 00:19:23 2024 +0200

    useDedupe callback (bluesky-social#4855)

commit 8ddb28d
Author: Hailey <[email protected]>
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 <[email protected]>
Merge remote-tracking branch 'upstream/main' into Improve-notification-localization
haileyok pushed a commit that referenced this pull request Aug 14, 2024
* WIP not working dropdown

* Update MutedWords dialog

* Add i18n formatDistance

* Comments

* Handle text wrapping

* Update label copy

Co-authored-by: Hailey <[email protected]>

* 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 <[email protected]>

* Bump SDK

---------

Co-authored-by: Hailey <[email protected]>
Co-authored-by: surfdude29 <[email protected]>

(cherry picked from commit b0e130a)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants