RPCS3/discord-bot
1
0
Fork 0
mirror of https://github.com/RPCS3/discord-bot.git synced 2024-11-27 04:00:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #927 from 13xforever/vnext

Browse Source 
Fix note sorting in log analysis results
This commit is contained in:
clienthax 2023-03-27 16:08:04 +02:00 committed by GitHub
commit 45824a340c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Clients/GithubClient/GithubClient.csproj
View File

@ -6,7 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
<PackageReference Include="Octokit" Version="5.0.0" /> <PackageReference Include="Octokit" Version="5.0.2" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" /> <ProjectReference Include="..\CompatApiClient\CompatApiClient.csproj" />

14
CompatBot/CompatBot.csproj
View File

@ -43,30 +43,30 @@
<PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.0-nightly-01386" /> <PackageReference Include="DSharpPlus.CommandsNext" Version="4.4.0-nightly-01386" />
<PackageReference Include="DSharpPlus.Interactivity" Version="4.4.0-nightly-01386" /> <PackageReference Include="DSharpPlus.Interactivity" Version="4.4.0-nightly-01386" />
<PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.0-nightly-01386" /> <PackageReference Include="DSharpPlus.SlashCommands" Version="4.4.0-nightly-01386" />
<PackageReference Include="Google.Apis.Drive.v3" Version="1.60.0.2971" /> <PackageReference Include="Google.Apis.Drive.v3" Version="1.60.0.2986" />
<PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" /> <PackageReference Include="ksemenenko.ColorThief" Version="1.1.1.4" />
<PackageReference Include="MathParser.org-mXparser" Version="5.2.1" /> <PackageReference Include="MathParser.org-mXparser" Version="5.2.1" />
<PackageReference Include="MegaApiClient" Version="1.10.3" /> <PackageReference Include="MegaApiClient" Version="1.10.3" />
<PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" /> <PackageReference Include="Microsoft.ApplicationInsights.DependencyCollector" Version="2.21.0" />
<PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" /> <PackageReference Include="Microsoft.ApplicationInsights.PerfCounterCollector" Version="2.21.0" />
<PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.ComputerVision" Version="7.0.1" /> <PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.ComputerVision" Version="7.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.4" />
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3"> <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.4">
<PrivateAssets>all</PrivateAssets> <PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference> </PackageReference>
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.3" /> <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.3" /> <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" /> <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="7.0.0" />
<PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" /> <PackageReference Include="Microsoft.IO.RecyclableMemoryStream" Version="2.3.2" />
<PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.170.0" /> <PackageReference Include="Microsoft.TeamFoundationServer.Client" Version="16.170.0" />
<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.18.1" />
<PackageReference Include="Nerdbank.Streams" Version="2.9.112" /> <PackageReference Include="Nerdbank.Streams" Version="2.9.112" />
<PackageReference Include="NLog" Version="5.1.2" /> <PackageReference Include="NLog" Version="5.1.2" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" /> <PackageReference Include="NLog.Extensions.Logging" Version="5.2.2" />
<PackageReference Include="NReco.Text.AhoCorasickDoubleArrayTrie" Version="1.1.1" /> <PackageReference Include="NReco.Text.AhoCorasickDoubleArrayTrie" Version="1.1.1" />
<PackageReference Include="SharpCompress" Version="0.32.2" /> <PackageReference Include="SharpCompress" Version="0.33.0" />
<PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" /> <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta15" />
<PackageReference Include="System.Drawing.Common" Version="7.0.0" /> <PackageReference Include="System.Drawing.Common" Version="7.0.0" />
</ItemGroup> </ItemGroup>

1
CompatBot/Utils/ResultFormatters/LogParserResultFormatter.GeneralNotesSection.cs
View File

@ -642,7 +642,6 @@ internal static partial class LogParserResult
} }
catch { } catch { }
} }
} }
private static void BuildAppliedPatchesSection(DiscordEmbedBuilder builder, NameUniqueObjectCollection<string> items) private static void BuildAppliedPatchesSection(DiscordEmbedBuilder builder, NameUniqueObjectCollection<string> items)

6
CompatBot/Utils/ResultFormatters/LogParserResultFormatter.cs
View File

@ -243,7 +243,9 @@ internal static partial class LogParserResult
private static readonly TimeSpan PrehistoricBuild = TimeSpan.FromDays(365); private static readonly TimeSpan PrehistoricBuild = TimeSpan.FromDays(365);
private static readonly char[] PrioritySeparator = {' '}; private static readonly char[] PrioritySeparator = {' '};
private static readonly string[] EmojiPriority = { "😱", "💢", "‼️", "❗", "❌", "⁉️", "⚠️", "❔", "✅", "ℹ️" }; private static readonly string[] EmojiPriority = new[]{ "😱", "💢", "‼️", "❗", "❌", "⁉️", "⚠️", "❔", "✅", "ℹ️" }
.Select(e => e.TrimEnd('\ufe0f'))
.ToArray();
private const string EnabledMark = "[x]"; private const string EnabledMark = "[x]";
private const string DisabledMark = "[\u00a0]"; private const string DisabledMark = "[\u00a0]";
@ -955,7 +957,7 @@ internal static partial class LogParserResult
return notes return notes
.Select(s => .Select(s =>
{ {
var prioritySymbol = s.Split(PrioritySeparator, 2)[0].TrimEnd('️'); var prioritySymbol = s.Split(PrioritySeparator, 2)[0].TrimEnd('\ufe0f');
var priority = priorityList.IndexOf(prioritySymbol); var priority = priorityList.IndexOf(prioritySymbol);
return new return new
{ {