diff options
Diffstat (limited to 'Tests/TestDataGenerator')
-rw-r--r-- | Tests/TestDataGenerator/Bot/DataFetcher.cs | 11 | ||||
-rw-r--r-- | Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs | 2 | ||||
-rw-r--r-- | Tests/TestDataGenerator/Program.cs | 8 | ||||
-rw-r--r-- | Tests/TestDataGenerator/Properties/launchSettings.json | 1 | ||||
-rw-r--r-- | Tests/TestDataGenerator/TestDataGenerator.csproj | 8 | ||||
-rw-r--r-- | Tests/TestDataGenerator/appsettings.json | 12 |
6 files changed, 20 insertions, 22 deletions
diff --git a/Tests/TestDataGenerator/Bot/DataFetcher.cs b/Tests/TestDataGenerator/Bot/DataFetcher.cs index 5e8c1a1..66b8a03 100644 --- a/Tests/TestDataGenerator/Bot/DataFetcher.cs +++ b/Tests/TestDataGenerator/Bot/DataFetcher.cs @@ -36,19 +36,18 @@ public class DataFetcher(AuthenticatedHomeserverGeneric hs, ILogger<DataFetcher> var roomAliasTasks = rooms.Select(room => room.GetCanonicalAliasAsync()).ToAsyncEnumerable(); List<Task<(string, string)>> aliasResolutionTasks = new(); - await foreach (var @event in roomAliasTasks) { + await foreach (var @event in roomAliasTasks) if (@event?.Alias != null) { - await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: $"Fetched room alias {(@event).Alias}!")); + await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: $"Fetched room alias {@event.Alias}!")); aliasResolutionTasks.Add(Task.Run(async () => { var alias = await hs.ResolveRoomAliasAsync(@event.Alias); return (@event.Alias, alias.RoomId); }, cancellationToken)); } - } + var aliasResolutionTaskEnumerator = aliasResolutionTasks.ToAsyncEnumerable(); - await foreach (var result in aliasResolutionTaskEnumerator) { + await foreach (var result in aliasResolutionTaskEnumerator) await _logRoom.SendMessageEventAsync(new RoomMessageEventContent(body: $"Resolved room alias {result.Item1} to {result.Item2}!")); - } } /// <summary>Triggered when the application host is performing a graceful shutdown.</summary> @@ -57,4 +56,4 @@ public class DataFetcher(AuthenticatedHomeserverGeneric hs, ILogger<DataFetcher> logger.LogInformation("Shutting down bot!"); _listenerTask?.Dispose(); } -} +} \ No newline at end of file diff --git a/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs b/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs index a586d05..4f53a2a 100644 --- a/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs +++ b/Tests/TestDataGenerator/Bot/DataFetcherConfiguration.cs @@ -6,4 +6,4 @@ public class DataFetcherConfiguration { public DataFetcherConfiguration(IConfiguration config) => config.GetRequiredSection("DataFetcher").Bind(this); // public string -} +} \ No newline at end of file diff --git a/Tests/TestDataGenerator/Program.cs b/Tests/TestDataGenerator/Program.cs index 5d36215..5c20958 100644 --- a/Tests/TestDataGenerator/Program.cs +++ b/Tests/TestDataGenerator/Program.cs @@ -11,17 +11,17 @@ Console.WriteLine("Hello, World!"); var host = Host.CreateDefaultBuilder(args).ConfigureServices((_, services) => { services.AddScoped<TieredStorageService>(_ => new TieredStorageService( - cacheStorageProvider: new FileStorageProvider("bot_data/cache/"), - dataStorageProvider: new FileStorageProvider("bot_data/data/") + new FileStorageProvider("bot_data/cache/"), + new FileStorageProvider("bot_data/data/") ) ); // services.AddSingleton<DataFetcherConfiguration>(); services.AddSingleton<AppServiceConfiguration>(); services.AddRoryLibMatrixServices(); - services.AddBot(withCommands: false); + services.AddBot(false); services.AddHostedService<DataFetcher>(); }).UseConsoleLifetime().Build(); -await host.RunAsync(); +await host.RunAsync(); \ No newline at end of file diff --git a/Tests/TestDataGenerator/Properties/launchSettings.json b/Tests/TestDataGenerator/Properties/launchSettings.json index 997e294..6c504ff 100644 --- a/Tests/TestDataGenerator/Properties/launchSettings.json +++ b/Tests/TestDataGenerator/Properties/launchSettings.json @@ -5,7 +5,6 @@ "commandName": "Project", "dotnetRunMessages": true, "environmentVariables": { - } }, "Development": { diff --git a/Tests/TestDataGenerator/TestDataGenerator.csproj b/Tests/TestDataGenerator/TestDataGenerator.csproj index cf212de..879693e 100644 --- a/Tests/TestDataGenerator/TestDataGenerator.csproj +++ b/Tests/TestDataGenerator/TestDataGenerator.csproj @@ -17,7 +17,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0" /> + <PackageReference Include="Microsoft.Extensions.Hosting" Version="8.0.0"/> </ItemGroup> <ItemGroup> <Content Include="appsettings*.json"> @@ -25,8 +25,8 @@ </Content> </ItemGroup> <ItemGroup> - <ProjectReference Include="..\..\LibMatrix\LibMatrix.csproj" /> - <ProjectReference Include="..\..\Utilities\LibMatrix.Utilities.Bot\LibMatrix.Utilities.Bot.csproj" /> - <ProjectReference Include="..\LibMatrix.Tests\LibMatrix.Tests.csproj" /> + <ProjectReference Include="..\..\LibMatrix\LibMatrix.csproj"/> + <ProjectReference Include="..\..\Utilities\LibMatrix.Utilities.Bot\LibMatrix.Utilities.Bot.csproj"/> + <ProjectReference Include="..\LibMatrix.Tests\LibMatrix.Tests.csproj"/> </ItemGroup> </Project> diff --git a/Tests/TestDataGenerator/appsettings.json b/Tests/TestDataGenerator/appsettings.json index 6ba02f3..e203e94 100644 --- a/Tests/TestDataGenerator/appsettings.json +++ b/Tests/TestDataGenerator/appsettings.json @@ -1,9 +1,9 @@ { - "Logging": { - "LogLevel": { - "Default": "Debug", - "System": "Information", - "Microsoft": "Information" - } + "Logging": { + "LogLevel": { + "Default": "Debug", + "System": "Information", + "Microsoft": "Information" } + } } |