feat: Update featured workflow to allow user to submit featured requests (#1510)

* feat: Update featured workflow to allow user to submit featured requests

* fix: merge conflict

* fix: styling of buttons

scripts/populate.ts

@@ -20,6 +20,7 @@ import { Message } from "../src/lib/types/Message.ts";
 
 import { addChildren } from "../src/lib/utils/tree/addChildren.ts";
 import { generateSearchTokens } from "../src/lib/utils/searchTokens.ts";
+import { ReviewStatus } from "../src/lib/types/Review.ts";
 
 const rl = readline.createInterface({
 	input: process.stdin,
@@ -151,6 +152,7 @@ async function seed() {
 				disableStream: faker.datatype.boolean(0.25),
 				customPrompts: {},
 				assistants: [],
+				disableStream: faker.datatype.boolean(0.25),
 			};
 			await collections.settings.updateOne(
 				{ userId: user._id },
@@ -175,7 +177,7 @@ async function seed() {
 						createdAt: faker.date.recent({ days: 30 }),
 						updatedAt: faker.date.recent({ days: 30 }),
 						userCount: faker.number.int({ min: 1, max: 100000 }),
-						featured: faker.datatype.boolean(0.25),
+						review: faker.helpers.enumValue(ReviewStatus),
 						modelId: faker.helpers.arrayElement(modelIds),
 						description: faker.lorem.sentence(),
 						preprompt: faker.hacker.phrase(),
@@ -307,7 +309,7 @@ async function seed() {
 						createdAt: faker.date.recent({ days: 30 }),
 						updatedAt: faker.date.recent({ days: 30 }),
 						searchTokens: generateSearchTokens(displayName),
-						featured: faker.datatype.boolean(),
+						review: faker.helpers.enumValue(ReviewStatus),
 						outputComponent: null,
 						outputComponentIdx: null,
 					};

src/lib/migrations/routines/06-trim-message-updates.ts

@@ -41,7 +41,7 @@ function convertMessageUpdate(message: Message, update: MessageUpdate): MessageU
 }
 
 const trimMessageUpdates: Migration = {
-	_id: new ObjectId("000000000006"),
+	_id: new ObjectId("000000000000000000000006"),
 	name: "Trim message updates to reduce stored size",
 	up: async () => {
 		const allConversations = collections.conversations.find({});

src/lib/migrations/routines/07-reset-tools-in-settings.ts

@@ -3,7 +3,7 @@ import { collections } from "$lib/server/database";
 import { ObjectId } from "mongodb";
 
 const resetTools: Migration = {
-	_id: new ObjectId("000000000007"),
+	_id: new ObjectId("000000000000000000000007"),
 	name: "Reset tools to empty",
 	up: async () => {
 		const { settings } = collections;

src/lib/migrations/routines/08-update-featured-to-review.ts

@@ -0,0 +1,32 @@
+import type { Migration } from ".";
+import { collections } from "$lib/server/database";
+import { ObjectId } from "mongodb";
+import { ReviewStatus } from "$lib/types/Review";
+
+const updateFeaturedToReview: Migration = {
+	_id: new ObjectId("000000000000000000000008"),
+	name: "Update featured to review",
+	up: async () => {
+		const { assistants, tools } = collections;
+
+		// Update assistants
+		await assistants.updateMany({ featured: true }, { $set: { review: ReviewStatus.APPROVED } });
+		await assistants.updateMany(
+			{ featured: { $ne: true } },
+			{ $set: { review: ReviewStatus.PRIVATE } }
+		);
+
+		await assistants.updateMany({}, { $unset: { featured: "" } });
+
+		// Update tools
+		await tools.updateMany({ featured: true }, { $set: { review: ReviewStatus.APPROVED } });
+		await tools.updateMany({ featured: { $ne: true } }, { $set: { review: ReviewStatus.PRIVATE } });
+
+		await tools.updateMany({}, { $unset: { featured: "" } });
+
+		return true;
+	},
+	runEveryTime: false,
+};
+
+export default updateFeaturedToReview;

src/lib/migrations/routines/index.ts

@@ -8,6 +8,7 @@ import updateMessageUpdates from "./04-update-message-updates";
 import updateMessageFiles from "./05-update-message-files";
 import trimMessageUpdates from "./06-trim-message-updates";
 import resetTools from "./07-reset-tools-in-settings";
+import updateFeaturedToReview from "./08-update-featured-to-review";
 
 export interface Migration {
 	_id: ObjectId;
@@ -27,4 +28,5 @@ export const migrations: Migration[] = [
 	updateMessageFiles,
 	trimMessageUpdates,
 	resetTools,
+	updateFeaturedToReview,
 ];

src/lib/server/database.ts

@@ -202,7 +202,7 @@ export class Database {
 		sessions.createIndex({ sessionId: 1 }, { unique: true }).catch((e) => logger.error(e));
 		assistants.createIndex({ createdById: 1, userCount: -1 }).catch((e) => logger.error(e));
 		assistants.createIndex({ userCount: 1 }).catch((e) => logger.error(e));
-		assistants.createIndex({ featured: 1, userCount: -1 }).catch((e) => logger.error(e));
+		assistants.createIndex({ review: 1, userCount: -1 }).catch((e) => logger.error(e));
 		assistants.createIndex({ modelId: 1, userCount: -1 }).catch((e) => logger.error(e));
 		assistants.createIndex({ searchTokens: 1 }).catch((e) => logger.error(e));
 		assistants.createIndex({ last24HoursCount: 1 }).catch((e) => logger.error(e));

src/lib/server/sendSlack.ts

@@ -0,0 +1,23 @@
+import { env } from "$env/dynamic/private";
+import { logger } from "$lib/server/logger";
+
+export async function sendSlack(text: string) {
+	if (!env.WEBHOOK_URL_REPORT_ASSISTANT) {
+		logger.warn("WEBHOOK_URL_REPORT_ASSISTANT is not set, tried to send a slack message.");
+		return;
+	}
+
+	const res = await fetch(env.WEBHOOK_URL_REPORT_ASSISTANT, {
+		method: "POST",
+		headers: {
+			"Content-type": "application/json",
+		},
+		body: JSON.stringify({
+			text,
+		}),
+	});
+
+	if (!res.ok) {
+		logger.error(`Webhook message failed. ${res.statusText} ${res.text}`);
+	}
+}

src/lib/types/Assistant.ts

@@ -1,6 +1,7 @@
 import type { ObjectId } from "mongodb";
 import type { User } from "./User";
 import type { Timestamps } from "./Timestamps";
+import type { ReviewStatus } from "./Review";
 
 export interface Assistant extends Timestamps {
 	_id: ObjectId;
@@ -13,7 +14,7 @@ export interface Assistant extends Timestamps {
 	exampleInputs: string[];
 	preprompt: string;
 	userCount?: number;
-	featured?: boolean;
+	review: ReviewStatus;
 	rag?: {
 		allowAllDomains: boolean;
 		allowedDomains: string[];

src/lib/types/Review.ts

@@ -0,0 +1,6 @@
+export enum ReviewStatus {
+	PRIVATE = "PRIVATE",
+	PENDING = "PENDING",
+	APPROVED = "APPROVED",
+	DENIED = "DENIED",
+}

src/lib/types/Tool.ts

@@ -4,6 +4,7 @@ import type { Timestamps } from "./Timestamps";
 import type { BackendToolContext } from "$lib/server/tools";
 import type { MessageUpdate } from "./MessageUpdate";
 import { z } from "zod";
+import type { ReviewStatus } from "./Review";
 
 export const ToolColor = z.union([
 	z.literal("purple"),
@@ -122,7 +123,7 @@ export interface CommunityTool extends BaseTool, Timestamps {
 	useCount: number;
 	last24HoursUseCount: number;
 
-	featured: boolean;
+	review: ReviewStatus;
 	searchTokens: string[];
 }
 
@@ -136,7 +137,7 @@ export type CommunityToolEditable = Omit<
 	| "last24HoursUseCount"
 	| "createdById"
 	| "createdByName"
-	| "featured"
+	| "review"
 	| "searchTokens"
 	| "type"
 	| "createdAt"

src/routes/+layout.server.ts

@@ -11,6 +11,7 @@ import type { ConvSidebar } from "$lib/types/ConvSidebar";
 import { toolFromConfigs } from "$lib/server/tools";
 import { MetricsServer } from "$lib/server/metrics";
 import type { ToolFront, ToolInputFile } from "$lib/types/Tool";
+import { ReviewStatus } from "$lib/types/Review";
 
 export const load: LayoutServerLoad = async ({ locals, depends, request }) => {
 	depends(UrlDependency.ConversationList);
@@ -221,7 +222,7 @@ export const load: LayoutServerLoad = async ({ locals, depends, request }) => {
 			),
 		communityToolCount: await collections.tools.countDocuments({
 			type: "community",
-			featured: true,
+			review: ReviewStatus.APPROVED,
 		}),
 		assistants: assistants
 			.filter((el) => userAssistantsSet.has(el._id.toString()))

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

@@ -4,6 +4,7 @@ import type { User } from "$lib/types/User";
 import { generateQueryTokens } from "$lib/utils/searchTokens.js";
 import type { Filter } from "mongodb";
 import { env } from "$env/dynamic/private";
+import { ReviewStatus } from "$lib/types/Review";
 
 const NUM_PER_PAGE = 24;
 
@@ -27,7 +28,7 @@ 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 ? { featured: true } : {};
+		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 =

src/routes/api/tools/[toolId]/+server.ts

@@ -1,6 +1,7 @@
 import { env } from "$env/dynamic/private";
 import { collections } from "$lib/server/database.js";
 import { toolFromConfigs } from "$lib/server/tools/index.js";
+import { ReviewStatus } from "$lib/types/Review";
 import type { CommunityToolDB } from "$lib/types/Tool.js";
 import { ObjectId } from "mongodb";
 
@@ -33,12 +34,12 @@ export async function GET({ params }) {
 								color: tool.color,
 								icon: tool.icon,
 								createdByName: tool.createdByName,
-								featured: tool.featured,
+								review: tool.review,
 						  }
 						: undefined
 				);
 
-			if (!tool || !tool.featured) {
+			if (!tool || tool.review !== ReviewStatus.APPROVED) {
 				return new Response(`Tool "${toolId}" not found`, { status: 404 });
 			}
 

src/routes/api/tools/search/+server.ts

@@ -4,7 +4,7 @@ import { toolFromConfigs } from "$lib/server/tools/index.js";
 import type { BaseTool, CommunityToolDB } from "$lib/types/Tool.js";
 import { generateQueryTokens, generateSearchTokens } from "$lib/utils/searchTokens.js";
 import type { Filter } from "mongodb";
-
+import { ReviewStatus } from "$lib/types/Review";
 export async function GET({ url }) {
 	if (env.COMMUNITY_TOOLS !== "true") {
 		return new Response("Community tools are not enabled", { status: 403 });
@@ -15,7 +15,7 @@ export async function GET({ url }) {
 
 	const filter: Filter<CommunityToolDB> = {
 		...(queryTokens && { searchTokens: { $all: queryTokens } }),
-		featured: true,
+		review: ReviewStatus.APPROVED,
 	};
 
 	const matchingCommunityTools = await collections.tools

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

@@ -6,7 +6,7 @@ import type { User } from "$lib/types/User";
 import { generateQueryTokens } from "$lib/utils/searchTokens.js";
 import { error, redirect } from "@sveltejs/kit";
 import type { Filter } from "mongodb";
-
+import { ReviewStatus } from "$lib/types/Review";
 const NUM_PER_PAGE = 24;
 
 export const load = async ({ url, locals }) => {
@@ -36,7 +36,7 @@ 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)
-			? { featured: true }
+			? { review: ReviewStatus.APPROVED }
 			: {};
 
 	// if the user queried is not the current user, only show "public" assistants that have been shared before

src/routes/assistants/+page.svelte

@@ -25,6 +25,7 @@
 	import IconInternet from "$lib/components/icons/IconInternet.svelte";
 	import { isDesktop } from "$lib/utils/isDesktop";
 	import { SortKey } from "$lib/types/Assistant";
+	import { ReviewStatus } from "$lib/types/Review";
 
 	export let data: PageData;
 
@@ -245,7 +246,7 @@
 
 				<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.featured && !createdByMe ? 'border !border-red-500/30' : ''}"
+					{!(assistant.review === ReviewStatus.APPROVED) && !createdByMe ? 'border !border-red-500/30' : ''}"
 					on:click={() => {
 						if (data.settings.assistants.includes(assistant._id.toString())) {
 							settings.instantSet({ activeModel: assistant._id.toString() });

src/routes/settings/(nav)/assistants/[assistantId]/+page.server.ts

@@ -7,7 +7,8 @@ import { env as envPublic } from "$env/dynamic/public";
 import { env } from "$env/dynamic/private";
 import { z } from "zod";
 import type { Assistant } from "$lib/types/Assistant";
-import { logger } from "$lib/server/logger";
+import { ReviewStatus } from "$lib/types/Review";
+import { sendSlack } from "$lib/server/sendSlack";
 
 async function assistantOnlyIfAuthor(locals: App.Locals, assistantId?: string) {
 	const assistant = await collections.assistants.findOne({ _id: new ObjectId(assistantId) });
@@ -104,21 +105,11 @@ export const actions: Actions = {
 
 			const username = locals.user?.username;
 
-			const res = await fetch(env.WEBHOOK_URL_REPORT_ASSISTANT, {
-				method: "POST",
-				headers: {
-					"Content-type": "application/json",
-				},
-				body: JSON.stringify({
-					text: `Assistant <${assistantUrl}|${assistant?.name}> reported by ${
-						username ? `<http://hf.co/${username}|${username}>` : "non-logged in user"
-					}.\n\n> ${result.data}`,
-				}),
-			});
-
-			if (!res.ok) {
-				logger.error(`Webhook assistant report failed. ${res.statusText} ${res.text}`);
-			}
+			await sendSlack(
+				`🔴 Assistant <${assistantUrl}|${assistant?.name}> reported by ${
+					username ? `<http://hf.co/${username}|${username}>` : "non-logged in user"
+				}.\n\n> ${result.data}`
+			);
 		}
 
 		return { from: "report", ok: true, message: "Assistant reported" };
@@ -172,54 +163,105 @@ export const actions: Actions = {
 
 		redirect(302, `${base}/settings`);
 	},
+	deny: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			assistantId: params.assistantId,
+			locals,
+			status: ReviewStatus.DENIED,
+			url,
+		});
+	},
+	approve: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			assistantId: params.assistantId,
+			locals,
+			status: ReviewStatus.APPROVED,
+			url,
+		});
+	},
+	request: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			assistantId: params.assistantId,
+			locals,
+			status: ReviewStatus.PENDING,
+			url,
+		});
+	},
+	unrequest: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			assistantId: params.assistantId,
+			locals,
+			status: ReviewStatus.PRIVATE,
+			url,
+		});
+	},
+};
 
-	unfeature: async ({ params, locals }) => {
-		if (!locals.user?.isAdmin) {
-			return fail(403, { error: true, message: "Permission denied" });
-		}
+async function setReviewStatus({
+	locals,
+	assistantId,
+	status,
+	url,
+}: {
+	locals: App.Locals;
+	assistantId?: string;
+	status: ReviewStatus;
+	url: URL;
+}) {
+	if (!assistantId) {
+		return fail(400, { error: true, message: "Assistant ID is required" });
+	}
 
-		const assistant = await collections.assistants.findOne({
-			_id: new ObjectId(params.assistantId),
-		});
+	const assistant = await collections.assistants.findOne({
+		_id: new ObjectId(assistantId),
+	});
 
-		if (!assistant) {
-			return fail(404, { error: true, message: "Assistant not found" });
-		}
+	if (!assistant) {
+		return fail(404, { error: true, message: "Assistant not found" });
+	}
 
-		const result = await collections.assistants.updateOne(
-			{ _id: assistant._id },
-			{ $set: { featured: false } }
-		);
+	if (
+		!locals.user ||
+		(!locals.user.isAdmin && assistant.createdById.toString() !== locals.user._id.toString())
+	) {
+		return fail(403, { error: true, message: "Permission denied" });
+	}
 
-		if (result.modifiedCount === 0) {
-			return fail(500, { error: true, message: "Failed to unfeature assistant" });
-		}
+	// only admins can set the status to APPROVED or DENIED
+	// if the status is already APPROVED or DENIED, only admins can change it
 
-		return { from: "unfeature", ok: true, message: "Assistant unfeatured" };
-	},
+	if (
+		(status === ReviewStatus.APPROVED ||
+			status === ReviewStatus.DENIED ||
+			assistant.review === ReviewStatus.APPROVED ||
+			assistant.review === ReviewStatus.DENIED) &&
+		!locals.user?.isAdmin
+	) {
+		return fail(403, { error: true, message: "Permission denied" });
+	}
 
-	feature: async ({ params, locals }) => {
-		if (!locals.user?.isAdmin) {
-			return fail(403, { error: true, message: "Permission denied" });
-		}
+	const result = await collections.assistants.updateOne(
+		{ _id: assistant._id },
+		{ $set: { review: status } }
+	);
 
-		const assistant = await collections.assistants.findOne({
-			_id: new ObjectId(params.assistantId),
-		});
+	if (result.modifiedCount === 0) {
+		return fail(500, { error: true, message: "Failed to update review status" });
+	}
 
-		if (!assistant) {
-			return fail(404, { error: true, message: "Assistant not found" });
-		}
+	if (status === ReviewStatus.PENDING) {
+		const prefixUrl =
+			envPublic.PUBLIC_SHARE_PREFIX || `${envPublic.PUBLIC_ORIGIN || url.origin}${base}`;
+		const assistantUrl = `${prefixUrl}/assistant/${assistantId}`;
 
-		const result = await collections.assistants.updateOne(
-			{ _id: assistant._id },
-			{ $set: { featured: true } }
-		);
+		const username = locals.user?.username;
 
-		if (result.modifiedCount === 0) {
-			return fail(500, { error: true, message: "Failed to feature assistant" });
-		}
+		await sendSlack(
+			`🟢 Assistant <${assistantUrl}|${assistant?.name}> requested to be featured by ${
+				username ? `<http://hf.co/${username}|${username}>` : "non-logged in user"
+			}.`
+		);
+	}
 
-		return { from: "feature", ok: true, message: "Assistant featured" };
-	},
-};
+	return { from: "setReviewStatus", ok: true, message: "Review status updated" };
+}

src/routes/settings/(nav)/assistants/[assistantId]/+page.svelte

@@ -15,11 +15,13 @@
 	import CarbonChat from "~icons/carbon/chat";
 	import CarbonStar from "~icons/carbon/star";
 	import CarbonTools from "~icons/carbon/tools";
+	import CarbonLock from "~icons/carbon/locked";
 
 	import CopyToClipBoardBtn from "$lib/components/CopyToClipBoardBtn.svelte";
 	import ReportModal from "./ReportModal.svelte";
 	import IconInternet from "$lib/components/icons/IconInternet.svelte";
 	import ToolBadge from "$lib/components/ToolBadge.svelte";
+	import { ReviewStatus } from "$lib/types/Review";
 
 	export let data: PageData;
 
@@ -151,24 +153,51 @@
 					{/if}
 				{/if}
 				{#if data?.user?.isAdmin}
-					<form method="POST" action="?/delete" use:enhance>
-						<button type="submit" class="flex items-center text-red-600 underline">
-							<CarbonTrash class="mr-1.5 inline text-xs" />Delete</button
-						>
-					</form>
-					{#if assistant?.featured}
-						<form method="POST" action="?/unfeature" use:enhance>
+					{#if !assistant?.createdByMe}
+						<form method="POST" action="?/delete" use:enhance>
 							<button type="submit" class="flex items-center text-red-600 underline">
-								<CarbonTrash class="mr-1.5 inline text-xs" />Un-feature</button
+								<CarbonTrash class="mr-1.5 inline text-xs" />Delete</button
 							>
 						</form>
-					{:else}
-						<form method="POST" action="?/feature" use:enhance>
+					{/if}
+					{#if assistant?.review === ReviewStatus.PENDING}
+						<form method="POST" action="?/approve" use:enhance>
 							<button type="submit" class="flex items-center text-green-600 underline">
-								<CarbonStar class="mr-1.5 inline text-xs" />Feature</button
+								<CarbonStar class="mr-1.5 inline text-xs" />Approve</button
 							>
 						</form>
+						<form method="POST" action="?/deny" use:enhance>
+							<button type="submit" class="flex items-center text-red-600">
+								<span class="mr-1.5 font-light no-underline">X</span>
+								<span class="underline">Deny</span>
+							</button>
+						</form>
 					{/if}
+					{#if assistant?.review === ReviewStatus.APPROVED || assistant?.review === ReviewStatus.DENIED}
+						<form method="POST" action="?/unrequest" use:enhance>
+							<button type="submit" class="flex items-center text-red-600 underline">
+								<CarbonLock class="mr-1.5 inline text-xs " />Make private</button
+							>
+						</form>
+					{/if}
+				{/if}
+				{#if assistant?.createdByMe && assistant?.review === ReviewStatus.PRIVATE}
+					<form
+						method="POST"
+						action="?/request"
+						use:enhance={async ({ cancel }) => {
+							const confirmed = confirm(
+								"Are you sure you want to request this assistant to be featured? Make sure you have tried the assistant and that it works as expected. "
+							);
+							if (!confirmed) {
+								cancel();
+							}
+						}}
+					>
+						<button type="submit" class="flex items-center underline">
+							<CarbonStar class="mr-1.5 inline text-xs" />Request to be featured</button
+						>
+					</form>
 				{/if}
 			</div>
 		</div>

src/routes/settings/(nav)/assistants/new/+page.server.ts

@@ -11,6 +11,7 @@ import { parseStringToList } from "$lib/utils/parseStringToList";
 import { usageLimits } from "$lib/server/usageLimits";
 import { generateSearchTokens } from "$lib/utils/searchTokens";
 import { toolFromConfigs } from "$lib/server/tools";
+import { ReviewStatus } from "$lib/types/Review";
 
 const newAsssistantSchema = z.object({
 	name: z.string().min(1),
@@ -148,7 +149,7 @@ export const actions: Actions = {
 			createdAt: new Date(),
 			updatedAt: new Date(),
 			userCount: 1,
-			featured: false,
+			review: ReviewStatus.PRIVATE,
 			rag: {
 				allowedLinks: parse.data.ragLinkList,
 				allowedDomains: parse.data.ragDomainList,

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

@@ -3,6 +3,7 @@ import { authCondition } from "$lib/server/auth.js";
 import { Database, collections } from "$lib/server/database.js";
 import { toolFromConfigs } from "$lib/server/tools/index.js";
 import { SortKey } from "$lib/types/Assistant.js";
+import { ReviewStatus } from "$lib/types/Review";
 import type { CommunityToolDB } from "$lib/types/Tool.js";
 import type { User } from "$lib/types/User.js";
 import { generateQueryTokens, generateSearchTokens } from "$lib/utils/searchTokens.js";
@@ -47,7 +48,7 @@ export const load = async ({ url, locals }) => {
 	const filter: Filter<CommunityToolDB> = {
 		...(!createdByCurrentUser &&
 			!activeOnly &&
-			!(locals.user?.isAdmin && showUnfeatured) && { featured: true }),
+			!(locals.user?.isAdmin && showUnfeatured) && { review: ReviewStatus.APPROVED }),
 		...(user && { createdById: user._id }),
 		...(queryTokens && { searchTokens: { $all: queryTokens } }),
 		...(activeOnly && {

src/routes/tools/+page.svelte

@@ -19,6 +19,7 @@
 	import { isDesktop } from "$lib/utils/isDesktop";
 	import { SortKey } from "$lib/types/Assistant";
 	import ToolLogo from "$lib/components/ToolLogo.svelte";
+	import { ReviewStatus } from "$lib/types/Review";
 
 	export let data: PageData;
 
@@ -233,8 +234,9 @@
 				{@const isOfficial = !tool.createdByName}
 				<a
 					href="{base}/tools/{tool._id.toString()}"
-					class="relative flex flex-row items-center gap-4 overflow-hidden text-balance rounded-xl border bg-gray-50/50 px-4 text-center shadow hover:bg-gray-50 hover:shadow-inner dark:bg-gray-950/20 dark:hover:bg-gray-950/40 max-sm:px-4 sm:h-24 {!tool.featured &&
-					!isOfficial
+					class="relative flex flex-row items-center gap-4 overflow-hidden text-balance rounded-xl border bg-gray-50/50 px-4 text-center shadow hover:bg-gray-50 hover:shadow-inner dark:bg-gray-950/20 dark:hover:bg-gray-950/40 max-sm:px-4 sm:h-24 {!(
+						tool.review === ReviewStatus.APPROVED
+					) && !isOfficial
 						? ' border-red-500/30'
 						: 'dark:border-gray-800/70'}"
 					class:!border-blue-600={isActive}

src/routes/tools/[toolId]/+layout.server.ts

@@ -1,6 +1,7 @@
 import { base } from "$app/paths";
 import { collections } from "$lib/server/database.js";
 import { toolFromConfigs } from "$lib/server/tools/index.js";
+import { ReviewStatus } from "$lib/types/Review.js";
 import { redirect } from "@sveltejs/kit";
 import { ObjectId } from "mongodb";
 
@@ -21,7 +22,7 @@ export const load = async ({ params, locals }) => {
 				createdByName: null,
 				createdByMe: false,
 				reported: false,
-				featured: false,
+				review: ReviewStatus.APPROVED,
 			},
 		};
 	}

src/routes/tools/[toolId]/+page.server.ts

@@ -2,7 +2,8 @@ import { base } from "$app/paths";
 import { env } from "$env/dynamic/private";
 import { env as envPublic } from "$env/dynamic/public";
 import { collections } from "$lib/server/database";
-import { logger } from "$lib/server/logger";
+import { sendSlack } from "$lib/server/sendSlack";
+import { ReviewStatus } from "$lib/types/Review";
 import type { Tool } from "$lib/types/Tool";
 import { fail, redirect, type Actions } from "@sveltejs/kit";
 import { ObjectId } from "mongodb";
@@ -103,64 +104,111 @@ export const actions: Actions = {
 
 			const username = locals.user?.username;
 
-			const res = await fetch(env.WEBHOOK_URL_REPORT_ASSISTANT, {
-				method: "POST",
-				headers: {
-					"Content-type": "application/json",
-				},
-				body: JSON.stringify({
-					text: `Tool <${toolUrl}|${tool?.displayName}> reported by ${
-						username ? `<http://hf.co/${username}|${username}>` : "non-logged in user"
-					}.\n\n> ${result.data}`,
-				}),
-			});
-
-			if (!res.ok) {
-				logger.error(`Webhook tool report failed. ${res.statusText} ${res.text}`);
-			}
+			await sendSlack(
+				`🔴 Tool <${toolUrl}|${tool?.displayName}> reported by ${
+					username ? `<http://hf.co/${username}|${username}>` : "non-logged in user"
+				}.\n\n> ${result.data}`
+			);
 		}
 
 		return { from: "report", ok: true, message: "Tool reported" };
 	},
+	deny: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			toolId: params.toolId,
+			locals,
+			status: ReviewStatus.DENIED,
+			url,
+		});
+	},
+	approve: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			toolId: params.toolId,
+			locals,
+			status: ReviewStatus.APPROVED,
+			url,
+		});
+	},
+	request: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			toolId: params.toolId,
+			locals,
+			status: ReviewStatus.PENDING,
+			url,
+		});
+	},
+	unrequest: async ({ params, locals, url }) => {
+		return await setReviewStatus({
+			toolId: params.toolId,
+			locals,
+			status: ReviewStatus.PRIVATE,
+			url,
+		});
+	},
+};
 
-	unfeature: async ({ params, locals }) => {
-		if (!locals.user?.isAdmin) {
-			return fail(403, { error: true, message: "Permission denied" });
-		}
+async function setReviewStatus({
+	locals,
+	toolId,
+	status,
+	url,
+}: {
+	locals: App.Locals;
+	toolId?: string;
+	status: ReviewStatus;
+	url: URL;
+}) {
+	if (!toolId) {
+		return fail(400, { error: true, message: "Tool ID is required" });
+	}
 
-		const tool = await collections.tools.findOne({
-			_id: new ObjectId(params.toolId),
-		});
+	const tool = await collections.tools.findOne({
+		_id: new ObjectId(toolId),
+	});
 
-		if (!tool) {
-			return fail(404, { error: true, message: "Tool not found" });
-		}
+	if (!tool) {
+		return fail(404, { error: true, message: "Tool not found" });
+	}
 
-		const result = await collections.tools.updateOne(
-			{ _id: tool._id },
-			{ $set: { featured: false } }
-		);
+	if (
+		!locals.user ||
+		(!locals.user.isAdmin && tool.createdById.toString() !== locals.user._id.toString())
+	) {
+		return fail(403, { error: true, message: "Permission denied" });
+	}
 
-		if (result.modifiedCount === 0) {
-			return fail(500, { error: true, message: "Failed to unfeature tool" });
-		}
+	// only admins can set the status to APPROVED or DENIED
+	// if the status is already APPROVED or DENIED, only admins can change it
 
-		return { from: "unfeature", ok: true, message: "Tool unfeatured" };
-	},
-	feature: async ({ params, locals }) => {
-		if (!locals.user?.isAdmin) {
-			return fail(403, { error: true, message: "Permission denied" });
-		}
+	if (
+		(status === ReviewStatus.APPROVED ||
+			status === ReviewStatus.DENIED ||
+			tool.review === ReviewStatus.APPROVED ||
+			tool.review === ReviewStatus.DENIED) &&
+		!locals.user?.isAdmin
+	) {
+		return fail(403, { error: true, message: "Permission denied" });
+	}
 
-		const result = await collections.tools.updateOne(
-			{ _id: new ObjectId(params.toolId) },
-			{ $set: { featured: true } }
-		);
+	const result = await collections.tools.updateOne({ _id: tool._id }, { $set: { review: status } });
 
-		if (result.modifiedCount === 0) {
-			return fail(500, { error: true, message: "Failed to feature tool" });
-		}
+	if (result.modifiedCount === 0) {
+		return fail(500, { error: true, message: "Failed to update review status" });
+	}
 
-		return { from: "feature", ok: true, message: "Tool featured" };
-	},
-};
+	if (status === ReviewStatus.PENDING) {
+		const prefixUrl =
+			envPublic.PUBLIC_SHARE_PREFIX || `${envPublic.PUBLIC_ORIGIN || url.origin}${base}`;
+		const toolUrl = `${prefixUrl}/tools/${toolId}`;
+
+		const username = locals.user?.username;
+
+		await sendSlack(
+			`🟢 Tool <${toolUrl}|${tool?.displayName}> requested to be featured by ${
+				username ? `<http://hf.co/${username}|${username}>` : "non-logged in user"
+			}.`
+		);
+	}
+
+	return { from: "setReviewStatus", ok: true, message: "Review status updated" };
+}

src/routes/tools/[toolId]/+page.svelte

@@ -6,6 +6,7 @@
 	import ToolLogo from "$lib/components/ToolLogo.svelte";
 	import { env as envPublic } from "$env/dynamic/public";
 	import { useSettingsStore } from "$lib/stores/settings";
+	import { ReviewStatus } from "$lib/types/Review";
 
 	import ReportModal from "../../settings/(nav)/assistants/[assistantId]/ReportModal.svelte";
 	import { applyAction, enhance } from "$app/forms";
@@ -17,6 +18,7 @@
 	import CarbonFlag from "~icons/carbon/flag";
 	import CarbonLink from "~icons/carbon/link";
 	import CarbonStar from "~icons/carbon/star";
+	import CarbonLock from "~icons/carbon/locked";
 
 	export let data;
 
@@ -99,7 +101,7 @@
 							<button
 								class="{isActive
 									? 'bg-gray-100 text-gray-800'
-									: 'bg-black !text-white'} mx-auto my-2 flex w-full w-min items-center justify-center rounded-full px-3 py-1 text-base"
+									: 'bg-black !text-white'} mx-auto my-2 flex w-min items-center justify-center rounded-full px-3 py-1 text-base"
 								name="Activate model"
 								on:click|stopPropagation={() => {
 									if (isActive) {
@@ -164,25 +166,52 @@
 							{/if}
 						{/if}
 						{#if data?.user?.isAdmin}
-							<form method="POST" action="?/delete" use:enhance>
-								<button type="submit" class="flex items-center text-red-600 underline">
-									<CarbonTrash class="mr-1.5 inline text-xs" />Delete</button
-								>
-							</form>
-							{#if data.tool?.featured}
-								<form method="POST" action="?/unfeature" use:enhance>
+							{#if !data.tool?.createdByMe}
+								<form method="POST" action="?/delete" use:enhance>
 									<button type="submit" class="flex items-center text-red-600 underline">
-										<CarbonTrash class="mr-1.5 inline text-xs" />Un-feature</button
+										<CarbonTrash class="mr-1.5 inline text-xs" />Delete</button
 									>
 								</form>
-							{:else}
-								<form method="POST" action="?/feature" use:enhance>
+							{/if}
+							{#if data.tool?.review === ReviewStatus.PENDING}
+								<form method="POST" action="?/approve" use:enhance>
 									<button type="submit" class="flex items-center text-green-600 underline">
-										<CarbonStar class="mr-1.5 inline text-xs" />Feature</button
+										<CarbonStar class="mr-1.5 inline text-xs" />Approve</button
+									>
+								</form>
+								<form method="POST" action="?/deny" use:enhance>
+									<button type="submit" class="flex items-center text-red-600">
+										<span class="mr-1.5 font-light no-underline">X</span>
+										<span class="underline">Deny</span>
+									</button>
+								</form>
+							{/if}
+							{#if data.tool?.review === ReviewStatus.APPROVED || data.tool?.review === ReviewStatus.DENIED}
+								<form method="POST" action="?/unrequest" use:enhance>
+									<button type="submit" class="flex items-center text-red-600 underline">
+										<CarbonLock class="mr-1.5 inline text-xs " />Make private</button
 									>
 								</form>
 							{/if}
 						{/if}
+						{#if data.tool?.createdByMe && data.tool?.review === ReviewStatus.PRIVATE}
+							<form
+								method="POST"
+								action="?/request"
+								use:enhance={async ({ cancel }) => {
+									const confirmed = confirm(
+										"Are you sure you want to request this tool to be featured? Make sure you have tried the tool and that it works as expected. We will review your request once submitted."
+									);
+									if (!confirmed) {
+										cancel();
+									}
+								}}
+							>
+								<button type="submit" class="flex items-center underline">
+									<CarbonStar class="mr-1.5 inline text-xs" />Request to be featured</button
+								>
+							</form>
+						{/if}
 					</div>
 				</div>
 			</div>

src/routes/tools/new/+page.server.ts

@@ -3,6 +3,7 @@ import { authCondition, requiresUser } from "$lib/server/auth.js";
 import { collections } from "$lib/server/database.js";
 import { editableToolSchema } from "$lib/server/tools/index.js";
 import { usageLimits } from "$lib/server/usageLimits.js";
+import { ReviewStatus } from "$lib/types/Review";
 import { generateSearchTokens } from "$lib/utils/searchTokens.js";
 import { error, fail } from "@sveltejs/kit";
 import { ObjectId } from "mongodb";
@@ -66,7 +67,7 @@ export const actions = {
 			updatedAt: new Date(),
 			last24HoursUseCount: 0,
 			useCount: 0,
-			featured: locals.user?.isAdmin ?? false, // admin tools are featured by default
+			review: ReviewStatus.PRIVATE,
 			searchTokens: generateSearchTokens(parse.data.displayName),
 		});