From ef8866647598751904df1ec18045338bc615593d Mon Sep 17 00:00:00 2001 From: Rory& Date: Sun, 15 Dec 2024 00:22:20 +0100 Subject: Some cleanup --- .gitignore | 1 + .idea/.idea.MatrixRoomUtils/.idea/.gitignore | 13 ----- .idea/.idea.MatrixRoomUtils/.idea/.name | 1 - .idea/.idea.MatrixRoomUtils/.idea/avalonia.xml | 19 ------- .../.idea/codeStyles/codeStyleConfig.xml | 5 -- .idea/.idea.MatrixRoomUtils/.idea/encodings.xml | 4 -- .idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml | 11 ---- .../.idea/inspectionProfiles/Project_Default.xml | 22 -------- .idea/.idea.MatrixRoomUtils/.idea/vcs.xml | 6 --- .idea/.idea.MatrixUtils/.idea/.gitignore | 13 +++++ .idea/.idea.MatrixUtils/.idea/.name | 1 + .idea/.idea.MatrixUtils/.idea/avalonia.xml | 19 +++++++ .../.idea/codeStyles/codeStyleConfig.xml | 5 ++ .idea/.idea.MatrixUtils/.idea/encodings.xml | 4 ++ .idea/.idea.MatrixUtils/.idea/indexLayout.xml | 11 ++++ .../.idea/inspectionProfiles/Project_Default.xml | 22 ++++++++ .idea/.idea.MatrixUtils/.idea/vcs.xml | 6 +++ LibMatrix | 2 +- .../MatrixUtils.Abstractions.csproj | 4 -- .../MatrixUtils.LibDMSpace.csproj | 4 -- MatrixUtils.Web/MatrixUtils.Web.csproj | 63 ++++++++-------------- MatrixUtils.sln | 28 +--------- 22 files changed, 106 insertions(+), 158 deletions(-) delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/.gitignore delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/.name delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/avalonia.xml delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/codeStyles/codeStyleConfig.xml delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/encodings.xml delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/inspectionProfiles/Project_Default.xml delete mode 100644 .idea/.idea.MatrixRoomUtils/.idea/vcs.xml create mode 100644 .idea/.idea.MatrixUtils/.idea/.gitignore create mode 100644 .idea/.idea.MatrixUtils/.idea/.name create mode 100644 .idea/.idea.MatrixUtils/.idea/avalonia.xml create mode 100644 .idea/.idea.MatrixUtils/.idea/codeStyles/codeStyleConfig.xml create mode 100644 .idea/.idea.MatrixUtils/.idea/encodings.xml create mode 100644 .idea/.idea.MatrixUtils/.idea/indexLayout.xml create mode 100644 .idea/.idea.MatrixUtils/.idea/inspectionProfiles/Project_Default.xml create mode 100644 .idea/.idea.MatrixUtils/.idea/vcs.xml diff --git a/.gitignore b/.gitignore index 984ec54..67e71e8 100644 --- a/.gitignore +++ b/.gitignore @@ -10,6 +10,7 @@ MatrixRoomUtils.Bot/bot_data/ appsettings.Local*.json nixpkgs/ *.DotSettings.user +**/.DS_Store *.patch test.tsv diff --git a/.idea/.idea.MatrixRoomUtils/.idea/.gitignore b/.idea/.idea.MatrixRoomUtils/.idea/.gitignore deleted file mode 100644 index f938d5a..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/.gitignore +++ /dev/null @@ -1,13 +0,0 @@ -# Default ignored files -/shelf/ -/workspace.xml -# Rider ignored files -/projectSettingsUpdater.xml -/contentModel.xml -/modules.xml -/.idea.MatrixRoomUtils.iml -# Editor-based HTTP Client requests -/httpRequests/ -# Datasource local storage ignored files -/dataSources/ -/dataSources.local.xml diff --git a/.idea/.idea.MatrixRoomUtils/.idea/.name b/.idea/.idea.MatrixRoomUtils/.idea/.name deleted file mode 100644 index 58beadf..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/.name +++ /dev/null @@ -1 +0,0 @@ -MatrixRoomUtils \ No newline at end of file diff --git a/.idea/.idea.MatrixRoomUtils/.idea/avalonia.xml b/.idea/.idea.MatrixRoomUtils/.idea/avalonia.xml deleted file mode 100644 index 0aa65bb..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/avalonia.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.MatrixRoomUtils/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.MatrixRoomUtils/.idea/codeStyles/codeStyleConfig.xml deleted file mode 100644 index a55e7a1..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/codeStyles/codeStyleConfig.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.MatrixRoomUtils/.idea/encodings.xml b/.idea/.idea.MatrixRoomUtils/.idea/encodings.xml deleted file mode 100644 index df87cf9..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml b/.idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml deleted file mode 100644 index 4520708..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/indexLayout.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - MatrixRoomUtils.Bot/bot_data - MatrixRoomUtils.Desktop/bin/Debug/net7.0/mru-desktop - - - - - \ No newline at end of file diff --git a/.idea/.idea.MatrixRoomUtils/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.MatrixRoomUtils/.idea/inspectionProfiles/Project_Default.xml deleted file mode 100644 index 55540ea..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/inspectionProfiles/Project_Default.xml +++ /dev/null @@ -1,22 +0,0 @@ - - - - \ No newline at end of file diff --git a/.idea/.idea.MatrixRoomUtils/.idea/vcs.xml b/.idea/.idea.MatrixRoomUtils/.idea/vcs.xml deleted file mode 100644 index 94a25f7..0000000 --- a/.idea/.idea.MatrixRoomUtils/.idea/vcs.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/.gitignore b/.idea/.idea.MatrixUtils/.idea/.gitignore new file mode 100644 index 0000000..f938d5a --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/.gitignore @@ -0,0 +1,13 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Rider ignored files +/projectSettingsUpdater.xml +/contentModel.xml +/modules.xml +/.idea.MatrixRoomUtils.iml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/.idea.MatrixUtils/.idea/.name b/.idea/.idea.MatrixUtils/.idea/.name new file mode 100644 index 0000000..58beadf --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/.name @@ -0,0 +1 @@ +MatrixRoomUtils \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/avalonia.xml b/.idea/.idea.MatrixUtils/.idea/avalonia.xml new file mode 100644 index 0000000..0aa65bb --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/avalonia.xml @@ -0,0 +1,19 @@ + + + + + + \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/codeStyles/codeStyleConfig.xml b/.idea/.idea.MatrixUtils/.idea/codeStyles/codeStyleConfig.xml new file mode 100644 index 0000000..a55e7a1 --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/codeStyles/codeStyleConfig.xml @@ -0,0 +1,5 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/encodings.xml b/.idea/.idea.MatrixUtils/.idea/encodings.xml new file mode 100644 index 0000000..df87cf9 --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/indexLayout.xml b/.idea/.idea.MatrixUtils/.idea/indexLayout.xml new file mode 100644 index 0000000..4520708 --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/indexLayout.xml @@ -0,0 +1,11 @@ + + + + + MatrixRoomUtils.Bot/bot_data + MatrixRoomUtils.Desktop/bin/Debug/net7.0/mru-desktop + + + + + \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/inspectionProfiles/Project_Default.xml b/.idea/.idea.MatrixUtils/.idea/inspectionProfiles/Project_Default.xml new file mode 100644 index 0000000..55540ea --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/inspectionProfiles/Project_Default.xml @@ -0,0 +1,22 @@ + + + + \ No newline at end of file diff --git a/.idea/.idea.MatrixUtils/.idea/vcs.xml b/.idea/.idea.MatrixUtils/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/.idea.MatrixUtils/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/LibMatrix b/LibMatrix index bb0c005..1f08fe9 160000 --- a/LibMatrix +++ b/LibMatrix @@ -1 +1 @@ -Subproject commit bb0c00531dfacd30ecef1ac4444c2e3281fa36b8 +Subproject commit 1f08fe9d5c917a4cfc3e4d6ba6d372ac78de0336 diff --git a/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj b/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj index 0b8e793..154e3da 100644 --- a/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj +++ b/MatrixUtils.Abstractions/MatrixUtils.Abstractions.csproj @@ -5,8 +5,4 @@ enable enable - - - - diff --git a/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj b/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj index aaee6b6..c3e2ec3 100644 --- a/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj +++ b/MatrixUtils.LibDMSpace/MatrixUtils.LibDMSpace.csproj @@ -8,8 +8,4 @@ preview true - - - - diff --git a/MatrixUtils.Web/MatrixUtils.Web.csproj b/MatrixUtils.Web/MatrixUtils.Web.csproj index 2c4bb64..b0db23c 100644 --- a/MatrixUtils.Web/MatrixUtils.Web.csproj +++ b/MatrixUtils.Web/MatrixUtils.Web.csproj @@ -13,7 +13,7 @@ service-worker-assets.js false full - + false @@ -21,59 +21,38 @@ - - - - - - + + + + + + - - - - - + + - - Always - - - Always - - - Always - + + - + + Always + + + Always + + + Always + - <_ContentIncludedByDefault Remove="Pages\Client\ClientComponents\ClientRoomList.razor" /> - <_ContentIncludedByDefault Remove="Pages\Client\ClientComponents\ClientStatusList.razor" /> - <_ContentIncludedByDefault Remove="Pages\Client\ClientComponents\MatrixClient.razor" /> - <_ContentIncludedByDefault Remove="Pages\Client\Index.razor" /> + - - - - - - - - - - - - - - - - diff --git a/MatrixUtils.sln b/MatrixUtils.sln index 01fb16a..e4193c2 100644 --- a/MatrixUtils.sln +++ b/MatrixUtils.sln @@ -1,6 +1,6 @@  Microsoft Visual Studio Solution File, Format Version 12.00 -# +# Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatrixUtils.Web", "MatrixUtils.Web\MatrixUtils.Web.csproj", "{D38DA95D-DD83-4340-96A4-6F59FC6AE3D9}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MatrixUtils.Web.Server", "MatrixUtils.Web.Server\MatrixUtils.Web.Server.csproj", "{F997F26F-2EC1-4D18-B3DD-C46FB2AD65C0}" @@ -15,7 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LibMatrix", "LibMatrix", "{ EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ArcaneLibs", "ArcaneLibs", "{84BE90C4-2FDE-4A48-B154-58926EF24846}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLib.Tests", "LibMatrix\ArcaneLibs\ArcaneLib.Tests\ArcaneLib.Tests.csproj", "{EC5536AB-0613-4CB5-B22B-822A3DBB112A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Tests", "LibMatrix\ArcaneLibs\ArcaneLibs.Tests\ArcaneLibs.Tests.csproj", "{EC5536AB-0613-4CB5-B22B-822A3DBB112A}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.Blazor.Components", "LibMatrix\ArcaneLibs\ArcaneLibs.Blazor.Components\ArcaneLibs.Blazor.Components.csproj", "{CF252EDF-C5A1-4030-8666-C78AA0A3B7DE}" EndProject @@ -31,14 +31,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs.UsageTest", "Lib EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ArcaneLibs", "LibMatrix\ArcaneLibs\ArcaneLibs\ArcaneLibs.csproj", "{03466515-77CC-49E4-90E5-9A21EDD0A644}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ExampleBots", "ExampleBots", "{D11CC8C3-9F25-4424-9006-2A8FC3F9473D}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.ExampleBot", "LibMatrix\ExampleBots\LibMatrix.ExampleBot\LibMatrix.ExampleBot.csproj", "{8BB44883-AA14-4E0C-A999-A4391AF14FA8}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ModerationBot", "LibMatrix\ExampleBots\ModerationBot\ModerationBot.csproj", "{8AFE074B-3102-41DF-A05E-982B7A2A8F64}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PluralContactBotPoC", "LibMatrix\ExampleBots\PluralContactBotPoC\PluralContactBotPoC.csproj", "{2FAB4B42-4D09-48F7-A589-5F264FF5C620}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix.EventTypes", "LibMatrix\LibMatrix.EventTypes\LibMatrix.EventTypes.csproj", "{0336306C-285A-4810-9253-5C5F0373992E}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LibMatrix", "LibMatrix\LibMatrix\LibMatrix.csproj", "{D7E5B226-114C-4747-9277-A4D6341A16FE}" @@ -131,18 +123,6 @@ Global {03466515-77CC-49E4-90E5-9A21EDD0A644}.Debug|Any CPU.Build.0 = Debug|Any CPU {03466515-77CC-49E4-90E5-9A21EDD0A644}.Release|Any CPU.ActiveCfg = Release|Any CPU {03466515-77CC-49E4-90E5-9A21EDD0A644}.Release|Any CPU.Build.0 = Release|Any CPU - {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8BB44883-AA14-4E0C-A999-A4391AF14FA8}.Release|Any CPU.Build.0 = Release|Any CPU - {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Debug|Any CPU.Build.0 = Debug|Any CPU - {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Release|Any CPU.ActiveCfg = Release|Any CPU - {8AFE074B-3102-41DF-A05E-982B7A2A8F64}.Release|Any CPU.Build.0 = Release|Any CPU - {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2FAB4B42-4D09-48F7-A589-5F264FF5C620}.Release|Any CPU.Build.0 = Release|Any CPU {0336306C-285A-4810-9253-5C5F0373992E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {0336306C-285A-4810-9253-5C5F0373992E}.Debug|Any CPU.Build.0 = Debug|Any CPU {0336306C-285A-4810-9253-5C5F0373992E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -210,10 +190,6 @@ Global {ADFBDF2D-0CEC-43C1-8896-75DCE439CF72} = {84BE90C4-2FDE-4A48-B154-58926EF24846} {D6315791-949B-4501-AA95-50516DE899C1} = {84BE90C4-2FDE-4A48-B154-58926EF24846} {03466515-77CC-49E4-90E5-9A21EDD0A644} = {84BE90C4-2FDE-4A48-B154-58926EF24846} - {D11CC8C3-9F25-4424-9006-2A8FC3F9473D} = {933DC8A6-8B1F-46BF-9046-4B636AA46469} - {8BB44883-AA14-4E0C-A999-A4391AF14FA8} = {D11CC8C3-9F25-4424-9006-2A8FC3F9473D} - {8AFE074B-3102-41DF-A05E-982B7A2A8F64} = {D11CC8C3-9F25-4424-9006-2A8FC3F9473D} - {2FAB4B42-4D09-48F7-A589-5F264FF5C620} = {D11CC8C3-9F25-4424-9006-2A8FC3F9473D} {0336306C-285A-4810-9253-5C5F0373992E} = {933DC8A6-8B1F-46BF-9046-4B636AA46469} {D7E5B226-114C-4747-9277-A4D6341A16FE} = {933DC8A6-8B1F-46BF-9046-4B636AA46469} {B37F87A8-B5E2-4724-800C-F5D9A91F35C7} = {933DC8A6-8B1F-46BF-9046-4B636AA46469} -- cgit 1.5.1