fix: various fixes

server/api/v1/admin/game/metadata.post.ts

@@ -28,24 +28,32 @@ export default defineEventHandler(async (h3) => {
   const description = options.description;
   const gameId = options.id;
 
-  const changes: Prisma.GameUpdateInput = {
+  const updateModel: Prisma.GameUpdateInput = {
     mName: name,
     mShortDescription: description,
   };
 
   // handle if user uploaded new icon
   if (id) {
-    changes.mIconObjectId = id;
+    updateModel.mIconObjectId = id;
     await pull();
   } else {
     dump();
   }
 
+  // If the API call doesn't provide values, don't set them
+  for (const [key, value] of Object.entries(updateModel)) {
+    if (value === undefined) {
+      // eslint-disable-next-line @typescript-eslint/no-dynamic-delete
+      delete updateModel[key as keyof typeof updateModel];
+    }
+  }
+
   const newObject = await prisma.game.update({
     where: {
       id: gameId,
     },
-    data: changes,
+    data: updateModel,
   });
 
   return newObject;

server/api/v1/screenshots/[id]/index.delete.ts

@@ -18,7 +18,7 @@ export default defineEventHandler(async (h3) => {
     throw createError({
       statusCode: 404,
     });
-  else if (result.userId !== userId)
+  if (result.userId !== userId)
     throw createError({
       statusCode: 404,
     });

server/api/v1/screenshots/[id]/index.get.ts

@@ -18,7 +18,7 @@ export default defineEventHandler(async (h3) => {
     throw createError({
       statusCode: 404,
     });
-  else if (result.userId !== userId)
+  if (result.userId !== userId)
     throw createError({
       statusCode: 404,
     });

server/internal/metadata/index.ts

@@ -234,7 +234,6 @@ export class MetadataHandler {
         libraryBasePath,
       },
     });
-    // relate companies to game
 
     await pullObjects();
 

server/internal/screenshots/index.ts

@@ -53,11 +53,12 @@ class ScreenshotManager {
    * @param id
    */
   async delete(id: string) {
-    await prisma.screenshot.delete({
+    const deletedScreenshot = await prisma.screenshot.delete({
       where: {
         id,
       },
     });
+    await objectHandler.deleteAsSystem(deletedScreenshot.objectId);
   }
 
   /**
@@ -74,7 +75,7 @@ class ScreenshotManager {
         // TODO: set createAt to the time screenshot was taken
         createdAt: new Date().toISOString(),
       },
-      [`${userId}:read`, `${userId}:delete`],
+      [`${userId}:read`], // This is a system tracked object, so we don't want users to have direct write access to it
     );
     if (!saveStream)
       throw createError({