Only require featured assistants for other users' assistants (#1054)

huggingface · Apr 23, 2024 · 7ede405 · 7ede405
1 parent 95b3715
commit 7ede405
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 8 deletions.
diff --git a/src/routes/api/assistants/+server.ts b/src/routes/api/assistants/+server.ts
@@ -14,10 +14,9 @@ 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 =
+	const shouldBeFeatured =
 		REQUIRE_FEATURED_ASSISTANTS === "true" && !createdByCurrentUser
-			? { userCount: { $gt: 1 } }
+			? { featured: true, userCount: { $gt: 1 } }
 			: {};
 
 	let user: Pick<User, "_id"> | null = null;
@@ -37,7 +36,6 @@ export async function GET({ url, locals }) {
 		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
 		...shouldBeFeatured,
-		...shouldHaveBeenShared,
 	};
 	const assistants = await collections.assistants
 		.find(filter)

diff --git a/src/routes/assistants/+page.server.ts b/src/routes/assistants/+page.server.ts
@@ -21,10 +21,9 @@ export const load = async ({ url, locals }) => {
 	const sort = url.searchParams.get("sort")?.trim() ?? SortKey.POPULAR;
 	const createdByCurrentUser = locals.user?.username && locals.user.username === username;
 
-	const shouldBeFeatured = REQUIRE_FEATURED_ASSISTANTS === "true" ? { featured: true } : {};
-	const shouldHaveBeenShared =
+	const shouldBeFeatured =
 		REQUIRE_FEATURED_ASSISTANTS === "true" && !createdByCurrentUser
-			? { userCount: { $gt: 1 } }
+			? { featured: true, userCount: { $gt: 1 } }
 			: {};
 
 	let user: Pick<User, "_id"> | null = null;
@@ -43,7 +42,6 @@ export const load = async ({ url, locals }) => {
 		...(modelId && { modelId }),
 		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
-		...shouldHaveBeenShared,
 		...shouldBeFeatured,
 	};
 	const assistants = await collections.assistants