summaryrefslogtreecommitdiff
path: root/Controllers
diff options
context:
space:
mode:
authorJake Mannens <jake@asger.xyz>2023-09-06 09:30:54 +1000
committerJake Mannens <jake@asger.xyz>2025-08-20 00:52:04 +1000
commitb303a2fc0f37244d5f45bb2189238991118356e8 (patch)
tree8a11d4d9e879fb1b2845996c5eb0137f73230881 /Controllers
parent6ed8b2f7a2bac84f582048181c58cc318b729322 (diff)
Moved metadata from Media object to UploadedFile object
Diffstat (limited to 'Controllers')
-rw-r--r--Controllers/MediaController.cs7
1 files changed, 5 insertions, 2 deletions
diff --git a/Controllers/MediaController.cs b/Controllers/MediaController.cs
index 8070199..fa6e7ab 100644
--- a/Controllers/MediaController.cs
+++ b/Controllers/MediaController.cs
@@ -1,6 +1,7 @@
using HyperBooru.Services;
using HyperBooru.Util;
using Microsoft.AspNetCore.Mvc;
+using Microsoft.EntityFrameworkCore;
namespace HyperBooru.Controllers;
@@ -23,13 +24,15 @@ public class MediaController : Controller {
[HttpGet("{mediaId}")]
public IActionResult Fetch([FromRoute] Guid mediaId) {
- var media = db.Media.First(m => m.Guid == mediaId);
+ var media = db.Media
+ .Include(m => m.CurrentUploadedFile)
+ .First(m => m.Guid == mediaId);
if(media is null)
return NotFound();
var fs = System.IO.File.OpenRead(mediaService.GetPath(media));
- return new FileStreamResult(fs, media.MimeType);
+ return new FileStreamResult(fs, media.CurrentUploadedFile.MimeType);
}
[HttpGet("thumb/{mediaId}")]