diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
index c6fd5b6..5202c40 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
@@ -3,11 +3,11 @@
@using System.Reflection
@using ArcaneLibs.Extensions
@using LibMatrix
+@using LibMatrix.EventTypes.Spec.State
@using LibMatrix.Extensions
@using LibMatrix.Helpers
@using LibMatrix.Homeservers
@using LibMatrix.Responses
-@using LibMatrix.StateEventTypes.Spec
@using MatrixRoomUtils.Web.Classes.RoomCreationTemplates
@* @* ReSharper disable once RedundantUsingDirective - Must not remove this, Rider marks this as "unused" when it's not */ *@
@@ -90,7 +90,7 @@
<tr>
<td>Room icon:</td>
<td>
- <img src="@MediaResolver.ResolveMediaUri(HomeServer.HomeServerDomain, roomAvatarEvent.Url)" style="width: 128px; height: 128px; border-radius: 50%;"/>
+ <img src="@hsResolver.ResolveMediaUri(HomeServer.HomeServerDomain, roomAvatarEvent.Url)" style="width: 128px; height: 128px; border-radius: 50%;"/>
<div style="display: inline-block; vertical-align: middle;">
<FancyTextBox @bind-Value="@roomAvatarEvent.Url"></FancyTextBox><br/>
<InputFile OnChange="RoomIconFilePicked"></InputFile>
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
index c2daba7..99e8cbb 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
@@ -1,8 +1,8 @@
@page "/Rooms"
-@using LibMatrix.StateEventTypes.Spec
@using LibMatrix.Filters
@using LibMatrix.Helpers
@using LibMatrix.Responses
+@using LibMatrix.EventTypes.Spec.State
<h3>Room list</h3>
<p>@Status</p>
@@ -55,7 +55,7 @@
protected override async Task OnInitializedAsync() {
var hs = await MRUStorage.GetCurrentSessionOrNavigate();
if (hs is null) return;
- GlobalProfile = await hs.GetProfile(hs.WhoAmI.UserId);
+ GlobalProfile = await hs.GetProfileAsync(hs.WhoAmI.UserId);
Status = "Syncing...";
SyncResult? sync = null;
@@ -75,7 +75,7 @@
}
else {
room = new RoomInfo {
- Room = await hs.GetRoom(roomId),
+ Room = hs.GetRoom(roomId),
StateEvents = new List<StateEventResponse?>()
};
Rooms.Add(room);
@@ -135,7 +135,7 @@
// if (res is not null) {
// foreach (var (roomId, roomData) in res.Rooms.Join) {
// var room = new RoomInfo() {
- // Room = await hs.GetRoom(roomId),
+ // Room = hs.GetRoom(roomId),
// StateEvents = roomData.State.Events.Where(x => x.Type == "m.room.member" && x.StateKey == hs.WhoAmI.UserId).ToList()
// };
// Rooms.Add(room);
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
index d2b8360..e6f436e 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
@@ -4,8 +4,8 @@
@using LibMatrix.Helpers
@using LibMatrix.Homeservers
@using LibMatrix.Responses
-@using LibMatrix.StateEventTypes.Spec
@using ArcaneLibs.Extensions
+@using LibMatrix.EventTypes.Spec.State
<h3>Policy list editor - Editing @RoomId</h3>
<hr/>
@@ -212,7 +212,7 @@ else {
var hs = await MRUStorage.GetCurrentSessionOrNavigate();
if (hs is null) return;
- var room = await hs.GetRoom(RoomId);
+ var room = hs.GetRoom(RoomId);
var states = room.GetFullStateAsync();
await foreach (var state in states) {
@@ -234,8 +234,8 @@ else {
var hs = userId.Split(':')[1];
var server = servers.ContainsKey(hs) ? servers[hs] : new RemoteHomeServer(userId.Split(':')[1]);
if (!servers.ContainsKey(hs)) servers.Add(hs, server);
- var profile = await server.GetProfile(userId);
- avatars.Add(userId, MediaResolver.ResolveMediaUri(server.FullHomeServerDomain, profile.AvatarUrl));
+ var profile = await server.GetProfileAsync(userId);
+ avatars.Add(userId, await hsResolver.ResolveMediaUri(server.FullHomeServerDomain, profile.AvatarUrl));
servers.Add(userId, server);
StateHasChanged();
}
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
index ef0ea5a..9474b21 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
@@ -35,14 +35,14 @@
var hs = await MRUStorage.GetCurrentSessionOrNavigate();
if (hs is null) return;
- Room = await hs.GetRoom(RoomId.Replace('~', '.'));
+ Room = hs.GetRoom(RoomId.Replace('~', '.'));
var state = Room.GetFullStateAsync();
await foreach (var stateEvent in state) {
switch (stateEvent.Type) {
case "m.space.child": {
var roomId = stateEvent.StateKey;
- var room = await hs.GetRoom(roomId);
+ var room = hs.GetRoom(roomId);
if (room is not null) {
Rooms.Add(room);
}
@@ -68,7 +68,7 @@
// if (stateEvent.Type == "m.space.child") {
// // if (stateEvent.Content.ToJson().Length < 5) return;
// var roomId = stateEvent.StateKey;
- // var room = await hs.GetRoom(roomId);
+ // var room = hs.GetRoom(roomId);
// if (room is not null) {
// Rooms.Add(room);
// }
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
index fefcabc..f7a6106 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
@@ -59,7 +59,7 @@
var hs = await MRUStorage.GetCurrentSessionOrNavigate();
var StateLoaded = 0;
- var response = (await hs.GetRoom(RoomId)).GetFullStateAsync();
+ var response = (hs.GetRoom(RoomId)).GetFullStateAsync();
await foreach (var _ev in response) {
// var e = new StateEventResponse {
// Type = _ev.Type,
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
index 1c3f28b..6e8fe2f 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
@@ -83,7 +83,7 @@
var StateLoaded = 0;
var hs = await MRUStorage.GetCurrentSessionOrNavigate();
if (hs is null) return;
- var response = (await hs.GetRoom(RoomId)).GetFullStateAsync();
+ var response = (hs.GetRoom(RoomId)).GetFullStateAsync();
await foreach (var _ev in response) {
Events.Add(_ev);
if (string.IsNullOrEmpty(_ev.StateKey)) {
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
index 2c95c99..68125cb 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
@@ -1,9 +1,10 @@
@page "/Rooms/{RoomId}/Timeline"
@using MatrixRoomUtils.Web.Shared.TimelineComponents
@using LibMatrix
+@using LibMatrix.EventTypes.Spec
+@using LibMatrix.EventTypes.Spec.State
@using LibMatrix.Homeservers
@using LibMatrix.Responses
-@using LibMatrix.StateEventTypes.Spec
<h3>RoomManagerTimeline</h3>
<hr/>
<p>Loaded @Events.Count events...</p>
@@ -30,7 +31,7 @@
Console.WriteLine("RoomId: " + RoomId);
HomeServer = await MRUStorage.GetCurrentSessionOrNavigate();
if (HomeServer is null) return;
- var room = await HomeServer.GetRoom(RoomId);
+ var room = HomeServer.GetRoom(RoomId);
MessagesResponse? msgs = null;
do {
msgs = await room.GetMessagesAsync(limit: 1000, from: msgs?.End, dir: "b");
|
