fixes

Author: oscartbeaumont

apps/desktop/src-tauri/src/upload.rs

@@ -387,7 +387,10 @@ pub fn build_video_meta(path: &PathBuf) -> Result<S3VideoMeta, String> {
 
     let video_codec = ffmpeg::codec::context::Context::from_parameters(video_stream.parameters())
         .map_err(|e| format!("Unable to read video codec information: {e}"))?;
-    let video = video_codec.decoder().video().unwrap();
+    let video = video_codec
+        .decoder()
+        .video()
+        .map_err(|e| format!("Unable to get video decoder: {e}"))?;
 
     Ok(S3VideoMeta {
         duration_in_secs: input.duration() as f64 / AV_TIME_BASE as f64,

apps/web/app/(org)/dashboard/spaces/[spaceId]/page.tsx

@@ -326,6 +326,7 @@ export default async function SharedCapsPage({
 						videos.createdAt,
 						videos.metadata,
 						users.name,
+						videos.duration,
 					)
 					.orderBy(
 						desc(

apps/web/app/api/upload/[...route]/multipart.ts

@@ -287,7 +287,9 @@ app.post(
 								height: updateIfDefined(body.height, videos.height),
 								fps: updateIfDefined(body.fps, videos.fps),
 							})
-							.where(eq(videos.id, videoIdToUse));
+							.where(
+								and(eq(videos.id, videoIdToUse), eq(videos.ownerId, user.id)),
+							);
 
 					if (videoIdFromFileKey) {
 						try {

apps/web/app/api/upload/[...route]/signed.ts

@@ -7,7 +7,7 @@ import { s3Buckets, videos } from "@cap/database/schema";
 import type { VideoMetadata } from "@cap/database/types";
 import { serverEnv } from "@cap/env";
 import { zValidator } from "@hono/zod-validator";
-import { eq, sql } from "drizzle-orm";
+import { and, eq, sql } from "drizzle-orm";
 import { Hono } from "hono";
 import { z } from "zod";
 import { createBucketProvider } from "@/utils/s3";
@@ -154,7 +154,7 @@ app.post(
 						height: updateIfDefined(height, videos.height),
 						fps: updateIfDefined(fps, videos.fps),
 					})
-					.where(eq(videos.id, videoIdToUse));
+					.where(and(eq(videos.id, videoIdToUse), eq(videos.ownerId, user.id)));
 
 			if (videoIdFromKey) {
 				try {

packages/database/index.ts

@@ -36,4 +36,4 @@ export const db = () => {
 
 // Use the incoming value if one exists, else fallback to the DBs existing value.
 export const updateIfDefined = <T>(v: T | undefined, col: AnyMySqlColumn) =>
-	sql`COALESCE(${v ?? sql`NULL`}, ${col})`;
+	sql`COALESCE(${v === undefined ? sql`NULL` : v}, ${col})`;