From aa7026a17ededf7c181ed269c6388491d96e1b1e Mon Sep 17 00:00:00 2001 From: "Emma@Rory&" Date: Mon, 14 Aug 2023 05:07:51 +0200 Subject: Split LibMatrix into submodule --- MatrixRoomUtils.Web/Shared/InlineUserItem.razor | 8 ++++---- MatrixRoomUtils.Web/Shared/ModalWindow.razor | 1 + MatrixRoomUtils.Web/Shared/RoomList.razor | 7 ++++--- .../Shared/RoomListComponents/RoomListCategory.razor | 5 +++-- .../Shared/RoomListComponents/RoomListPolicyRoom.razor | 3 ++- MatrixRoomUtils.Web/Shared/RoomListItem.razor | 9 +++++---- .../Shared/SimpleComponents/DictionaryEditor.razor | 3 ++- .../Shared/TimelineComponents/BaseTimelineItem.razor | 3 ++- .../Shared/TimelineComponents/TimelineMemberItem.razor | 6 +++--- .../Shared/TimelineComponents/TimelineMessageItem.razor | 2 +- .../Shared/TimelineComponents/TimelineRoomCreateItem.razor | 4 ++-- .../Shared/TimelineComponents/TimelineUnknownItem.razor | 1 + MatrixRoomUtils.Web/Shared/UserListItem.razor | 11 +++++------ 13 files changed, 35 insertions(+), 28 deletions(-) (limited to 'MatrixRoomUtils.Web/Shared') diff --git a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor index 25db838..f3a7162 100644 --- a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor +++ b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor @@ -1,7 +1,7 @@ -@using MatrixRoomUtils.Core.Responses -@using MatrixRoomUtils.Core.StateEventTypes -@using MatrixRoomUtils.Core.Helpers -@using MatrixRoomUtils.Core.StateEventTypes.Spec +@using LibMatrix.StateEventTypes +@using LibMatrix.StateEventTypes.Spec +@using LibMatrix +@using LibMatrix.Helpers
@ProfileName diff --git a/MatrixRoomUtils.Web/Shared/ModalWindow.razor b/MatrixRoomUtils.Web/Shared/ModalWindow.razor index b40d246..2f001e1 100644 --- a/MatrixRoomUtils.Web/Shared/ModalWindow.razor +++ b/MatrixRoomUtils.Web/Shared/ModalWindow.razor @@ -1,3 +1,4 @@ +@using LibMatrix.Extensions
@Title diff --git a/MatrixRoomUtils.Web/Shared/RoomList.razor b/MatrixRoomUtils.Web/Shared/RoomList.razor index e3894a6..dc06d90 100644 --- a/MatrixRoomUtils.Web/Shared/RoomList.razor +++ b/MatrixRoomUtils.Web/Shared/RoomList.razor @@ -1,7 +1,8 @@ @using MatrixRoomUtils.Web.Shared.RoomListComponents; -@using MatrixRoomUtils.Core.StateEventTypes -@using MatrixRoomUtils.Core.StateEventTypes.Common -@using MatrixRoomUtils.Core.StateEventTypes.Spec +@using LibMatrix.StateEventTypes +@using LibMatrix.StateEventTypes.Spec +@using LibMatrix +@using LibMatrix.Extensions @if(Rooms.Count != RoomsWithTypes.Sum(x=>x.Value.Count)) {

Fetching room details... @RoomsWithTypes.Sum(x=>x.Value.Count) out of @Rooms.Count done!

@foreach (var category in RoomsWithTypes.OrderBy(x => x.Value.Count)) { diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor index b798d49..c04df3f 100644 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor +++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor @@ -1,6 +1,7 @@ -@using MatrixRoomUtils.Core.StateEventTypes -@using MatrixRoomUtils.Core.StateEventTypes.Spec +@using LibMatrix.StateEventTypes @using MatrixRoomUtils.Web.Classes.Constants +@using LibMatrix.StateEventTypes.Spec +@using LibMatrix
@roomType (@rooms.Count) @foreach (var room in rooms) { diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor index f05ac7b..7afdc8c 100644 --- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor +++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListPolicyRoom.razor @@ -1,3 +1,4 @@ +@using LibMatrix.RoomTypes Manage policies @code { @@ -9,4 +10,4 @@ await base.OnInitializedAsync(); } -} \ No newline at end of file +} diff --git a/MatrixRoomUtils.Web/Shared/RoomListItem.razor b/MatrixRoomUtils.Web/Shared/RoomListItem.razor index e12f622..6e3adc6 100644 --- a/MatrixRoomUtils.Web/Shared/RoomListItem.razor +++ b/MatrixRoomUtils.Web/Shared/RoomListItem.razor @@ -1,8 +1,9 @@ -@using MatrixRoomUtils.Core.Extensions @using System.Text.Json -@using MatrixRoomUtils.Core.Helpers -@using MatrixRoomUtils.Core.StateEventTypes -@using MatrixRoomUtils.Core.StateEventTypes.Spec +@using LibMatrix +@using LibMatrix.Helpers +@using LibMatrix.RoomTypes +@using LibMatrix.StateEventTypes.Spec +@using LibMatrix.StateEventTypes @using MatrixRoomUtils.Web.Classes.Constants
@if (OwnMemberState != null) { diff --git a/MatrixRoomUtils.Web/Shared/SimpleComponents/DictionaryEditor.razor b/MatrixRoomUtils.Web/Shared/SimpleComponents/DictionaryEditor.razor index ea7d2ec..afd1fdc 100644 --- a/MatrixRoomUtils.Web/Shared/SimpleComponents/DictionaryEditor.razor +++ b/MatrixRoomUtils.Web/Shared/SimpleComponents/DictionaryEditor.razor @@ -1,3 +1,4 @@ +@using LibMatrix.Extensions @foreach (var i in Items.Keys) { var key = i; @@ -34,4 +35,4 @@ ItemsChanged.InvokeAsync(); } -} \ No newline at end of file +} diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor index 920a38d..5172fa4 100644 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor +++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/BaseTimelineItem.razor @@ -1,4 +1,5 @@ -@using MatrixRoomUtils.Core.Responses +@using LibMatrix.Responses +@using LibMatrix

BaseTimelineItem

@code { diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor index 44eb06e..8239367 100644 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor +++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor @@ -1,6 +1,6 @@ -@using MatrixRoomUtils.Core.Responses -@using MatrixRoomUtils.Core.StateEventTypes -@using MatrixRoomUtils.Core.StateEventTypes.Spec +@using LibMatrix.StateEventTypes +@using LibMatrix.StateEventTypes.Spec +@using LibMatrix.Extensions @inherits BaseTimelineItem @if (roomMemberData is not null) { diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor index bf0e083..411b750 100644 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor +++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor @@ -1,4 +1,4 @@ -@using MatrixRoomUtils.Core.Responses +@using LibMatrix.Extensions @inherits BaseTimelineItem
diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
index de204a3..b20cc1a 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
@@ -1,5 +1,5 @@
-@using MatrixRoomUtils.Core.Responses
-@using MatrixRoomUtils.Core.StateEventTypes.Spec
+@using LibMatrix.StateEventTypes.Spec
+@using LibMatrix.Extensions
 @inherits BaseTimelineItem
 
 

diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor index d0871c3..8166f8a 100644 --- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor +++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineUnknownItem.razor @@ -1,3 +1,4 @@ +@using LibMatrix.Extensions @inherits BaseTimelineItem

diff --git a/MatrixRoomUtils.Web/Shared/UserListItem.razor b/MatrixRoomUtils.Web/Shared/UserListItem.razor index 20b1c8c..a85a68d 100644 --- a/MatrixRoomUtils.Web/Shared/UserListItem.razor +++ b/MatrixRoomUtils.Web/Shared/UserListItem.razor @@ -1,7 +1,6 @@ -@using MatrixRoomUtils.Core.Responses -@using MatrixRoomUtils.Core.StateEventTypes -@using MatrixRoomUtils.Core.Helpers -@using MatrixRoomUtils.Core.StateEventTypes.Spec +@using LibMatrix.StateEventTypes +@using LibMatrix.StateEventTypes.Spec +@using LibMatrix.Helpers
@profileName @@ -35,7 +34,7 @@ var hs = await MRUStorage.GetCurrentSessionOrNavigate(); if (hs is null) return; - + await _semaphoreSlim.WaitAsync(); if (User == null) { @@ -52,4 +51,4 @@ _semaphoreSlim.Release(); } -} \ No newline at end of file +} -- cgit 1.5.1