Respect labels on feeds and lists #4818

estrattonbailey · 2024-07-24T16:48:36Z

Feeds and lists can now be labeled. This PR integrates the pre-existing moderateFeedGenerator and moderateUserList helpers.

If you have NSFW disabled, feeds with NSFW labels are filtered from:

Feeds screen
Explore page
Search page
Starter packs
Feeds tab on profiles

If a list has a non-overrideable label on it such as !hide, they are:

filtered from the Lists tab on profiles
hidden in posts using ContentHider
hidden from direct view using ScreenHider

This PR opts to do the filtering within the queries themselves — so right at the source — as opposed to where the data is used. This is good for DRYness, and also atm we don't support other moderation on feeds or lists, such as avatar blurring, so there's no need to drill it down.

Also, this PR merges two popular feeds search queries used on the Search screen, and in the StepFeeds screen of starter packs. That way they can use the same filter logic. No functional changes, just chose the one that required the least amount of work to swap.

Testing

For feeds, just toggle your mod settings and hit all the surfaces listed above.
For lists, use this post, click into the list, check out profile of owner: http://localhost:19006/profile/test.esb.lol/post/3ky26ll43us27

render · 2024-07-24T16:48:40Z

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

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

estrattonbailey · 2024-07-24T16:49:14Z

src/screens/StarterPack/Wizard/StepFeeds.tsx

@@ -59,7 +59,7 @@ export function StepFeeds({moderationOpts}: {moderationOpts: ModerationOpts}) {
      : undefined

  const {data: searchedFeeds, isFetching: isFetchingSearchedFeeds} =
-    useSearchPopularFeedsQuery({q: throttledQuery})
+    usePopularFeedsSearch({query: throttledQuery})


With the addition of placeholderData: keepPreviousData, there was no difference here, so should be a clean swap.

estrattonbailey · 2024-07-24T16:49:46Z

src/state/queries/feed.ts

@@ -225,6 +229,7 @@ export function useGetPopularFeedsQuery(options?: GetPopularFeedsOptions) {
    QueryKey,
    string | undefined
  >({
+    enabled: Boolean(moderationOpts),


This is copied from how we do it for post feeds.

estrattonbailey · 2024-07-24T16:51:15Z

src/state/queries/feed.ts

+      if (moderationOpts) {
+        return res.data.feeds.filter(feed => {
+          const decision = moderateFeedGenerator(feed, moderationOpts)
+          return !decision.ui('contentList').filter
+        })
+      }


Mutations don't support enabled, but this method is called after load when the user types in the search input on Feeds screen. So even though we have a check, it should be present.

I spent a little time trying to swap for the other search query in here (not a mutation) but decided it wasn't worth the effort right now to refactor the Feeds screen to use it. This was a quick simple approach that works.

estrattonbailey · 2024-07-24T16:52:08Z

src/state/queries/feed.ts

+        limit: 15,
        query: query,
      })

      return res.data.feeds
    },
+    placeholderData: keepPreviousData,
+    select(data) {
+      return data.filter(feed => {
+        const decision = moderateFeedGenerator(feed, moderationOpts!)
+        return !decision.ui('contentList').filter
+      })
+    },


So this is now used on Starter Packs as well. No functional changes. Upped limit to match SPs, Search screen is happy to show 15 instead of 10.

github-actions · 2024-07-24T16:54:58Z

Old size	New size	Diff
7.15 MB	7.15 MB	-769 B (-0.01%)

* origin/main: (30 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) ...

pfrazee

LGTM

gaearon

not critical cause it's unlikely to paginate these

gaearon · 2024-08-01T02:09:41Z

src/state/queries/profile-feedgens.ts

+    select(data) {
+      return {
+        ...data,
+        pages: data.pages.map(page => {


Can you check if this is going to lead to re-renders of all previous pages' items for every further pagination? See the hack we added to select in post-feed to avoid that there. I guess it's not super important here per se but would be good to verify.

Did some digging on this and even did the approach from post-feed, but then realized it was really just renderItem on the List not being memoized 🙃

But yeah you were right, there were re-renders happening here, though not bc of the query 😆

gaearon · 2024-08-01T02:10:10Z

src/state/queries/profile-lists.ts

+    select(data) {
+      return {
+        ...data,
+        pages: data.pages.map(page => {


Same question about re-renders.

Similar solve to feedgens, the item objects passed to renderItem were being spread anew every time. I changed it to use the (slightly icky) approach we use for ProfileFeedgens and that seems to fix it up.

* 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

This reverts commit 9ec6fde.

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

* 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) ...

* Updated translation * Update translation * Update translation * Update translation * Only show replies in Following if following all involved actors (#4869) * Only show replies in Following for followed root and grandparent * Remove now-unnecessary check * Simplify condition * Respect labels on feeds and lists (#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 * tweak list header (#4870) Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com> * bskyweb: optional basic auth password middleware (#4759) * Update translation * Revert "Update translation" This reverts commit 3a7b74f. * Revert "bskyweb: optional basic auth password middleware (#4759)" This reverts commit bc3a27d. * Revert "tweak list header (#4870)" This reverts commit 34e7e5c. * Revert "Respect labels on feeds and lists (#4818)" This reverts commit 9ec6fde. * Revert "Only show replies in Following if following all involved actors (#4869)" This reverts commit e2cc4bb. * Update translation * Update translation * Update translation * Updated translation * Update translation * Update translation * Unified existing translations of "hidden" and "community". * Update translation * Update translation * Update translation --------- Co-authored-by: dan <dan.abramov@gmail.com> Co-authored-by: Eric Bailey <git@esb.lol> Co-authored-by: Samuel Newman <mozzius@protonmail.com> Co-authored-by: Samuel Newman <10959775+mozzius@users.noreply.github.com> Co-authored-by: bnewbold <bnewbold@robocracy.org>

estrattonbailey added 9 commits July 24, 2024 10:06

Prep

3cad950

Pass in optional moderation to FeedCard

0f337c8

Compute moderation decision, filter contentList contexts, pass into card

3ad3fe5

Let's go a different route

8412e2a

Filter from within search queries

d3179db

Use same search query for starter packs

76113be

Filter lists from profile tabs

a9c6150

Cleanup

1ff4886

Filter from profile feeds

c6ecc4a

estrattonbailey commented Jul 24, 2024

View reviewed changes

estrattonbailey marked this pull request as draft July 24, 2024 16:56

estrattonbailey added 5 commits July 24, 2024 16:09

Moderate post embeds

1895183

Memoize

9c54cad

Use ScreenHider on lists

e84b19d

Hide both list types

52f2599

Fix crash on iOS in screen hider, fix lineheight

7db97fc

estrattonbailey marked this pull request as ready for review July 24, 2024 22:55

pfrazee approved these changes Jul 31, 2024

View reviewed changes

gaearon reviewed Aug 1, 2024

View reviewed changes

estrattonbailey added 2 commits August 2, 2024 12:36

Memoize renderItem

7d01503

Reuse objects to prevent re-renders

69fac75

estrattonbailey force-pushed the moar-labels branch from cfc2d26 to 69fac75 Compare August 2, 2024 17:50

estrattonbailey merged commit c3d8bee into main Aug 2, 2024
6 checks passed

tkusano added a commit to tkusano/social-app that referenced this pull request Aug 5, 2024

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

370f680

This reverts commit 9ec6fde.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Respect labels on feeds and lists #4818

Respect labels on feeds and lists #4818

estrattonbailey commented Jul 24, 2024 •

edited

Loading

render bot commented Jul 24, 2024

estrattonbailey Jul 24, 2024

estrattonbailey Jul 24, 2024

estrattonbailey Jul 24, 2024

estrattonbailey Jul 24, 2024

github-actions bot commented Jul 24, 2024 •

edited

Loading

pfrazee left a comment

gaearon left a comment

gaearon Aug 1, 2024 •

edited

Loading

estrattonbailey Aug 2, 2024

estrattonbailey Aug 2, 2024

gaearon Aug 1, 2024

estrattonbailey Aug 2, 2024

Respect labels on feeds and lists #4818

Respect labels on feeds and lists #4818

Conversation

estrattonbailey commented Jul 24, 2024 • edited Loading

Testing

render bot commented Jul 24, 2024

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

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

pfrazee left a comment

Choose a reason for hiding this comment

gaearon left a comment

Choose a reason for hiding this comment

gaearon Aug 1, 2024 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

estrattonbailey commented Jul 24, 2024 •

edited

Loading

github-actions bot commented Jul 24, 2024 •

edited

Loading

gaearon Aug 1, 2024 •

edited

Loading