Merge branch 'dev' into main

Color-Chan · Sep 30, 2021 · f76c958 · f76c958
2 parents 2e7bfd2 + 220abc3
commit f76c958
Show file tree

Hide file tree

Showing 12 changed files with 53 additions and 50 deletions.
diff --git a/samples/RoleManager/Pipelines/PerformancePipeline.cs b/samples/RoleManager/Pipelines/PerformancePipeline.cs
@@ -36,7 +36,7 @@ public async Task<Result<IDiscordInteractionResponse>> HandleAsync(ISlashCommand
 
             sw.Stop();
 
-            _logger.Log(sw.ElapsedMilliseconds > 500 ? LogLevel.Warning : LogLevel.Information, "Command {Name} ran for {Time}ms.", context.MethodName, sw.ElapsedMilliseconds.ToString());
+            _logger.Log(sw.ElapsedMilliseconds > 500 ? LogLevel.Warning : LogLevel.Information, "Command {Name} ran for {Time}ms", context.MethodName, sw.ElapsedMilliseconds.ToString());
             return result;
         }
     }

diff --git a/src/Color-Chan.Discord.Commands/Services/Implementations/ComponentService.cs b/src/Color-Chan.Discord.Commands/Services/Implementations/ComponentService.cs
@@ -112,6 +112,7 @@ public async Task<Result<IDiscordInteractionResponse>> ExecuteComponentInteracti
                 if (componentInfo.ComponentMethod.Invoke(instance, null) is not Task<Result<IDiscordInteractionResponse>> task)
                 {
                     var errorMessage = $"Failed to cast {componentInfo.ComponentMethod.Name} to Task<Result<IDiscordInteractionResponse>>";
+                    // ReSharper disable once TemplateIsNotCompileTimeConstantProblem
                     _logger.LogWarning(errorMessage);
                     return Result<IDiscordInteractionResponse>.FromError(default, new ErrorResult(errorMessage));
                 }

diff --git a/src/Color-Chan.Discord.Rest/Models/Interaction/DiscordInteraction.cs b/src/Color-Chan.Discord.Rest/Models/Interaction/DiscordInteraction.cs
@@ -4,6 +4,7 @@
 using Color_Chan.Discord.Core.Common.Models.Interaction;
 using Color_Chan.Discord.Core.Common.Models.Message;
 using Color_Chan.Discord.Rest.Models.Guild;
+using Color_Chan.Discord.Rest.Models.Message;
 
 namespace Color_Chan.Discord.Rest.Models.Interaction
 {
@@ -21,6 +22,7 @@ public DiscordInteraction(DiscordInteractionData data)
             if (data.User is not null) User = new DiscordUser(data.User);
             Token = data.Token;
             Versions = data.Versions;
+            if (data.Message is not null) Message = new DiscordMessage(data.Message);
         }
 
         /// <inheritdoc />

diff --git a/tests/Color-Chan.Discord.Caching.Tests/Color-Chan.Discord.Caching.Tests.csproj b/tests/Color-Chan.Discord.Caching.Tests/Color-Chan.Discord.Caching.Tests.csproj
@@ -8,16 +8,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3"/>
-        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageReference Include="Moq" Version="4.16.1"/>
-        <PackageReference Include="nunit" Version="3.13.2"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.1.0" />
+        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Moq" Version="4.16.1" />
+        <PackageReference Include="nunit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Color-Chan.Discord.Caching\Color-Chan.Discord.Caching.csproj"/>
+        <ProjectReference Include="..\..\src\Color-Chan.Discord.Caching\Color-Chan.Discord.Caching.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Color-Chan.Discord.Commands.Tests/Color-Chan.Discord.Commands.Tests.csproj b/tests/Color-Chan.Discord.Commands.Tests/Color-Chan.Discord.Commands.Tests.csproj
@@ -8,18 +8,18 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3"/>
-        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageReference Include="Moq" Version="4.16.1"/>
-        <PackageReference Include="nunit" Version="3.13.2"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.1.0" />
+        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Moq" Version="4.16.1" />
+        <PackageReference Include="nunit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Color-Chan.Discord\Color-Chan.Discord.csproj"/>
-        <ProjectReference Include="..\mockCommandAssemblies\Color-Chan.Discord.Commands.Tests.Invalid\Color-Chan.Discord.Commands.Tests.Invalid.csproj"/>
-        <ProjectReference Include="..\mockCommandAssemblies\Color-Chan.Discord.Commands.Tests.Valid\Color-Chan.Discord.Commands.Tests.Valid.csproj"/>
+        <ProjectReference Include="..\..\src\Color-Chan.Discord\Color-Chan.Discord.csproj" />
+        <ProjectReference Include="..\mockCommandAssemblies\Color-Chan.Discord.Commands.Tests.Invalid\Color-Chan.Discord.Commands.Tests.Invalid.csproj" />
+        <ProjectReference Include="..\mockCommandAssemblies\Color-Chan.Discord.Commands.Tests.Valid\Color-Chan.Discord.Commands.Tests.Valid.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Color-Chan.Discord.Core.Tests/Color-Chan.Discord.Core.Tests.csproj b/tests/Color-Chan.Discord.Core.Tests/Color-Chan.Discord.Core.Tests.csproj
@@ -8,27 +8,27 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3"/>
-        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageReference Include="Moq" Version="4.16.1"/>
-        <PackageReference Include="nunit" Version="3.13.2"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.1.0" />
+        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Moq" Version="4.16.1" />
+        <PackageReference Include="nunit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <Folder Include="Common"/>
+        <Folder Include="Common" />
     </ItemGroup>
 
     <ItemGroup>
-        <EmbeddedResource Include="TestJson\**\*"/>
+        <EmbeddedResource Include="TestJson\**\*" />
         <Content Include="TestJson\**\*">
             <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Color-Chan.Discord.Core\Color-Chan.Discord.Core.csproj"/>
+        <ProjectReference Include="..\..\src\Color-Chan.Discord.Core\Color-Chan.Discord.Core.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Color-Chan.Discord.Core.Tests/Common/API/Extensions/GuildPermissionExtensionsTests.cs b/tests/Color-Chan.Discord.Core.Tests/Common/API/Extensions/GuildPermissionExtensionsTests.cs
@@ -52,7 +52,7 @@ public void Should_parse_permissions_string(string permissionString, DiscordPerm
             var permission = permissionString.ConvertToGuildPermission();
 
             // Assert
-            expectedPermission.Should().BeEquivalentTo(permission);
+            expectedPermission.Should().Be(permission);
         }
 
         [TestCase("1409286155", DiscordPermission.Administrator |
@@ -101,7 +101,7 @@ public void Should_parse_permissions_span(string permissionString, DiscordPermis
             var permission = span.ConvertToGuildPermission();
 
             // Assert
-            expectedPermission.Should().BeEquivalentTo(permission);
+            expectedPermission.Should().Be(permission);
         }
     }
 }
diff --git a/tests/Color-Chan.Discord.Core.Tests/JsonTestBase.cs b/tests/Color-Chan.Discord.Core.Tests/JsonTestBase.cs
@@ -61,8 +61,8 @@ public async Task Should_serialize_and_deserialize(string filepath)
             var serialized = await JsonDocument.ParseAsync(stream);
             var original = await JsonDocument.ParseAsync(testJson);
 
-            var serializedString = serialized.RootElement.GetRawText();
-            var originalString = original.RootElement.GetRawText();
+            var serializedString = serialized.RootElement.GetRawText().Replace("\r", "").Replace("\n", "");
+            var originalString = original.RootElement.GetRawText().Replace("\r", "").Replace("\n", "");
 
             serializedString.Should().BeEquivalentTo(originalString);
         }

diff --git a/tests/Color-Chan.Discord.Rest.Tests/Color-Chan.Discord.Rest.Tests.csproj b/tests/Color-Chan.Discord.Rest.Tests/Color-Chan.Discord.Rest.Tests.csproj
@@ -8,17 +8,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3"/>
-        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageReference Include="Moq" Version="4.16.1"/>
-        <PackageReference Include="nunit" Version="3.13.2"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.1.0" />
+        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Moq" Version="4.16.1" />
+        <PackageReference Include="nunit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Color-Chan.Discord.Rest\Color-Chan.Discord.Rest.csproj"/>
+        <ProjectReference Include="..\..\src\Color-Chan.Discord.Rest\Color-Chan.Discord.Rest.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/Color-Chan.Discord.Tests/Color-Chan.Discord.Tests.csproj b/tests/Color-Chan.Discord.Tests/Color-Chan.Discord.Tests.csproj
@@ -8,17 +8,17 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="5.10.3"/>
-        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0"/>
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.10.0"/>
-        <PackageReference Include="Moq" Version="4.16.1"/>
-        <PackageReference Include="nunit" Version="3.13.2"/>
-        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0"/>
+        <PackageReference Include="FluentAssertions" Version="6.1.0" />
+        <PackageReference Include="GitHubActionsTestLogger" Version="1.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="5.0.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.11.0" />
+        <PackageReference Include="Moq" Version="4.16.1" />
+        <PackageReference Include="nunit" Version="3.13.2" />
+        <PackageReference Include="NUnit3TestAdapter" Version="4.0.0" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\src\Color-Chan.Discord\Color-Chan.Discord.csproj"/>
+        <ProjectReference Include="..\..\src\Color-Chan.Discord\Color-Chan.Discord.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/tests/benchmarks/Color-Chan.Discord.Benchmarks/Color-Chan.Discord.Benchmarks.csproj b/tests/benchmarks/Color-Chan.Discord.Benchmarks/Color-Chan.Discord.Benchmarks.csproj
@@ -7,11 +7,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.0"/>
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\Color-Chan.Discord\Color-Chan.Discord.csproj"/>
+        <ProjectReference Include="..\..\..\src\Color-Chan.Discord\Color-Chan.Discord.csproj" />
     </ItemGroup>
 
 </Project>
diff --git a/...s/benchmarks/Color-Chan.Discord.Core.Benchmarks/Color-Chan.Discord.Core.Benchmarks.csproj b/...s/benchmarks/Color-Chan.Discord.Core.Benchmarks/Color-Chan.Discord.Core.Benchmarks.csproj
@@ -9,11 +9,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.13.0"/>
+        <PackageReference Include="BenchmarkDotNet" Version="0.13.1" />
     </ItemGroup>
 
     <ItemGroup>
-        <ProjectReference Include="..\..\..\src\Color-Chan.Discord.Core\Color-Chan.Discord.Core.csproj"/>
+        <ProjectReference Include="..\..\..\src\Color-Chan.Discord.Core\Color-Chan.Discord.Core.csproj" />
     </ItemGroup>
 
 </Project>