Merge pull request #10 from CriticalFlaw/2.4

Version 2.4
CriticalFlaw · Jan 28, 2020 · 13a9037 · 13a9037
2 parents 5072cf9 + 900e51c
commit 13a9037
Show file tree

Hide file tree

Showing 62 changed files with 857 additions and 1,595 deletions.
diff --git a/src/FlawBOT.Core/Common/HelpFormatter.cs b/src/FlawBOT.Core/Common/HelpFormatter.cs
@@ -28,7 +28,7 @@ public override CommandHelpMessage Build()
             if (!string.IsNullOrWhiteSpace(name))
             {
                 output.WithTitle(name);
-                desc = string.IsNullOrWhiteSpace(description) ? "No description provided." : description;
+                desc = description ?? "No description provided.";
             }
             output.WithDescription(desc);
             return new CommandHelpMessage(embed: output);
@@ -48,16 +48,15 @@ public override BaseHelpFormatter WithCommand(Command cmd)
                     {
                         ab.Append(Formatter.InlineCode($"[{CommandsNext.GetUserFriendlyTypeName(arg.Type)}]"));
                         ab.Append(" ");
-                        ab.Append(string.IsNullOrWhiteSpace(arg.Description) ? "No description provided." : arg.Description);
+                        ab.Append(arg.Description ?? "No description provided.");
                         if (arg.IsOptional)
                         {
                             ab.Append(" (def: ").Append(Formatter.InlineCode(arg.DefaultValue is null ? "None" : arg.DefaultValue.ToString())).Append(")");
                             ab.Append(" (optional)");
                         }
                         ab.AppendLine();
                     }
-                    string args = ab.ToString();
-                    output.AddField($"{(cmd.Overloads.Count > 1 ? $"Overload #{overload.Priority}" : "Arguments")}", string.IsNullOrWhiteSpace(args) ? "No arguments." : args);
+                    output.AddField($"{(cmd.Overloads.Count > 1 ? $"Overload #{overload.Priority}" : "Arguments")}", ab.ToString() ?? "No arguments.");
                 }
             }
 

diff --git a/src/FlawBOT.Core/Dockerfile b/src/FlawBOT.Core/Dockerfile
diff --git a/src/FlawBOT.Core/FlawBOT.Core.csproj b/src/FlawBOT.Core/FlawBOT.Core.csproj
@@ -11,12 +11,11 @@
     <LangVersion>7.2</LangVersion>
     <AssemblyVersion>2.4.0.0</AssemblyVersion>
     <FileVersion>2.4.0.0</FileVersion>
-    <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
     <AssemblyName>FlawBOT.Core</AssemblyName>
     <RootNamespace>FlawBOT.Core</RootNamespace>
     <PackageTags />
     <Description>Multipurpose Discord bot written in C# using DSharpPlus. Application Core.</Description>
-    <PackageProjectUrl>https://discordbots.org/bot/339833029013012483</PackageProjectUrl>
+    <PackageProjectUrl>https://top.gg/bot/339833029013012483</PackageProjectUrl>
     <RepositoryUrl>https://github.com/CriticalFlaw/FlawBOT</RepositoryUrl>
     <RepositoryType />
     <Company>CriticalFlaw</Company>
@@ -41,9 +40,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="4.0.0-nightly-00625" />
-    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.0.0-nightly-00625" />
-    <PackageReference Include="DSharpPlus.Interactivity" Version="4.0.0-nightly-00625" />
+    <PackageReference Include="DSharpPlus" Version="4.0.0-nightly-00656" />
+    <PackageReference Include="DSharpPlus.CommandsNext" Version="4.0.0-nightly-00656" />
+    <PackageReference Include="DSharpPlus.Interactivity" Version="4.0.0-nightly-00656" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/FlawBOT.Core/Modules/Bot/BotModule.cs b/src/FlawBOT.Core/Modules/Bot/BotModule.cs
diff --git a/src/FlawBOT.Core/Modules/Bot/OwnerModule.cs b/src/FlawBOT.Core/Modules/Bot/OwnerModule.cs