diff --git a/MxApiExtensions/Controllers/ClientVersionsController.cs b/MxApiExtensions/Controllers/ClientVersionsController.cs
index 60a3364..518b954 100644
--- a/MxApiExtensions/Controllers/ClientVersionsController.cs
+++ b/MxApiExtensions/Controllers/ClientVersionsController.cs
@@ -19,7 +19,7 @@ public class ClientVersionsController : ControllerBase {
[HttpGet("/_matrix/client/versions")]
public async Task<ClientVersionsResponse> Proxy([FromQuery] string? access_token, string? _) {
- var clientVersions = new ClientVersionsResponse() {
+ var clientVersions = new ClientVersionsResponse {
Versions = new() {
"r0.0.1",
"r0.1.0",
diff --git a/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs b/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs
index 3c4161d..912d1da 100644
--- a/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs
+++ b/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs
@@ -2,10 +2,10 @@ using System.Collections.Concurrent;
using System.Net.Http.Headers;
using ArcaneLibs.Extensions;
using LibMatrix.Homeservers;
-using LibMatrix.MxApiExtensions;
using LibMatrix.RoomTypes;
using LibMatrix.StateEventTypes.Spec;
using Microsoft.AspNetCore.Mvc;
+using MxApiExtensions.Classes.LibMatrix;
using MxApiExtensions.Services;
namespace MxApiExtensions.Controllers.Extensions;
@@ -82,8 +82,6 @@ public class JoinedRoomListController : ControllerBase {
}
}
- private SemaphoreSlim _roomInfoSemaphore = new(100, 100);
-
private async Task<RoomInfoEntry> GetRoomInfo(AuthenticatedHomeserverGeneric hs, string roomId) {
_logger.LogInformation("Getting room info for {room} for {user} ({hs})", roomId, hs.UserId, hs.FullHomeServerDomain);
var room = await hs.GetRoom(roomId);
@@ -101,8 +99,8 @@ public class JoinedRoomListController : ControllerBase {
result.StateCount++;
if (@event.Type != "m.room.member") result.RoomState.Add(@event);
else {
- if(!result.MemberCounts.ContainsKey((@event.TypedContent as RoomMemberEventData)?.Membership)) result.MemberCounts.Add((@event.TypedContent as RoomMemberEventData)?.Membership, 0);
- result.MemberCounts[(@event.TypedContent as RoomMemberEventData)?.Membership]++;
+ if(!result.MemberCounts.ContainsKey((@event.TypedContent as RoomMemberEventContent)?.Membership)) result.MemberCounts.Add((@event.TypedContent as RoomMemberEventContent)?.Membership, 0);
+ result.MemberCounts[(@event.TypedContent as RoomMemberEventContent)?.Membership]++;
}
}
diff --git a/MxApiExtensions/Controllers/Extensions/ProxyConfigurationController.cs b/MxApiExtensions/Controllers/Extensions/ProxyConfigurationController.cs
index 71bf167..0dcc3bb 100644
--- a/MxApiExtensions/Controllers/Extensions/ProxyConfigurationController.cs
+++ b/MxApiExtensions/Controllers/Extensions/ProxyConfigurationController.cs
@@ -1,6 +1,6 @@
using System.Collections.Concurrent;
-using LibMatrix.MxApiExtensions;
using Microsoft.AspNetCore.Mvc;
+using MxApiExtensions.Classes.LibMatrix;
using MxApiExtensions.Services;
namespace MxApiExtensions.Controllers.Extensions;
diff --git a/MxApiExtensions/Controllers/GenericProxyController.cs b/MxApiExtensions/Controllers/GenericProxyController.cs
index 4e27b4a..3481914 100644
--- a/MxApiExtensions/Controllers/GenericProxyController.cs
+++ b/MxApiExtensions/Controllers/GenericProxyController.cs
@@ -1,5 +1,6 @@
using System.Net.Http.Headers;
using Microsoft.AspNetCore.Mvc;
+using MxApiExtensions.Classes.LibMatrix;
using MxApiExtensions.Services;
namespace MxApiExtensions.Controllers;
diff --git a/MxApiExtensions/Controllers/LoginController.cs b/MxApiExtensions/Controllers/LoginController.cs
index 1a7970a..1ad3247 100644
--- a/MxApiExtensions/Controllers/LoginController.cs
+++ b/MxApiExtensions/Controllers/LoginController.cs
@@ -4,6 +4,7 @@ using LibMatrix.Extensions;
using LibMatrix.Responses;
using LibMatrix.Services;
using Microsoft.AspNetCore.Mvc;
+using MxApiExtensions.Classes.LibMatrix;
using MxApiExtensions.Services;
namespace MxApiExtensions.Controllers;
@@ -31,7 +32,7 @@ public class LoginController : ControllerBase {
Response.StatusCode = (int)StatusCodes.Status403Forbidden;
Response.ContentType = "application/json";
await Response.StartAsync();
- await Response.WriteAsync(new MxApiMatrixException() {
+ await Response.WriteAsync(new MxApiMatrixException {
ErrorCode = "M_FORBIDDEN",
Error = "[MxApiExtensions] Invalid username, must be of the form @user#domain:" + Request.Host.Value
}.GetAsJson() ?? "");
diff --git a/MxApiExtensions/Controllers/SyncController.cs b/MxApiExtensions/Controllers/SyncController.cs
index 382d670..2bc47c1 100644
--- a/MxApiExtensions/Controllers/SyncController.cs
+++ b/MxApiExtensions/Controllers/SyncController.cs
@@ -12,6 +12,7 @@ using LibMatrix.RoomTypes;
using LibMatrix.StateEventTypes.Spec;
using Microsoft.AspNetCore.Mvc;
using MxApiExtensions.Classes;
+using MxApiExtensions.Classes.LibMatrix;
using MxApiExtensions.Extensions;
using MxApiExtensions.Services;
@@ -201,7 +202,7 @@ public class SyncController : ControllerBase {
Join = new() {
{
room.RoomId,
- new SyncResult.RoomsDataStructure.JoinedRoomDataStructure() {
+ new SyncResult.RoomsDataStructure.JoinedRoomDataStructure {
AccountData = new() {
Events = new()
},
@@ -246,7 +247,7 @@ public class SyncController : ControllerBase {
.Where(x =>
x.Type == "m.room.member"
&& x.StateKey != syncState.Homeserver.WhoAmI.UserId
- && (x.TypedContent as RoomMemberEventData).Membership == "join"
+ && (x.TypedContent as RoomMemberEventContent).Membership == "join"
)
.Select(x => x.StateKey));
joinRoom.Summary.JoinedMemberCount = joinRoom.Summary.Heroes.Count;
@@ -256,8 +257,8 @@ public class SyncController : ControllerBase {
}
private async Task<StateEventResponse> GetStatusMessage(SyncState syncState, string message) {
- return new StateEventResponse() {
- TypedContent = new PresenceStateEventData() {
+ return new StateEventResponse {
+ TypedContent = new PresenceEventContent {
DisplayName = "MxApiExtensions",
Presence = "online",
StatusMessage = message,
|
