Merge branch 'main' into branded-ids

Author: oscartbeaumont

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "cap-desktop"
-version = "0.3.72-beta.1"
+version = "0.3.72"
 description = "Beautiful screen recordings, owned by you."
 authors = ["you"]
 edition = "2024"

apps/desktop/src-tauri/Cargo.toml

@@ -0,0 +1,44 @@
+"use server";
+
+import { db } from "@cap/database";
+import { getCurrentUser } from "@cap/database/auth/session";
+import { organizations } from "@cap/database/schema";
+import { eq } from "drizzle-orm";
+import { revalidatePath } from "next/cache";
+
+export async function updateOrganizationSettings(settings: {
+	disableSummary?: boolean;
+	disableCaptions?: boolean;
+	disableChapters?: boolean;
+	disableReactions?: boolean;
+	disableTranscript?: boolean;
+	disableComments?: boolean;
+}) {
+	const user = await getCurrentUser();
+
+	if (!user) {
+		throw new Error("Unauthorized");
+	}
+
+	if (!settings) {
+		throw new Error("Settings are required");
+	}
+
+	const [organization] = await db()
+		.select()
+		.from(organizations)
+		.where(eq(organizations.id, user.activeOrganizationId));
+
+	if (!organization) {
+		throw new Error("Organization not found");
+	}
+
+	await db()
+		.update(organizations)
+		.set({ settings })
+		.where(eq(organizations.id, user.activeOrganizationId));
+
+	revalidatePath("/dashboard/caps");
+
+	return { success: true };
+}

apps/web/actions/organization/settings.ts

@@ -41,7 +41,6 @@ export async function generateAiMetadata(
 		const updatedAtTime = new Date(videoData.updatedAt).getTime();
 		const currentTime = new Date().getTime();
 		const tenMinutesInMs = 10 * 60 * 1000;
-		const minutesElapsed = Math.round((currentTime - updatedAtTime) / 60000);
 
 		if (currentTime - updatedAtTime > tenMinutesInMs) {
 			await db()

apps/web/actions/videos/generate-ai-metadata.ts

@@ -14,8 +14,10 @@ import { generateAiMetadata } from "./generate-ai-metadata";
 
 const MAX_AI_PROCESSING_TIME = 10 * 60 * 1000;
 
+type TranscriptionStatus = "PROCESSING" | "COMPLETE" | "ERROR" | "SKIPPED";
+
 export interface VideoStatusResult {
-	transcriptionStatus: "PROCESSING" | "COMPLETE" | "ERROR" | null;
+	transcriptionStatus: TranscriptionStatus | null;
 	aiTitle: string | null;
 	aiProcessing: boolean;
 	summary: string | null;
@@ -124,10 +126,7 @@ export async function getVideoStatus(
 
 				return {
 					transcriptionStatus:
-						(updatedVideo.transcriptionStatus as
-							| "PROCESSING"
-							| "COMPLETE"
-							| "ERROR") || null,
+						(updatedVideo.transcriptionStatus as TranscriptionStatus) || null,
 					aiProcessing: false,
 					aiTitle: updatedMetadata.aiTitle || null,
 					summary: updatedMetadata.summary || null,
@@ -214,8 +213,7 @@ export async function getVideoStatus(
 
 			return {
 				transcriptionStatus:
-					(video.transcriptionStatus as "PROCESSING" | "COMPLETE" | "ERROR") ||
-					null,
+					(video.transcriptionStatus as TranscriptionStatus) || null,
 				aiProcessing: true,
 				aiTitle: metadata.aiTitle || null,
 				summary: metadata.summary || null,
@@ -232,8 +230,7 @@ export async function getVideoStatus(
 
 	return {
 		transcriptionStatus:
-			(video.transcriptionStatus as "PROCESSING" | "COMPLETE" | "ERROR") ||
-			null,
+			(video.transcriptionStatus as TranscriptionStatus) || null,
 		aiProcessing: metadata.aiProcessing || false,
 		aiTitle: metadata.aiTitle || null,
 		summary: metadata.summary || null,

apps/web/actions/videos/get-status.ts

@@ -0,0 +1,45 @@
+"use server";
+
+import { db } from "@cap/database";
+import { getCurrentUser } from "@cap/database/auth/session";
+import { videos } from "@cap/database/schema";
+import type { Video } from "@cap/web-domain";
+import { eq } from "drizzle-orm";
+
+export async function updateVideoSettings(
+	videoId: Video.VideoId,
+	videoSettings: {
+		disableSummary?: boolean;
+		disableCaptions?: boolean;
+		disableChapters?: boolean;
+		disableReactions?: boolean;
+		disableTranscript?: boolean;
+		disableComments?: boolean;
+	},
+) {
+	const user = await getCurrentUser();
+
+	if (!user || !videoId || !videoSettings) {
+		throw new Error("Missing required data for updating video settings");
+	}
+
+	const [video] = await db()
+		.select()
+		.from(videos)
+		.where(eq(videos.id, videoId));
+
+	if (!video) {
+		throw new Error("Video not found for updating video settings");
+	}
+
+	if (video.ownerId !== user.id) {
+		throw new Error("You don't have permission to update this video settings");
+	}
+
+	await db()
+		.update(videos)
+		.set({ settings: videoSettings })
+		.where(eq(videos.id, videoId));
+
+	return { success: true };
+}

apps/web/actions/videos/settings.ts

@@ -6,11 +6,17 @@ import Cookies from "js-cookie";
 import { usePathname } from "next/navigation";
 import { createContext, useContext, useEffect, useState } from "react";
 import { UpgradeModal } from "@/components/UpgradeModal";
-import type { Organization, Spaces, UserPreferences } from "./dashboard-data";
+import type {
+	Organization,
+	OrganizationSettings,
+	Spaces,
+	UserPreferences,
+} from "./dashboard-data";
 
 type SharedContext = {
 	organizationData: Organization[] | null;
 	activeOrganization: Organization | null;
+	organizationSettings: OrganizationSettings | null;
 	spacesData: Spaces[] | null;
 	userSpaces: Spaces[] | null;
 	sharedSpaces: Spaces[] | null;
@@ -50,6 +56,7 @@ export function DashboardContexts({
 	spacesData,
 	user,
 	isSubscribed,
+	organizationSettings,
 	userPreferences,
 	anyNewNotifications,
 	initialTheme,
@@ -62,6 +69,7 @@ export function DashboardContexts({
 	spacesData: SharedContext["spacesData"];
 	user: SharedContext["user"];
 	isSubscribed: SharedContext["isSubscribed"];
+	organizationSettings: SharedContext["organizationSettings"];
 	userPreferences: SharedContext["userPreferences"];
 	anyNewNotifications: boolean;
 	initialTheme: ITheme;
@@ -154,6 +162,7 @@ export function DashboardContexts({
 					spacesData,
 					anyNewNotifications,
 					userPreferences,
+					organizationSettings,
 					userSpaces,
 					sharedSpaces,
 					activeSpace,

apps/web/app/(org)/dashboard/Contexts.tsx

@@ -44,7 +44,7 @@ const MobileTab = () => {
 		}
 	});
 	return (
-		<div className="flex sticky bottom-0 z-50 flex-1 justify-between items-center px-5 w-screen h-16 border-t lg:hidden border-gray-5 bg-gray-1">
+		<div className="flex sticky bottom-0 z-50 flex-1 gap-5 justify-between items-center px-5 w-screen h-16 border-t lg:hidden border-gray-5 bg-gray-1">
 			<AnimatePresence>
 				{open && <OrgsMenu setOpen={setOpen} menuRef={menuRef} />}
 			</AnimatePresence>

apps/web/app/(org)/dashboard/_components/MobileTab.tsx

@@ -94,7 +94,7 @@ const AdminNavItems = ({ toggleMobileNav }: Props) => {
 					position="right"
 					content={activeOrg?.organization.name ?? "No organization found"}
 				>
-					<PopoverTrigger asChild>
+					<PopoverTrigger suppressHydrationWarning asChild>
 						<motion.div
 							transition={{
 								type: "easeInOut",

apps/web/app/(org)/dashboard/_components/Navbar/Items.tsx

@@ -24,7 +24,7 @@ import { CapPagination } from "./components/CapPagination";
 import { EmptyCapState } from "./components/EmptyCapState";
 import type { FolderDataType } from "./components/Folder";
 import Folder from "./components/Folder";
-import { useUploadingContext, useUploadingStatus } from "./UploadingContext";
+import { useUploadingStatus } from "./UploadingContext";
 
 export type VideoData = {
 	id: Video.VideoId;