diff --git a/MatrixRoomUtils.Web/Shared/EditablePre.razor b/MatrixRoomUtils.Web/Shared/EditablePre.razor
index e759015..acb477c 100644
--- a/MatrixRoomUtils.Web/Shared/EditablePre.razor
+++ b/MatrixRoomUtils.Web/Shared/EditablePre.razor
@@ -11,6 +11,9 @@
public object Id { get; set; }
- private async Task Callback() => Console.WriteLine("beep");
+ private Task Callback() {
+ Console.WriteLine("beep");
+ return Task.CompletedTask;
+ }
}
\ No newline at end of file
diff --git a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor
index f3a7162..db66309 100644
--- a/MatrixRoomUtils.Web/Shared/InlineUserItem.razor
+++ b/MatrixRoomUtils.Web/Shared/InlineUserItem.razor
@@ -50,7 +50,7 @@
throw new ArgumentNullException(nameof(UserId));
if (MemberEvent != null) {
- User = new() {
+ User = new ProfileResponseEventData {
AvatarUrl = MemberEvent.AvatarUrl,
DisplayName = MemberEvent.DisplayName
};
diff --git a/MatrixRoomUtils.Web/Shared/ModalWindow.razor b/MatrixRoomUtils.Web/Shared/ModalWindow.razor
index 2f001e1..beb7198 100644
--- a/MatrixRoomUtils.Web/Shared/ModalWindow.razor
+++ b/MatrixRoomUtils.Web/Shared/ModalWindow.razor
@@ -74,13 +74,13 @@
}
private void MouseMove(MouseEventArgs obj) {
- if (isDragging) {
- _x += obj.ClientX - dragX;
- _y += obj.ClientY - dragY;
- dragX = obj.ClientX;
- dragY = obj.ClientY;
- StateHasChanged();
- }
+ if (!isDragging) return;
+
+ _x += obj.ClientX - dragX;
+ _y += obj.ClientY - dragY;
+ dragX = obj.ClientX;
+ dragY = obj.ClientY;
+ StateHasChanged();
}
}
diff --git a/MatrixRoomUtils.Web/Shared/RoomList.razor b/MatrixRoomUtils.Web/Shared/RoomList.razor
index dc06d90..3b057a4 100644
--- a/MatrixRoomUtils.Web/Shared/RoomList.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomList.razor
@@ -51,7 +51,7 @@ else {
await _semaphoreSlim.WaitAsync();
string roomType;
try {
- RoomCreateEventData createEvent = (await room.GetStateEvent("m.room.create")).TypedContent as RoomCreateEventData;
+ var createEvent = (await room.GetStateEvent("m.room.create")).TypedContent as RoomCreateEventData;
roomType = GetRoomTypeName(createEvent.Type);
if (roomType == "Room") {
diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
index c04df3f..381ecd1 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListCategory.razor
@@ -38,13 +38,11 @@
private List<RoomInfo> rooms => Category.Value;
private int RoomVersionDangerLevel(RoomInfo room) {
- var roomVersion = room.StateEvents.FirstOrDefault(x=>x.Type == "m.room.create");
+ var roomVersion = room.StateEvents.FirstOrDefault(x => x.Type == "m.room.create");
if (roomVersion is null) return 0;
- var roomVersionContent = roomVersion.TypedContent as RoomCreateEventData;
- if (roomVersionContent is null) return 0;
- if (RoomConstants.DangerousRoomVersions.Contains(roomVersionContent.RoomVersion)) return 2;
- if (roomVersionContent.RoomVersion != RoomConstants.RecommendedRoomVersion) return 1;
- return 0;
+ return roomVersion.TypedContent is not RoomCreateEventData roomVersionContent ? 0
+ : RoomConstants.DangerousRoomVersions.Contains(roomVersionContent.RoomVersion) ? 2
+ : roomVersionContent.RoomVersion != RoomConstants.RecommendedRoomVersion ? 1 : 0;
}
}
diff --git a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
index a113f0b..0867b48 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListComponents/RoomListSpace.razor
@@ -33,9 +33,9 @@
var rooms = Space.Room.AsSpace.GetRoomsAsync();
await foreach (var room in rooms) {
if (Breadcrumbs.Contains(room.RoomId)) continue;
- RoomInfo roomInfo = KnownRooms.FirstOrDefault(x => x.Room.RoomId == room.RoomId);
+ var roomInfo = KnownRooms.FirstOrDefault(x => x.Room.RoomId == room.RoomId);
if (roomInfo is null) {
- roomInfo = new() {
+ roomInfo = new RoomInfo {
Room = room
};
KnownRooms.Add(roomInfo);
@@ -48,10 +48,11 @@
private bool _shouldRenderChildren = false;
private string? _breadcrumbs;
- private async Task SpaceChildrenOpened() {
- if (_shouldRenderChildren) return;
+ private Task SpaceChildrenOpened() {
+ if (_shouldRenderChildren) return Task.CompletedTask;
_shouldRenderChildren = true;
Console.WriteLine($"[RoomList] Rendering children of {Space.Room.RoomId}");
+ return Task.CompletedTask;
}
}
diff --git a/MatrixRoomUtils.Web/Shared/RoomListItem.razor b/MatrixRoomUtils.Web/Shared/RoomListItem.razor
index 6e3adc6..79844ef 100644
--- a/MatrixRoomUtils.Web/Shared/RoomListItem.razor
+++ b/MatrixRoomUtils.Web/Shared/RoomListItem.razor
@@ -77,7 +77,7 @@
//sweep from id to roominfo
if(RoomId is not null) Room ??= await hs.GetRoom(RoomId);
- if(Room is not null) RoomInfo ??= new RoomInfo() {
+ if(Room is not null) RoomInfo ??= new RoomInfo {
Room = Room
};
diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
index 8239367..d67fdab 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMemberItem.razor
@@ -4,31 +4,31 @@
@inherits BaseTimelineItem
@if (roomMemberData is not null) {
- @if (roomMemberData.Membership == "ban") {
- <i>@Event.StateKey was banned</i>
- }
- else if (roomMemberData.Membership == "invite") {
- <i>@Event.StateKey was invited</i>
- }
- else if (roomMemberData.Membership == "join") {
- @if (Event.ReplacesState is not null) {
+ @switch (roomMemberData.Membership) {
+ case "ban":
+ <i>@Event.StateKey was banned</i>
+ break;
+ case "invite":
+ <i>@Event.StateKey was invited</i>
+ break;
+ case "join" when Event.ReplacesState is not null:
<i>@Event.StateKey changed their display name to @(roomMemberData.Displayname ?? Event.Sender)</i>
- }
- else {
- <i><InlineUserItem User="new ProfileResponseEventData()" HomeServer="HomeServer" UserId="@Event.StateKey"></InlineUserItem> joined</i>
- }
- }
- else if (roomMemberData.Membership == "leave") {
- <i>@Event.StateKey left</i>
- }
- else if (roomMemberData.Membership == "knock") {
- <i>@Event.StateKey knocked</i>
- }
- else {
- <i>@Event.StateKey has an unknown state:</i>
- <pre>
+ break;
+ case "join":
+ <i><InlineUserItem User="@(new ProfileResponseEventData())" HomeServer="@HomeServer" UserId="@Event.StateKey"></InlineUserItem> joined</i>
+ break;
+ case "leave":
+ <i>@Event.StateKey left</i>
+ break;
+ case "knock":
+ <i>@Event.StateKey knocked</i>
+ break;
+ default:
+ <i>@Event.StateKey has an unknown state:</i>
+ <pre>
@Event.ToJson()
</pre>
+ break;
}
}
else {
diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
index 411b750..13cce88 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineMessageItem.razor
@@ -2,7 +2,7 @@
@inherits BaseTimelineItem
<pre>
- @ObjectExtensions.ToJson(Event.RawContent, indent: false)
+ @Event.RawContent?.ToJson(indent: false)
</pre>
@code {
diff --git a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
index b20cc1a..8053a47 100644
--- a/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
+++ b/MatrixRoomUtils.Web/Shared/TimelineComponents/TimelineRoomCreateItem.razor
@@ -8,7 +8,7 @@
This room is of type @(CreationEventContent.Type ?? "Untyped room (usually a chat room)")
</p>
<pre>
- @ObjectExtensions.ToJson(Event.RawContent, indent: false)
+ @Event.RawContent?.ToJson(indent: false)
</pre>
@code {
|
