fix: assistants feature flow

- show only approved assistants on community page
- show pending & approved on user specific page
- remove gt>1 user count filter
- remove red outline around unfeatured assistants for non-admins

src/routes/api/assistants/+server.ts

@@ -13,8 +13,7 @@ export async function GET({ url, locals }) {
 	const pageIndex = parseInt(url.searchParams.get("p") ?? "0");
 	const username = url.searchParams.get("user");
 	const query = url.searchParams.get("q")?.trim() ?? null;
-	const createdByCurrentUser = locals.user?.username && locals.user.username === username;
-
+	const showUnfeatured = url.searchParams.get("showUnfeatured") === "true";
 	let user: Pick<User, "_id"> | null = null;
 	if (username) {
 		user = await collections.users.findOne<Pick<User, "_id">>(
@@ -26,23 +25,24 @@ export async function GET({ url, locals }) {
 		}
 	}
 
-	// if there is no user, we show community assistants, so only show featured assistants
-	const shouldBeFeatured =
-		env.REQUIRE_FEATURED_ASSISTANTS === "true" && !user ? { review: ReviewStatus.APPROVED } : {};
-
-	// if the user queried is not the current user, only show "public" assistants that have been shared before
-	const shouldHaveBeenShared =
-		env.REQUIRE_FEATURED_ASSISTANTS === "true" && !createdByCurrentUser
-			? { userCount: { $gt: 1 } }
-			: {};
+	// if we require featured assistants, that we are not on a user page and we are not an admin who wants to see unfeatured assistants, we show featured assistants
+	let shouldBeFeatured = {};
 
+	if (env.REQUIRE_FEATURED_ASSISTANTS === "true" && !(locals.user?.isAdmin && showUnfeatured)) {
+		if (!user) {
+			// only show featured assistants on the community page
+			shouldBeFeatured = { review: ReviewStatus.APPROVED };
+		} else {
+			// on a user page show assistants that have been approved or are pending
+			shouldBeFeatured = { review: { $in: [ReviewStatus.APPROVED, ReviewStatus.PENDING] } };
+		}
+	}
 	// fetch the top assistants sorted by user count from biggest to smallest, filter out all assistants with only 1 users. filter by model too if modelId is provided
 	const filter: Filter<Assistant> = {
 		...(modelId && { modelId }),
 		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
 		...shouldBeFeatured,
-		...shouldHaveBeenShared,
 	};
 	const assistants = await collections.assistants
 		.find(filter)

src/routes/assistants/+page.server.ts

@@ -19,7 +19,6 @@ export const load = async ({ url, locals }) => {
 	const username = url.searchParams.get("user");
 	const query = url.searchParams.get("q")?.trim() ?? null;
 	const sort = url.searchParams.get("sort")?.trim() ?? SortKey.TRENDING;
-	const createdByCurrentUser = locals.user?.username && locals.user.username === username;
 	const showUnfeatured = url.searchParams.get("showUnfeatured") === "true";
 
 	let user: Pick<User, "_id"> | null = null;
@@ -33,17 +32,18 @@ export const load = async ({ url, locals }) => {
 		}
 	}
 
-	// if there is no user, we show community assistants, so only show featured assistants
-	const shouldBeFeatured =
-		env.REQUIRE_FEATURED_ASSISTANTS === "true" && !user && !(locals.user?.isAdmin && showUnfeatured)
-			? { review: ReviewStatus.APPROVED }
-			: {};
+	// if we require featured assistants, that we are not on a user page and we are not an admin who wants to see unfeatured assistants, we show featured assistants
+	let shouldBeFeatured = {};
 
-	// if the user queried is not the current user, only show "public" assistants that have been shared before
-	const shouldHaveBeenShared =
-		env.REQUIRE_FEATURED_ASSISTANTS === "true" && !createdByCurrentUser && !locals.user?.isAdmin
-			? { userCount: { $gt: 1 } }
-			: {};
+	if (env.REQUIRE_FEATURED_ASSISTANTS === "true" && !(locals.user?.isAdmin && showUnfeatured)) {
+		if (!user) {
+			// only show featured assistants on the community page
+			shouldBeFeatured = { review: ReviewStatus.APPROVED };
+		} else {
+			// on a user page show assistants that have been approved or are pending
+			shouldBeFeatured = { review: { $in: [ReviewStatus.APPROVED, ReviewStatus.PENDING] } };
+		}
+	}
 
 	// fetch the top assistants sorted by user count from biggest to smallest. filter by model too if modelId is provided or query if query is provided
 	const filter: Filter<Assistant> = {
@@ -51,7 +51,6 @@ export const load = async ({ url, locals }) => {
 		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
 		...shouldBeFeatured,
-		...shouldHaveBeenShared,
 	};
 	const assistants = await Database.getInstance()
 		.getCollections()

src/routes/assistants/+page.svelte

@@ -250,7 +250,9 @@
 
 				<button
 					class="relative flex flex-col items-center justify-center overflow-hidden text-balance rounded-xl border bg-gray-50/50 px-4 py-6 text-center shadow hover:bg-gray-50 hover:shadow-inner dark:border-gray-800/70 dark:bg-gray-950/20 dark:hover:bg-gray-950/40 max-sm:px-4 sm:h-64 sm:pb-4 xl:pt-8
-					{!(assistant.review === ReviewStatus.APPROVED) && !createdByMe ? 'border !border-red-500/30' : ''}"
+					{!(assistant.review === ReviewStatus.APPROVED) && !createdByMe && data.user?.isAdmin
+						? 'border !border-red-500/30'
+						: ''}"
 					on:click={() => {
 						if (data.settings.assistants.includes(assistant._id.toString())) {
 							settings.instantSet({ activeModel: assistant._id.toString() });