fix: See all your assistants regardless of usercount (#1053)

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

@@ -14,6 +14,12 @@ export async function GET({ url, locals }) {
 	const query = url.searchParams.get("q")?.trim() ?? null;
 	const createdByCurrentUser = locals.user?.username && locals.user.username === username;
 
+	const shouldBeFeatured = REQUIRE_FEATURED_ASSISTANTS === "true" ? { featured: true } : {};
+	const shouldHaveBeenShared =
+		REQUIRE_FEATURED_ASSISTANTS === "true" && !createdByCurrentUser
+			? { userCount: { $gt: 1 } }
+			: {};
+
 	let user: Pick<User, "_id"> | null = null;
 	if (username) {
 		user = await collections.users.findOne<Pick<User, "_id">>(
@@ -25,16 +31,13 @@ export async function GET({ url, locals }) {
 		}
 	}
 
-	const shouldBeFeatured = REQUIRE_FEATURED_ASSISTANTS === "true" ? { featured: true } : {};
-
 	// 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 }),
-		...(!createdByCurrentUser &&
-			REQUIRE_FEATURED_ASSISTANTS === "true" && { userCount: { $gt: 1 } }),
 		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
 		...shouldBeFeatured,
+		...shouldHaveBeenShared,
 	};
 	const assistants = await collections.assistants
 		.find(filter)

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

@@ -22,6 +22,10 @@ export const load = async ({ url, locals }) => {
 	const createdByCurrentUser = locals.user?.username && locals.user.username === username;
 
 	const shouldBeFeatured = REQUIRE_FEATURED_ASSISTANTS === "true" ? { featured: true } : {};
+	const shouldHaveBeenShared =
+		REQUIRE_FEATURED_ASSISTANTS === "true" && !createdByCurrentUser
+			? { userCount: { $gt: 1 } }
+			: {};
 
 	let user: Pick<User, "_id"> | null = null;
 	if (username) {
@@ -37,10 +41,9 @@ export const load = async ({ url, locals }) => {
 	// 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> = {
 		...(modelId && { modelId }),
-		...(!createdByCurrentUser &&
-			REQUIRE_FEATURED_ASSISTANTS === "true" && { userCount: { $gt: 1 } }),
 		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
+		...shouldHaveBeenShared,
 		...shouldBeFeatured,
 	};
 	const assistants = await collections.assistants