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

---
 .../LibMatrix.HomeserverEmulator/Services/MediaStore.cs  | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

(limited to 'Utilities/LibMatrix.HomeserverEmulator/Services/MediaStore.cs')

diff --git a/Utilities/LibMatrix.HomeserverEmulator/Services/MediaStore.cs b/Utilities/LibMatrix.HomeserverEmulator/Services/MediaStore.cs
index 00f2a42..7945d3a 100644
--- a/Utilities/LibMatrix.HomeserverEmulator/Services/MediaStore.cs
+++ b/Utilities/LibMatrix.HomeserverEmulator/Services/MediaStore.cs
@@ -4,18 +4,18 @@ using LibMatrix.Services;
 namespace LibMatrix.HomeserverEmulator.Services;
 
 public class MediaStore {
-    private readonly HSEConfiguration _config;
+    private readonly HseConfiguration _config;
     private readonly HomeserverResolverService _hsResolver;
-    private List<MediaInfo> index = new();
+    private List<MediaInfo> _mediaIndex = new();
 
-    public MediaStore(HSEConfiguration config, HomeserverResolverService hsResolver) {
+    public MediaStore(HseConfiguration config, HomeserverResolverService hsResolver) {
         _config = config;
         _hsResolver = hsResolver;
         if (config.StoreData) {
             var path = Path.Combine(config.DataStoragePath, "media");
             if (!Directory.Exists(path)) Directory.CreateDirectory(path);
             if (File.Exists(Path.Combine(path, "index.json")))
-                index = JsonSerializer.Deserialize<List<MediaInfo>>(File.ReadAllText(Path.Combine(path, "index.json")));
+                _mediaIndex = JsonSerializer.Deserialize<List<MediaInfo>>(File.ReadAllText(Path.Combine(path, "index.json")));
         }
         else
             Console.WriteLine("Data storage is disabled, not loading rooms from disk");
@@ -36,7 +36,9 @@ public class MediaStore {
         if (_config.StoreData) {
             var path = Path.Combine(_config.DataStoragePath, "media", serverName, mediaId);
             if (!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",
@@ -50,7 +52,9 @@ public class MediaStore {
             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