Move featured assistant check behind `REQUIRE_FEATURED_ASSISTANTS` (#1043)

Move featured assistant check behind `REQUIRE_FEATURED_ASSISTANTS` env var (#997)

.env

@@ -145,6 +145,7 @@ EXPOSE_API=true
 
 ENABLE_ASSISTANTS=false #set to true to enable assistants feature
 ENABLE_ASSISTANTS_RAG=false # /!\ This will let users specify arbitrary URLs that the server will then request. Make sure you have the proper firewall rules in place. 
+REQUIRE_FEATURED_ASSISTANTS=false
 ENABLE_LOCAL_FETCH=false #set to true to disable the blocklist for local fetches. Only enable this if you have the proper firewall rules to prevent SSRF attacks and understand the implications.
 ALTERNATIVE_REDIRECT_URLS=`[]` #valide alternative redirect URL for OAuth
 WEBHOOK_URL_REPORT_ASSISTANT=#provide webhook url to get notified when an assistant gets reported

.env.template

@@ -283,6 +283,7 @@ PUBLIC_APPLE_APP_ID=6476778843
 
 ENABLE_ASSISTANTS=true
 ENABLE_ASSISTANTS_RAG=true
+REQUIRE_FEATURED_ASSISTANTS=true
 EXPOSE_API=true
 
 ALTERNATIVE_REDIRECT_URLS=`[

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

@@ -3,6 +3,7 @@ import type { Assistant } from "$lib/types/Assistant";
 import type { User } from "$lib/types/User";
 import { generateQueryTokens } from "$lib/utils/searchTokens.js";
 import type { Filter } from "mongodb";
+import { REQUIRE_FEATURED_ASSISTANTS } from "$env/static/private";
 
 const NUM_PER_PAGE = 24;
 
@@ -24,12 +25,16 @@ 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 && { userCount: { $gt: 1 } }),
-		...(user ? { createdById: user._id } : { featured: true }),
+		...(!createdByCurrentUser &&
+			REQUIRE_FEATURED_ASSISTANTS === "true" && { userCount: { $gt: 1 } }),
+		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
+		...shouldBeFeatured,
 	};
 	const assistants = await collections.assistants
 		.find(filter)

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

@@ -1,5 +1,5 @@
 import { base } from "$app/paths";
-import { ENABLE_ASSISTANTS } from "$env/static/private";
+import { ENABLE_ASSISTANTS, REQUIRE_FEATURED_ASSISTANTS } from "$env/static/private";
 import { collections } from "$lib/server/database.js";
 import { SortKey, type Assistant } from "$lib/types/Assistant";
 import type { User } from "$lib/types/User";
@@ -21,6 +21,8 @@ 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 } : {};
+
 	let user: Pick<User, "_id"> | null = null;
 	if (username) {
 		user = await collections.users.findOne<Pick<User, "_id">>(
@@ -32,12 +34,14 @@ export const load = async ({ url, locals }) => {
 		}
 	}
 
-	// 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
+	// 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 && { userCount: { $gt: 1 } }),
-		...(user ? { createdById: user._id } : { featured: true }),
+		...(!createdByCurrentUser &&
+			REQUIRE_FEATURED_ASSISTANTS === "true" && { userCount: { $gt: 1 } }),
+		...(user && { createdById: user._id }),
 		...(query && { searchTokens: { $all: generateQueryTokens(query) } }),
+		...shouldBeFeatured,
 	};
 	const assistants = await collections.assistants
 		.find(filter)