From 3737b395b9bd510d6a44622bc21d99a7e5ae605d Mon Sep 17 00:00:00 2001
From: Rory& <root@rory.gay>
Date: Fri, 24 Jan 2025 00:07:44 +0100
Subject: LibMatrix changes

---
 MatrixUtils.Web/Shared/InlineUserItem.razor                            | 3 ++-
 MatrixUtils.Web/Shared/MainLayout.razor                                | 3 +--
 MatrixUtils.Web/Shared/MxcAvatar.razor                                 | 3 ---
 MatrixUtils.Web/Shared/RoomListComponents/RoomListCategory.razor       | 2 +-
 MatrixUtils.Web/Shared/RoomListComponents/RoomListSpace.razor          | 2 +-
 MatrixUtils.Web/Shared/RoomListItem.razor                              | 3 ++-
 MatrixUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor       | 1 +
 .../Shared/TimelineComponents/TimelineCanonicalAliasItem.razor         | 2 +-
 .../Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor      | 1 +
 MatrixUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor     | 1 +
 MatrixUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor    | 1 +
 MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor | 2 +-
 MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor   | 1 +
 MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor  | 1 +
 MatrixUtils.Web/Shared/UserListItem.razor                              | 2 +-
 15 files changed, 16 insertions(+), 12 deletions(-)

(limited to 'MatrixUtils.Web/Shared')

diff --git a/MatrixUtils.Web/Shared/InlineUserItem.razor b/MatrixUtils.Web/Shared/InlineUserItem.razor
index c7f16f0..5b6d42f 100644
--- a/MatrixUtils.Web/Shared/InlineUserItem.razor
+++ b/MatrixUtils.Web/Shared/InlineUserItem.razor
@@ -1,4 +1,5 @@
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @using LibMatrix.Responses
 <div style="background-color: #ffffff11; border-radius: 0.5em; height: 1em; display: inline-block; vertical-align: middle;" alt="@UserId">
     <img style="@(ChildContent is not null ? "vertical-align: baseline;" : "vertical-align: top;") width: 1em; height: 1em; border-radius: 50%;" src="@ProfileAvatar"/>
@@ -39,7 +40,7 @@
 
     protected override async Task OnInitializedAsync() {
         await base.OnInitializedAsync();
-        Homeserver ??= await RMUStorage.GetCurrentSessionOrNavigate();
+        Homeserver ??= await RmuStorage.GetCurrentSessionOrNavigate();
         if(Homeserver is null) return;
 
         await _semaphoreSlim.WaitAsync();
diff --git a/MatrixUtils.Web/Shared/MainLayout.razor b/MatrixUtils.Web/Shared/MainLayout.razor
index c67f73c..f32c19e 100644
--- a/MatrixUtils.Web/Shared/MainLayout.razor
+++ b/MatrixUtils.Web/Shared/MainLayout.razor
@@ -1,5 +1,4 @@
-@using ArcaneLibs
-@inherits LayoutComponentBase
+@inherits LayoutComponentBase
 
 <div class="page">
     <div class="sidebar">
diff --git a/MatrixUtils.Web/Shared/MxcAvatar.razor b/MatrixUtils.Web/Shared/MxcAvatar.razor
index 09ea790..02aff72 100644
--- a/MatrixUtils.Web/Shared/MxcAvatar.razor
+++ b/MatrixUtils.Web/Shared/MxcAvatar.razor
@@ -1,6 +1,3 @@
-@using System.Security
-@using System.Security.Cryptography
-@using Blazored.SessionStorage.JsonConverters
 <StreamedImage Stream="@_stream" style="@StyleString"/>
 
 @code {
diff --git a/MatrixUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
index 1f5ce89..555b1f1 100644
--- a/MatrixUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
+++ b/MatrixUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
@@ -1,5 +1,5 @@
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @using MatrixUtils.Web.Classes.Constants
-@using LibMatrix.EventTypes.Spec.State
 @using LibMatrix.Responses
 @using MatrixUtils.Abstractions
 <details open>
diff --git a/MatrixUtils.Web/Shared/RoomListComponents/RoomListSpace.razor b/MatrixUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
index 6954990..11f9040 100644
--- a/MatrixUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
+++ b/MatrixUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
@@ -42,7 +42,7 @@
         if (Breadcrumbs == null) throw new ArgumentNullException(nameof(Breadcrumbs));
         await Task.Delay(Random.Shared.Next(1000, 10000));
         var rooms = Space.Room.AsSpace.GetChildrenAsync();
-        var hs = await RMUStorage.GetCurrentSessionOrNavigate();
+        var hs = await RmuStorage.GetCurrentSessionOrNavigate();
         var joinedRooms = await hs.GetJoinedRooms();
         await foreach (var room in rooms) {
             if (Breadcrumbs.Contains(room.RoomId)) continue;
diff --git a/MatrixUtils.Web/Shared/RoomListItem.razor b/MatrixUtils.Web/Shared/RoomListItem.razor
index 248cb59..1875f1d 100644
--- a/MatrixUtils.Web/Shared/RoomListItem.razor
+++ b/MatrixUtils.Web/Shared/RoomListItem.razor
@@ -1,5 +1,6 @@
 @using LibMatrix
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @using LibMatrix.Responses
 @using MatrixUtils.Abstractions
 @using MatrixUtils.Web.Classes.Constants
@@ -129,7 +130,7 @@ else {
     protected override async Task OnInitializedAsync() {
         await base.OnInitializedAsync();
 
-        // hs ??= await RMUStorage.GetCurrentSessionOrNavigate();
+        // hs ??= await RmuStorage.GetCurrentSessionOrNavigate();
         // if (hs is null) return;
 
         if (Homeserver is null) {
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor
index 08aeffe..80b9ac5 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor
@@ -1,5 +1,6 @@
 @using LibMatrix
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @using LibMatrix.Responses
 <h3>BaseTimelineItem</h3>
 
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor
index 0488e36..d1984dd 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineCanonicalAliasItem.razor
@@ -1,5 +1,5 @@
 @using ArcaneLibs.Extensions
-@using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @inherits BaseTimelineItem
 
 @if (currentEventContent is not null) {
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor
index bdd6104..74087a5 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineHistoryVisibilityItem.razor
@@ -1,5 +1,6 @@
 @using ArcaneLibs.Extensions
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @inherits BaseTimelineItem
 
 @if (currentEventContent is not null) {
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
index 3b18b95..a5ffe80 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
@@ -1,5 +1,6 @@
 @using ArcaneLibs.Extensions
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @using LibMatrix.Responses
 @inherits BaseTimelineItem
 
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
index 98b5a6d..4459be1 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
@@ -1,5 +1,6 @@
 @using ArcaneLibs.Extensions
 @using LibMatrix.EventTypes.Spec
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @inherits BaseTimelineItem
 
 <span>
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
index f3e6c7e..aeb987a 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
@@ -1,5 +1,5 @@
 @using ArcaneLibs.Extensions
-@using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @inherits BaseTimelineItem
 
 <i>
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor
index 63594a9..57dc77d 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomNameItem.razor
@@ -1,5 +1,6 @@
 @using ArcaneLibs.Extensions
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @inherits BaseTimelineItem
 
 @if (currentEventContent is not null) {
diff --git a/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor b/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor
index f70d563..6779b5d 100644
--- a/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor
+++ b/MatrixUtils.Web/Shared/TimelineComponents/TimelineRoomTopicItem.razor
@@ -1,5 +1,6 @@
 @using ArcaneLibs.Extensions
 @using LibMatrix.EventTypes.Spec.State
+@using LibMatrix.EventTypes.Spec.State.RoomInfo
 @inherits BaseTimelineItem
 
 @if (currentEventContent is not null) {
diff --git a/MatrixUtils.Web/Shared/UserListItem.razor b/MatrixUtils.Web/Shared/UserListItem.razor
index d4652b2..cf7f24d 100644
--- a/MatrixUtils.Web/Shared/UserListItem.razor
+++ b/MatrixUtils.Web/Shared/UserListItem.razor
@@ -28,7 +28,7 @@
     private SvgIdenticonGenerator _identiconGenerator = new();
 
     protected override async Task OnInitializedAsync() {
-        _homeserver = await RMUStorage.GetCurrentSessionOrNavigate();
+        _homeserver = await RmuStorage.GetCurrentSessionOrNavigate();
         if (_homeserver is null) return;
 
         if (User == null) {
-- 
cgit 1.5.1