refactor: move filter to query-side

app/api/moderation/utils.ts

@@ -1,18 +1,20 @@
 import type { SignalizedProfile } from '../stores/profiles';
 
-import { ContextProfileList, getModerationUI, type ModerationOptions } from '.';
+import { type ModerationOptions, ContextProfileList, getModerationUI } from '.';
 import { moderateProfile } from './entities/profile';
 
 export const moderateProfileList = (
 	profiles: SignalizedProfile[] | undefined,
-	opts: ModerationOptions,
+	opts: ModerationOptions | undefined,
 ): SignalizedProfile[] | undefined => {
-	if (profiles) {
+	if (opts && profiles) {
 		return profiles.filter((profile) => {
 			const causes = moderateProfile(profile, opts);
 			const ui = getModerationUI(causes, ContextProfileList);
 
 			return ui.f.length === 0;
 		});
 	}
+
+	return profiles;
 };

app/api/queries/get-likes.ts

@@ -5,6 +5,8 @@ import { multiagent } from '../globals/agent';
 
 import { mergeProfile } from '../stores/profiles';
 
+import { moderateProfileList } from '../moderation/utils';
+
 export const getLikesKey = (uid: At.DID, uri: string, limit = 25) => {
 	return ['getLikes', uid, uri, limit] as const;
 };
@@ -26,6 +28,9 @@ export const getLikes = async (ctx: QC<ReturnType<typeof getLikesKey>, string |
 
 	return {
 		cursor: data.cursor,
-		profiles: data.likes.map((like) => mergeProfile(uid, like.actor)),
+		profiles: moderateProfileList(
+			data.likes.map((like) => mergeProfile(uid, like.actor)),
+			ctx.meta?.moderation,
+		),
 	};
 };

app/api/queries/get-post-reposts.ts

@@ -5,6 +5,8 @@ import { multiagent } from '../globals/agent';
 
 import { mergeProfile } from '../stores/profiles';
 
+import { moderateProfileList } from '../moderation/utils';
+
 export const getPostRepostsKey = (uid: At.DID, uri: string, limit = 25) => {
 	return ['getPostReposts', uid, uri, limit] as const;
 };
@@ -26,6 +28,9 @@ export const getPostReposts = async (ctx: QC<ReturnType<typeof getPostRepostsKey
 
 	return {
 		cursor: data.cursor,
-		profiles: data.repostedBy.map((actor) => mergeProfile(uid, actor)),
+		profiles: moderateProfileList(
+			data.repostedBy.map((actor) => mergeProfile(uid, actor)),
+			ctx.meta?.moderation,
+		),
 	};
 };

app/api/queries/get-profile-followers.ts

@@ -5,6 +5,8 @@ import { multiagent } from '../globals/agent';
 
 import { getCachedProfile, mergeProfile } from '../stores/profiles';
 
+import { moderateProfileList } from '../moderation/utils';
+
 export const getProfileFollowersKey = (uid: At.DID, actor: string, limit = 25) => {
 	return ['getProfileFollowers', uid, actor, limit] as const;
 };
@@ -29,7 +31,10 @@ export const getProfileFollowers = async (
 	return {
 		cursor: data.cursor,
 		subject: mergeProfile(uid, data.subject),
-		profiles: data.followers.map((actor) => mergeProfile(uid, actor)),
+		profiles: moderateProfileList(
+			data.followers.map((actor) => mergeProfile(uid, actor)),
+			ctx.meta?.moderation,
+		),
 	};
 };
 

app/api/queries/get-profile-follows.ts

@@ -5,6 +5,8 @@ import { multiagent } from '../globals/agent';
 
 import { getCachedProfile, mergeProfile } from '../stores/profiles';
 
+import { moderateProfileList } from '../moderation/utils';
+
 export const getProfileFollowsKey = (uid: At.DID, actor: string, limit = 25) => {
 	return ['getProfileFollows', uid, actor, limit] as const;
 };
@@ -29,7 +31,10 @@ export const getProfileFollows = async (
 	return {
 		cursor: data.cursor,
 		subject: mergeProfile(uid, data.subject),
-		profiles: data.follows.map((actor) => mergeProfile(uid, actor)),
+		profiles: moderateProfileList(
+			data.follows.map((actor) => mergeProfile(uid, actor)),
+			ctx.meta?.moderation,
+		),
 	};
 };
 

app/desktop/components/panes/dialogs/FeedLikedByPaneDialog.tsx

@@ -5,8 +5,6 @@ import type { At } from '~/api/atp-schema';
 import { getFeedInfo, getFeedInfoKey, getInitialFeedInfo } from '~/api/queries/get-feed-info';
 import { getLikes, getLikesKey } from '~/api/queries/get-likes';
 
-import { moderateProfileList } from '~/api/moderation/utils';
-
 import { getModerationOptions } from '~/com/globals/shared';
 
 import ProfileList from '~/com/components/lists/ProfileList';
@@ -48,6 +46,9 @@ const FeedLikedByPaneDialog = (props: FeedLikedByPaneDialogProps) => {
 			queryFn: getLikes,
 			initialPageParam: undefined,
 			getNextPageParam: (last) => last.cursor,
+			meta: {
+				moderation: getModerationOptions(),
+			},
 		};
 	});
 
@@ -66,10 +67,7 @@ const FeedLikedByPaneDialog = (props: FeedLikedByPaneDialogProps) => {
 
 			<div class="flex min-h-0 grow flex-col overflow-y-auto">
 				<ProfileList
-					profiles={moderateProfileList(
-						likes.data?.pages.flatMap((page) => page.profiles),
-						getModerationOptions(),
-					)}
+					profiles={likes.data?.pages.flatMap((page) => page.profiles)}
 					fetching={likes.isFetching}
 					error={likes.error}
 					hasMore={likes.hasNextPage}

app/desktop/components/panes/dialogs/PostLikedByPaneDialog.tsx

@@ -4,8 +4,6 @@ import type { At } from '~/api/atp-schema';
 
 import { getLikes, getLikesKey } from '~/api/queries/get-likes';
 
-import { moderateProfileList } from '~/api/moderation/utils';
-
 import { getModerationOptions } from '~/com/globals/shared';
 
 import ProfileList from '~/com/components/lists/ProfileList';
@@ -36,6 +34,9 @@ const PostLikedByPaneDialog = (props: PostLikedByDialogProps) => {
 			queryFn: getLikes,
 			initialPageParam: undefined,
 			getNextPageParam: (last) => last.cursor,
+			meta: {
+				moderation: getModerationOptions(),
+			},
 		};
 	});
 
@@ -45,10 +46,7 @@ const PostLikedByPaneDialog = (props: PostLikedByDialogProps) => {
 
 			<div class="flex min-h-0 grow flex-col overflow-y-auto">
 				<ProfileList
-					profiles={moderateProfileList(
-						likes.data?.pages.flatMap((page) => page.profiles),
-						getModerationOptions(),
-					)}
+					profiles={likes.data?.pages.flatMap((page) => page.profiles)}
 					fetching={likes.isFetching}
 					error={likes.error}
 					hasMore={likes.hasNextPage}

app/desktop/components/panes/dialogs/PostRepostedByPaneDialog.tsx

@@ -4,8 +4,6 @@ import type { At } from '~/api/atp-schema';
 
 import { getPostReposts, getPostRepostsKey } from '~/api/queries/get-post-reposts';
 
-import { moderateProfileList } from '~/api/moderation/utils';
-
 import { getModerationOptions } from '~/com/globals/shared';
 
 import ProfileList from '~/com/components/lists/ProfileList';
@@ -36,6 +34,9 @@ const PostRepostedByPaneDialog = (props: PostRepostedByDialogProps) => {
 			queryFn: getPostReposts,
 			initialPageParam: undefined,
 			getNextPageParam: (last) => last.cursor,
+			meta: {
+				moderation: getModerationOptions(),
+			},
 		};
 	});
 
@@ -45,10 +46,7 @@ const PostRepostedByPaneDialog = (props: PostRepostedByDialogProps) => {
 
 			<div class="flex min-h-0 grow flex-col overflow-y-auto">
 				<ProfileList
-					profiles={moderateProfileList(
-						reposts.data?.pages.flatMap((page) => page.profiles),
-						getModerationOptions(),
-					)}
+					profiles={reposts.data?.pages.flatMap((page) => page.profiles)}
 					fetching={reposts.isFetching}
 					error={reposts.error}
 					hasMore={reposts.hasNextPage}

app/desktop/components/panes/dialogs/ProfileFollowersPaneDialog.tsx

@@ -10,8 +10,6 @@ import {
 	getProfileFollowersKey,
 } from '~/api/queries/get-profile-followers';
 
-import { moderateProfileList } from '~/api/moderation/utils';
-
 import { getModerationOptions } from '~/com/globals/shared';
 
 import { ProfileFollowAccessory } from '~/com/components/items/ProfileItem';
@@ -42,6 +40,9 @@ const ProfileFollowersPaneDialog = (props: ProfileFollowersPaneDialogProps) => {
 			initialPageParam: undefined,
 			getNextPageParam: (last) => last.cursor,
 			placeholderData: () => getInitialProfileFollowers(key),
+			meta: {
+				moderation: getModerationOptions(),
+			},
 		};
 	});
 
@@ -65,10 +66,7 @@ const ProfileFollowersPaneDialog = (props: ProfileFollowersPaneDialogProps) => {
 			<div class="flex min-h-0 grow flex-col overflow-y-auto">
 				<ProfileList
 					asideAccessory={ProfileFollowAccessory}
-					profiles={moderateProfileList(
-						followers.data?.pages.flatMap((page) => page.profiles),
-						getModerationOptions(),
-					)}
+					profiles={followers.data?.pages.flatMap((page) => page.profiles)}
 					fetching={followers.isFetching}
 					error={followers.error}
 					hasMore={followers.hasNextPage}

app/desktop/components/panes/dialogs/ProfileFollowsPaneDialog.tsx

@@ -10,8 +10,6 @@ import {
 	getProfileFollowsKey,
 } from '~/api/queries/get-profile-follows';
 
-import { moderateProfileList } from '~/api/moderation/utils';
-
 import { getModerationOptions } from '~/com/globals/shared';
 
 import { ProfileFollowAccessory } from '~/com/components/items/ProfileItem';
@@ -42,6 +40,9 @@ const ProfileFollowsPaneDialog = (props: ProfileFollowsPaneDialogProps) => {
 			initialPageParam: undefined,
 			getNextPageParam: (last) => last.cursor,
 			placeholderData: () => getInitialProfileFollows(key),
+			meta: {
+				moderation: getModerationOptions(),
+			},
 		};
 	});
 
@@ -65,10 +66,7 @@ const ProfileFollowsPaneDialog = (props: ProfileFollowsPaneDialogProps) => {
 			<div class="flex min-h-0 grow flex-col overflow-y-auto">
 				<ProfileList
 					asideAccessory={ProfileFollowAccessory}
-					profiles={moderateProfileList(
-						follows.data?.pages.flatMap((page) => page.profiles),
-						getModerationOptions(),
-					)}
+					profiles={follows.data?.pages.flatMap((page) => page.profiles)}
 					fetching={follows.isFetching}
 					error={follows.error}
 					hasMore={follows.hasNextPage}