summary refs log tree commit diff
path: root/MxApiExtensions
diff options
context:
space:
mode:
Diffstat (limited to 'MxApiExtensions')
-rw-r--r--MxApiExtensions/Classes/MxApiExtensionsUserConfiguration.cs1
-rw-r--r--MxApiExtensions/Classes/SyncState.cs2
-rw-r--r--MxApiExtensions/Controllers/Client/ClientVersionsController.cs1
-rw-r--r--MxApiExtensions/Controllers/Client/LoginController.cs2
-rw-r--r--MxApiExtensions/Controllers/Client/Room/RoomsSendMessageController.cs11
-rw-r--r--MxApiExtensions/Controllers/Client/SyncController.cs10
-rw-r--r--MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs2
-rw-r--r--MxApiExtensions/Controllers/Other/MediaProxyController.cs1
-rw-r--r--MxApiExtensions/MxApiExtensions.csproj6
-rw-r--r--MxApiExtensions/Program.cs2
-rw-r--r--MxApiExtensions/Services/AuthenticationService.cs2
11 files changed, 7 insertions, 33 deletions
diff --git a/MxApiExtensions/Classes/MxApiExtensionsUserConfiguration.cs b/MxApiExtensions/Classes/MxApiExtensionsUserConfiguration.cs

index 895c5eb..bf2d171 100644 --- a/MxApiExtensions/Classes/MxApiExtensionsUserConfiguration.cs +++ b/MxApiExtensions/Classes/MxApiExtensionsUserConfiguration.cs
@@ -1,5 +1,4 @@ using LibMatrix.EventTypes; -using LibMatrix.Interfaces; namespace MxApiExtensions.Classes; diff --git a/MxApiExtensions/Classes/SyncState.cs b/MxApiExtensions/Classes/SyncState.cs
index 70147d8..153ae1c 100644 --- a/MxApiExtensions/Classes/SyncState.cs +++ b/MxApiExtensions/Classes/SyncState.cs
@@ -2,8 +2,6 @@ using System.Collections.Concurrent; using System.Text.Json.Serialization; using LibMatrix; using LibMatrix.EventTypes.Spec.Ephemeral; -using LibMatrix.EventTypes.Spec.State; -using LibMatrix.Helpers; using LibMatrix.Homeservers; using LibMatrix.Responses; using Microsoft.OpenApi.Extensions; diff --git a/MxApiExtensions/Controllers/Client/ClientVersionsController.cs b/MxApiExtensions/Controllers/Client/ClientVersionsController.cs
index d29e3b2..1a22b5e 100644 --- a/MxApiExtensions/Controllers/Client/ClientVersionsController.cs +++ b/MxApiExtensions/Controllers/Client/ClientVersionsController.cs
@@ -1,4 +1,3 @@ -using System.Net.Http.Headers; using LibMatrix.Responses; using Microsoft.AspNetCore.Mvc; using MxApiExtensions.Services; diff --git a/MxApiExtensions/Controllers/Client/LoginController.cs b/MxApiExtensions/Controllers/Client/LoginController.cs
index bf44af1..1a8ed86 100644 --- a/MxApiExtensions/Controllers/Client/LoginController.cs +++ b/MxApiExtensions/Controllers/Client/LoginController.cs
@@ -1,6 +1,4 @@ -using System.Net.Http.Headers; using ArcaneLibs.Extensions; -using LibMatrix; using LibMatrix.Extensions; using LibMatrix.Responses; using LibMatrix.Services; diff --git a/MxApiExtensions/Controllers/Client/Room/RoomsSendMessageController.cs b/MxApiExtensions/Controllers/Client/Room/RoomsSendMessageController.cs
index 369e7cc..c79f504 100644 --- a/MxApiExtensions/Controllers/Client/Room/RoomsSendMessageController.cs +++ b/MxApiExtensions/Controllers/Client/Room/RoomsSendMessageController.cs
@@ -1,18 +1,9 @@ -using System.Buffers.Text; -using System.Net.Http.Headers; using System.Text.Json; using System.Text.Json.Nodes; -using ArcaneLibs.Extensions; using LibMatrix; using LibMatrix.EventTypes.Spec; -using LibMatrix.Extensions; using LibMatrix.Helpers; -using LibMatrix.Homeservers; -using LibMatrix.Responses; -using LibMatrix.Services; using Microsoft.AspNetCore.Mvc; -using MxApiExtensions.Classes; -using MxApiExtensions.Classes.LibMatrix; using MxApiExtensions.Extensions; using MxApiExtensions.Services; @@ -62,7 +53,7 @@ public class RoomsSendMessageController(ILogger<LoginController> logger, UserCon TypedContent = MessageFormatter.FormatSuccess("Thinking..."), OriginServerTs = DateTimeOffset.Now.ToUnixTimeMilliseconds(), Unsigned = new() { - Age = 1 + ["age"] = 1 }, RoomId = roomId, EventId = "$" + string.Join("", Random.Shared.GetItems("abcdefghijklmnopqrstuvwxyzABCDEFGHIJLKMNOPQRSTUVWXYZ0123456789".ToCharArray(), 100)) diff --git a/MxApiExtensions/Controllers/Client/SyncController.cs b/MxApiExtensions/Controllers/Client/SyncController.cs
index 6568d7e..4a4e97c 100644 --- a/MxApiExtensions/Controllers/Client/SyncController.cs +++ b/MxApiExtensions/Controllers/Client/SyncController.cs
@@ -1,21 +1,16 @@ -using System.Collections.Concurrent; using System.Diagnostics; using System.Text.Json; using System.Text.Json.Nodes; using System.Text.Json.Serialization; using System.Web; -using System.Xml; using ArcaneLibs; using LibMatrix; using LibMatrix.EventTypes.Spec.State; -using LibMatrix.Helpers; -using LibMatrix.Homeservers; +using LibMatrix.EventTypes.Spec.State.RoomInfo; using LibMatrix.Responses; using LibMatrix.RoomTypes; using Microsoft.AspNetCore.Mvc; using MxApiExtensions.Classes; -using MxApiExtensions.Classes.LibMatrix; -using MxApiExtensions.Extensions; using MxApiExtensions.Services; namespace MxApiExtensions.Controllers; @@ -222,7 +217,6 @@ public class SyncController(ILogger<SyncController> logger, MxApiExtensionsConfi if (dmRooms.Contains(x.RoomId)) return -1; var parts = x.RoomId.Split(':'); if (parts[1] == ownHs) return 200; - if (HomeserverWeightEstimation.EstimatedSize.ContainsKey(parts[1])) return HomeserverWeightEstimation.EstimatedSize[parts[1]] + parts[0].Length; return 5000; }).ToList(); @@ -246,7 +240,7 @@ public class SyncController(ILogger<SyncController> logger, MxApiExtensionsConfi // await _roomDataSemaphore.WaitAsync(); //get the room's state var roomState = room.GetFullStateAsync(); - //get the room's timeline, reversed + //get the room's timeline, reversed var timeline = await room.GetMessagesAsync(limit: 100, dir: "b"); timeline.Chunk.Reverse(); //queue up this data as a sync response diff --git a/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs b/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs
index 07420d7..6c07c4c 100644 --- a/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs +++ b/MxApiExtensions/Controllers/Extensions/JoinedRoomListController.cs
@@ -1,7 +1,7 @@ using System.Collections.Concurrent; -using System.Net.Http.Headers; using ArcaneLibs.Extensions; using LibMatrix.EventTypes.Spec.State; +using LibMatrix.EventTypes.Spec.State.RoomInfo; using LibMatrix.Homeservers; using LibMatrix.RoomTypes; using Microsoft.AspNetCore.Mvc; diff --git a/MxApiExtensions/Controllers/Other/MediaProxyController.cs b/MxApiExtensions/Controllers/Other/MediaProxyController.cs
index 7dea73b..30852ae 100644 --- a/MxApiExtensions/Controllers/Other/MediaProxyController.cs +++ b/MxApiExtensions/Controllers/Other/MediaProxyController.cs
@@ -1,4 +1,3 @@ -using System.Net.Http.Headers; using LibMatrix.Homeservers; using LibMatrix.Services; using Microsoft.AspNetCore.Mvc; diff --git a/MxApiExtensions/MxApiExtensions.csproj b/MxApiExtensions/MxApiExtensions.csproj
index a7c1d40..fdc8261 100644 --- a/MxApiExtensions/MxApiExtensions.csproj +++ b/MxApiExtensions/MxApiExtensions.csproj
@@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <TargetFramework>net8.0</TargetFramework> + <TargetFramework>net9.0</TargetFramework> <Nullable>enable</Nullable> <ImplicitUsings>enable</ImplicitUsings> <InvariantGlobalization>true</InvariantGlobalization> @@ -10,8 +10,8 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="8.0.6" /> - <PackageReference Include="Swashbuckle.AspNetCore" Version="6.6.2" /> + <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="9.0.1" /> + <PackageReference Include="Swashbuckle.AspNetCore" Version="7.2.0" /> </ItemGroup> <ItemGroup> diff --git a/MxApiExtensions/Program.cs b/MxApiExtensions/Program.cs
index b44129e..18393ac 100644 --- a/MxApiExtensions/Program.cs +++ b/MxApiExtensions/Program.cs
@@ -3,10 +3,8 @@ using LibMatrix; using LibMatrix.Services; using Microsoft.AspNetCore.Diagnostics; using Microsoft.AspNetCore.Http.Timeouts; -using Microsoft.Extensions.Logging.Console; using Microsoft.OpenApi.Models; using MxApiExtensions; -using MxApiExtensions.Classes; using MxApiExtensions.Classes.LibMatrix; using MxApiExtensions.Services; diff --git a/MxApiExtensions/Services/AuthenticationService.cs b/MxApiExtensions/Services/AuthenticationService.cs
index 6a45214..7918531 100644 --- a/MxApiExtensions/Services/AuthenticationService.cs +++ b/MxApiExtensions/Services/AuthenticationService.cs
@@ -1,5 +1,3 @@ -using ArcaneLibs.Extensions; -using LibMatrix; using LibMatrix.Services; using MxApiExtensions.Classes.LibMatrix;