From 040c244d35ff42b59993c85a5110d4e7aedc0237 Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Mon, 3 Feb 2025 19:06:08 +0100
Subject: Some code cleanup

---
 .../Controllers/Media/MediaController.cs                    | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'Utilities/LibMatrix.HomeserverEmulator/Controllers/Media')

diff --git a/Utilities/LibMatrix.HomeserverEmulator/Controllers/Media/MediaController.cs b/Utilities/LibMatrix.HomeserverEmulator/Controllers/Media/MediaController.cs
index 81b7440..6048bbb 100644
--- a/Utilities/LibMatrix.HomeserverEmulator/Controllers/Media/MediaController.cs
+++ b/Utilities/LibMatrix.HomeserverEmulator/Controllers/Media/MediaController.cs
@@ -3,6 +3,7 @@ using System.Text.RegularExpressions;
 using LibMatrix.HomeserverEmulator.Services;
 using LibMatrix.Services;
 using Microsoft.AspNetCore.Mvc;
+#pragma warning disable CS1591 // Missing XML comment for publicly visible type or member
 
 namespace LibMatrix.HomeserverEmulator.Controllers.Media;
 
@@ -12,12 +13,12 @@ public class MediaController(
     ILogger<MediaController> logger,
     TokenService tokenService,
     UserStore userStore,
-    HSEConfiguration cfg,
+    HseConfiguration cfg,
     HomeserverResolverService hsResolver,
     MediaStore mediaStore)
     : ControllerBase {
     [HttpPost("upload")]
-    public async Task<object> UploadMedia([FromHeader(Name = "Content-Type")] string ContentType, [FromQuery] string filename, [FromBody] Stream file) {
+    public async Task<object> UploadMedia([FromHeader(Name = "Content-Type")] string contentType, [FromQuery] string filename, [FromBody] Stream file) {
         var token = tokenService.GetAccessTokenOrNull(HttpContext);
         if (token == null)
             throw new MatrixException() {
@@ -75,7 +76,9 @@ public class MediaController(
         if (cfg.StoreData) {
             var path = Path.Combine(cfg.DataStoragePath, "media", serverName, mediaId);
             if (!System.IO.File.Exists(path)) {
-                var mediaUrl = await hsResolver.ResolveMediaUri(serverName, $"mxc://{serverName}/{mediaId}");
+                // var mediaUrl = await hsResolver.ResolveMediaUri(serverName, $"mxc://{serverName}/{mediaId}");
+                var homeserver = (await hsResolver.ResolveHomeserverFromWellKnown(serverName)).Client;
+                var mediaUrl = homeserver is null ? null : $"{homeserver}/_matrix/media/v3/download/";
                 if (mediaUrl is null)
                     throw new MatrixException() {
                         ErrorCode = "M_NOT_FOUND",
@@ -90,7 +93,9 @@ public class MediaController(
             return new FileStream(path, FileMode.Open);
         }
         else {
-            var mediaUrl = await hsResolver.ResolveMediaUri(serverName, $"mxc://{serverName}/{mediaId}");
+            // var mediaUrl = await hsResolver.ResolveMediaUri(serverName, $"mxc://{serverName}/{mediaId}");
+            var homeserver = (await hsResolver.ResolveHomeserverFromWellKnown(serverName)).Client;
+            var mediaUrl = homeserver is null ? null : $"{homeserver}/_matrix/media/v3/download/";
             if (mediaUrl is null)
                 throw new MatrixException() {
                     ErrorCode = "M_NOT_FOUND",
-- 
cgit 1.5.1