nice

pingdotgg · Sep 30, 2024 · 1fd585f · 1fd585f
1 parent 15d6c33
commit 1fd585f
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/examples/minimal-appdir/src/server/uploadthing.ts b/examples/minimal-appdir/src/server/uploadthing.ts
@@ -32,6 +32,7 @@ export const uploadRouter = {
     },
     blob: {
       maxFileSize: "8GB",
+      maxFileCount: 10,
     },
   })
     .middleware(({ req, files }) => {

diff --git a/packages/uploadthing/src/client.ts b/packages/uploadthing/src/client.ts
@@ -51,7 +51,7 @@ export const isValidFileType = (
   routeConfig: ExpandedRouteConfig,
 ): boolean =>
   Micro.runSync(
-    getTypeFromFileName(file.name, objectKeys(routeConfig)).pipe(
+    getTypeFromFileName(file.name, objectKeys(routeConfig), file.type).pipe(
       Micro.map((type) => file.type.includes(type)),
       Micro.orElseSucceed(() => false),
     ),
@@ -66,7 +66,7 @@ export const isValidFileSize = (
   routeConfig: ExpandedRouteConfig,
 ): boolean =>
   Micro.runSync(
-    getTypeFromFileName(file.name, objectKeys(routeConfig)).pipe(
+    getTypeFromFileName(file.name, objectKeys(routeConfig), file.type).pipe(
       Micro.flatMap((type) => fileSizeToBytes(routeConfig[type]!.maxFileSize)),
       Micro.map((maxFileSize) => file.size <= maxFileSize),
       Micro.orElseSucceed(() => false),

diff --git a/packages/uploadthing/src/internal/handler.ts b/packages/uploadthing/src/internal/handler.ts
@@ -530,7 +530,7 @@ const handleUploadAction = (opts: {
       filesWithCustomIds,
       (file) =>
         Effect.map(
-          getTypeFromFileName(file.name, objectKeys(parsedConfig)),
+          getTypeFromFileName(file.name, objectKeys(parsedConfig), file.type),
           (type) => ({
             name: file.name,
             size: file.size,
-Original file line number
+Diff line change
@@ Expand Up / @@ -32,6 +32,7 @@ export const uploadRouter = { @@
         },
         blob: {
           maxFileSize: "8GB",
+          maxFileCount: 10,
         },
       })
         .middleware(({ req, files }) => {
@@ Expand Down @@