diff --git a/MatrixRoomUtils.Web/Pages/DebugTools.razor b/MatrixRoomUtils.Web/Pages/DebugTools.razor
index 5116754..afb1da2 100644
--- a/MatrixRoomUtils.Web/Pages/DebugTools.razor
+++ b/MatrixRoomUtils.Web/Pages/DebugTools.razor
@@ -1,6 +1,7 @@
@page "/Debug"
@using System.Reflection
-@using MatrixRoomUtils.Core.Interfaces
+@using LibMatrix.Extensions
+@using LibMatrix.Interfaces
@inject ILocalStorageService LocalStorage
@inject NavigationManager NavigationManager
<h3>Debug Tools</h3>
@@ -74,4 +75,4 @@ else {
StateHasChanged();
}
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/DevOptions.razor b/MatrixRoomUtils.Web/Pages/DevOptions.razor
index 70dac31..bf499a3 100644
--- a/MatrixRoomUtils.Web/Pages/DevOptions.razor
+++ b/MatrixRoomUtils.Web/Pages/DevOptions.razor
@@ -1,4 +1,5 @@
@page "/DevOptions"
+@using LibMatrix.Extensions
@inject NavigationManager NavigationManager
@inject ILocalStorageService LocalStorage
@@ -26,4 +27,4 @@
await TieredStorage.DataStorageProvider.SaveObjectAsync("mru.settings", settings);
}
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor b/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor
index e3ebc72..b2928ee 100644
--- a/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor
+++ b/MatrixRoomUtils.Web/Pages/HSAdmin/RoomQuery.razor
@@ -1,7 +1,8 @@
@page "/HSAdmin/RoomQuery"
-@using MatrixRoomUtils.Core.Filters
-@using MatrixRoomUtils.Core.Responses.Admin
@using MatrixRoomUtils.Web.Shared.SimpleComponents
+@using LibMatrix.Responses.Admin
+@using LibMatrix.Filters
+@using LibMatrix.Extensions
<h3>Homeserver Administration - Room Query</h3>
@@ -121,7 +122,7 @@
.tile150 {
min-width: 150px;
}
- .range-sep {
+ .range-sep {
display: inline-block;
padding: 4px;
width: 150px;
@@ -193,4 +194,4 @@
{ "state_events", "Number of state events" }
};
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/Index.razor b/MatrixRoomUtils.Web/Pages/Index.razor
index 01e2be4..65ba68b 100644
--- a/MatrixRoomUtils.Web/Pages/Index.razor
+++ b/MatrixRoomUtils.Web/Pages/Index.razor
@@ -1,7 +1,8 @@
@page "/"
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.Responses
@using MatrixRoomUtils.Web.Shared.SimpleComponents
+@using LibMatrix.Responses
+@using LibMatrix
+@using LibMatrix.Helpers
<PageTitle>Index</PageTitle>
diff --git a/MatrixRoomUtils.Web/Pages/InvalidSession.razor b/MatrixRoomUtils.Web/Pages/InvalidSession.razor
index 3bcd797..2b030ce 100644
--- a/MatrixRoomUtils.Web/Pages/InvalidSession.razor
+++ b/MatrixRoomUtils.Web/Pages/InvalidSession.razor
@@ -1,7 +1,7 @@
@page "/InvalidSession"
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.Responses
@using MatrixRoomUtils.Web.Shared.SimpleComponents
+@using LibMatrix.Responses
+@using LibMatrix
<PageTitle>Invalid session</PageTitle>
diff --git a/MatrixRoomUtils.Web/Pages/KnownHomeserverList.razor b/MatrixRoomUtils.Web/Pages/KnownHomeserverList.razor
index 5ccecab..10a2929 100644
--- a/MatrixRoomUtils.Web/Pages/KnownHomeserverList.razor
+++ b/MatrixRoomUtils.Web/Pages/KnownHomeserverList.razor
@@ -1,8 +1,10 @@
@page "/KnownHomeserverList"
@using System.Text.Json
@using System.Diagnostics
-@using MatrixRoomUtils.Core.Responses
-@using MatrixRoomUtils.Core.StateEventTypes
+@using LibMatrix
+@using LibMatrix.Extensions
+@using LibMatrix.RoomTypes
+@using LibMatrix.StateEventTypes
<h3>Known Homeserver List</h3>
<hr/>
@@ -62,7 +64,7 @@ else {
private async Task<List<HomeServerInfo>> GetHomeservers(int memberLimit = 1000, Func<HomeServerInfoQueryProgress, Task<bool>>? progressCallback = null) {
HomeServerInfoQueryProgress progress = new();
List<HomeServerInfo> homeServers = new();
-
+
var rooms = await hs.GetJoinedRooms();
progress.TotalRooms = rooms.Count;
@@ -168,4 +170,4 @@ else {
}
}
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/LoginPage.razor b/MatrixRoomUtils.Web/Pages/LoginPage.razor
index e19dd04..9730cbe 100644
--- a/MatrixRoomUtils.Web/Pages/LoginPage.razor
+++ b/MatrixRoomUtils.Web/Pages/LoginPage.razor
@@ -1,6 +1,6 @@
@page "/Login"
@using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Responses
@using MatrixRoomUtils.Web.Shared.SimpleComponents
@inject ILocalStorageService LocalStorage
@inject IJSRuntime JsRuntime
@@ -49,7 +49,7 @@
(string homeserver, string username, string password) newRecordInput = ("", "", "");
List<LoginResponse> LoggedInSessions { get; set; } = new();
-
+
async Task Login() {
var loginTasks = records.Select(async record => {
var (homeserver, username, password) = record;
@@ -97,4 +97,4 @@
newRecordInput = ("", "", "");
}
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/MediaLocator.razor b/MatrixRoomUtils.Web/Pages/MediaLocator.razor
index 6221041..8c41440 100644
--- a/MatrixRoomUtils.Web/Pages/MediaLocator.razor
+++ b/MatrixRoomUtils.Web/Pages/MediaLocator.razor
@@ -1,4 +1,5 @@
@page "/MediaLocator"
+@using LibMatrix
@inject HttpClient Http
<h3>Media locator</h3>
<hr/>
@@ -106,4 +107,4 @@
StateHasChanged();
}
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
index 3a98801..ebf6444 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Create.razor
@@ -1,10 +1,12 @@
@page "/Rooms/Create"
-@using MatrixRoomUtils.Core.Responses
@using System.Text.Json
@using System.Reflection
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.StateEventTypes
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix
+@using LibMatrix.Extensions
+@using LibMatrix.Helpers
+@using LibMatrix.Responses
+@using LibMatrix.StateEventTypes.Spec
+@using LibMatrix.StateEventTypes
@using MatrixRoomUtils.Web.Classes.RoomCreationTemplates
@* @* ReSharper disable once RedundantUsingDirective - Must not remove this, Rider marks this as "unused" when it's not */ *@
@using MatrixRoomUtils.Web.Shared.SimpleComponents
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
index 6d12dc2..89ededf 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Index.razor
@@ -1,9 +1,9 @@
@page "/Rooms"
-@using MatrixRoomUtils.Core.StateEventTypes
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
-@using MatrixRoomUtils.Core.Filters
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.StateEventTypes
+@using LibMatrix.StateEventTypes.Spec
+@using LibMatrix.Filters
+@using LibMatrix.Helpers
+@using LibMatrix.Responses
<h3>Room list</h3>
<p>@Status</p>
@if (RenderContents) {
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
index cd4788b..3297bcb 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/PolicyList.razor
@@ -1,9 +1,11 @@
@page "/Rooms/{RoomId}/Policies"
-@using MatrixRoomUtils.Core.StateEventTypes
+@using LibMatrix.StateEventTypes
@using System.Text.Json
-@using MatrixRoomUtils.Core.Helpers
-@using MatrixRoomUtils.Core.Responses
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix
+@using LibMatrix.Extensions
+@using LibMatrix.Helpers
+@using LibMatrix.Responses
+@using LibMatrix.StateEventTypes.Spec
<h3>Policy list editor - Editing @RoomId</h3>
<hr/>
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
index 91f97d0..15c7c70 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Space.razor
@@ -1,6 +1,8 @@
@page "/Rooms/{RoomId}/Space"
@using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Extensions
+@using LibMatrix.Responses
+@using LibMatrix.RoomTypes
<h3>Room manager - Viewing Space</h3>
<button onclick="@JoinAllRooms">Join all rooms</button>
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
index 8b2ff0c..e01fca8 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/StateEditor.razor
@@ -1,7 +1,8 @@
@page "/Rooms/{RoomId}/State/Edit"
@using System.Net.Http.Headers
@using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Extensions
+@using LibMatrix.Responses
@inject ILocalStorageService LocalStorage
@inject NavigationManager NavigationManager
<h3>Room state editor - Editing @RoomId</h3>
@@ -142,4 +143,4 @@
}
private string shownEventJson { get; set; }
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
index 09b38f0..cf23c36 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/StateViewer.razor
@@ -1,7 +1,8 @@
@page "/Rooms/{RoomId}/State/View"
@using System.Net.Http.Headers
@using System.Text.Json
-@using MatrixRoomUtils.Core.Responses
+@using LibMatrix.Extensions
+@using LibMatrix.Responses
@inject ILocalStorageService LocalStorage
@inject NavigationManager NavigationManager
<h3>Room state viewer - Viewing @RoomId</h3>
@@ -125,4 +126,4 @@
}
private bool _showMembershipEvents;
-}
\ No newline at end of file
+}
diff --git a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
index 2234dd9..7fe89cc 100644
--- a/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
+++ b/MatrixRoomUtils.Web/Pages/Rooms/Timeline.razor
@@ -1,7 +1,8 @@
@page "/Rooms/{RoomId}/Timeline"
@using MatrixRoomUtils.Web.Shared.TimelineComponents
-@using MatrixRoomUtils.Core.Responses
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix
+@using LibMatrix.Responses
+@using LibMatrix.StateEventTypes.Spec
<h3>RoomManagerTimeline</h3>
<hr/>
<p>Loaded @Events.Count events...</p>
|
