Revert "Create Help Command and Refactor (#275)" (#289)

This reverts commit a5e912f.

src/Miunie.Avalonia/Miunie.Avalonia.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>netcoreapp3.0</TargetFramework>
     <LangVersion>8.0</LangVersion>
     <CodeAnalysisRuleSet>../.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
@@ -16,9 +16,9 @@
     <AvaloniaResource Include="Assets\**" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Avalonia" Version="0.9.3" />
-    <PackageReference Include="Avalonia.Desktop" Version="0.9.3" />
-    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.3" />
+    <PackageReference Include="Avalonia" Version="0.9.0" />
+    <PackageReference Include="Avalonia.Desktop" Version="0.9.0" />
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

src/Miunie.ConsoleApp/Miunie.ConsoleApp.csproj

@@ -3,13 +3,13 @@
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <LangVersion>8.0</LangVersion>
+    <LangVersion>latest</LangVersion>
     <CodeAnalysisRuleSet>../.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.5.0" />
   </ItemGroup>
 
   <ItemGroup>

src/Miunie.Core.XUnit.Tests/Miunie.Core.XUnit.Tests.csproj

@@ -2,20 +2,17 @@
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.1</TargetFramework>
+
     <IsPackable>false</IsPackable>
     <CodeAnalysisRuleSet>../.ruleset</CodeAnalysisRuleSet>
-    <LangVersion>8.0</LangVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
     <PackageReference Include="Appveyor.TestLogger" Version="2.0.0" />
-    <PackageReference Include="Moq" Version="4.13.1" />
-    <PackageReference Include="xunit" Version="2.4.1" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
+    <PackageReference Include="Moq" Version="4.10.1" />
+    <PackageReference Include="xunit" Version="2.4.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.1.118">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>

src/Miunie.Core/Entities/PhraseKey.cs

@@ -23,7 +23,6 @@ public enum PhraseKey
         SHOW_REMOTE_REPO,
         USER_EMBED_TITLE,
         USER_EMBED_NAME_TITLE,
-        USER_EMBED_HELP_TITLE,
         USER_EMBED_IS_BOT,
         USER_EMBED_IS_HUMAN,
         USER_EMBED_REALNESS_TITLE,
@@ -55,10 +54,6 @@ public enum PhraseKey
         INCORRECT_VERB,
         REPUTATION_TAKEN_BOT,
         REPUTATION_GIVEN_BOT,
-        HELP_EXAMPLE_EMPTY,
-        HELP_EXAMPLE_TITLE,
-        HELP_SUMMARY_EMPTY,
-        HELP_SUMMARY_TITLE,
         GPL3_NOTICE
     }
 }

src/Miunie.Core/Strings.resx

@@ -158,28 +158,6 @@ Source code available at: {1}</value>
     <value>**ABOUT THIS SERVER**</value>
     <comment>No formatting options.</comment>
   </data>
-  <data name="HELP_EXAMPLE_EMPTY" xml:space="preserve">
-    <value>You'll figure it out.{{OR}}
-You know what? I've never used this command.{{OR}}
-Yeah, you're on your own with this one, buddy.{{OR}}
-I got nothing here.{{OR}}
-Just mess around with this, you'll figure it out eventually.</value>
-    <comment>No formatting options.</comment>
-  </data>
-  <data name="HELP_EXAMPLE_TITLE" xml:space="preserve">
-    <value>**Examples**: </value>
-    <comment>No formatting options.</comment>
-  </data>
-  <data name="HELP_SUMMARY_EMPTY" xml:space="preserve">
-    <value>This is kind of difficult to explain...{{OR}}
-How am I supposed to put this into words?{{OR}}
-It's a command, I think? Not sure.</value>
-    <comment>No formatting options.</comment>
-  </data>
-  <data name="HELP_SUMMARY_TITLE" xml:space="preserve">
-    <value>**Summary**: </value>
-    <comment>No formatting options.</comment>
-  </data>
   <data name="INCORRECT_VERB" xml:space="preserve">
     <value>You better start making sense with other than '{0}'{{OR}}
 Come again, I don't understand '{0}'{{OR}}
@@ -280,10 +258,6 @@ What are you trying to say with {0} {1}</value>
     <value>:calendar_spiral: Creation date</value>
     <comment>No formatting options.</comment>
   </data>
-  <data name="USER_EMBED_HELP_TITLE" xml:space="preserve">
-    <value>**HELP MENU**</value>
-    <comment>No formatting options.</comment>
-  </data>
   <data name="USER_EMBED_IS_BOT" xml:space="preserve">
     <value>_A software person._{{OR}}
 _A bot._ :robot:{{OR}}

src/Miunie.Discord/Adapters/DiscordMessagesAdapter.cs

@@ -14,6 +14,7 @@
 //  along with Miunie. If not, see <https://www.gnu.org/licenses/>.
 
 using Discord.WebSocket;
+using Miunie.Core;
 using Miunie.Core.Discord;
 using Miunie.Core.Entities;
 using Miunie.Core.Entities.Discord;

src/Miunie.Discord/CommandHandler.cs

@@ -35,10 +35,10 @@ public class CommandHandler
         private readonly EntityConvertor _convertor;
         private readonly IBotConfiguration _botConfig;
 
-        public CommandHandler(IDiscord discord, CommandService commandService, IServiceProvider services, ILogWriter logger, EntityConvertor convertor, IBotConfiguration botConfig)
+        public CommandHandler(IDiscord discord, IServiceProvider services, ILogWriter logger, EntityConvertor convertor, IBotConfiguration botConfig)
         {
             _discord = discord;
-            _commandService = commandService;
+            _commandService = new CommandService();
             _services = services;
             _logger = logger;
             _convertor = convertor;

src/Miunie.Discord/CommandModules/MiscCommands.cs

@@ -16,13 +16,11 @@
 using Discord.Commands;
 using Discord.WebSocket;
 using Miunie.Core;
-using Miunie.Discord.Attributes;
 using Miunie.Discord.Convertors;
 using System.Threading.Tasks;
 
 namespace Miunie.Discord.CommandModules
 {
-    [Name("Misc")]
     public class MiscCommands : ModuleBase<SocketCommandContext>
     {
         private readonly MiscService _service;
@@ -35,8 +33,6 @@ public MiscCommands(MiscService service, EntityConvertor entityConvertor)
         }
 
         [Command("what do you think?")]
-        [Summary("What do I think? I guess you'll have to find out~")]
-        [Examples("what do you think?")]
         public async Task SendRandomYesNoMaybeAnswer()
         {
             var c = _entityConvertor.ConvertChannel(Context.Channel as SocketGuildChannel);

src/Miunie.Discord/CommandModules/ProfileCommand.cs

@@ -17,13 +17,11 @@
 using Discord.WebSocket;
 using Miunie.Core;
 using Miunie.Core.Entities.Discord;
-using Miunie.Discord.Attributes;
 using Miunie.Discord.Convertors;
 using System.Threading.Tasks;
 
 namespace Miunie.Discord.CommandModules
 {
-    [Name("Profile")]
     public class ProfileCommand : ModuleBase<SocketCommandContext>
     {
         private readonly EntityConvertor _entityConvertor;
@@ -36,8 +34,6 @@ public ProfileCommand(EntityConvertor entityConvertor, ProfileService profileSer
         }
 
         [Command("profile")]
-        [Summary("Pull up a dank profile!")]
-        [Examples("profile", "profile @Miunie")]
         public async Task ShowProfileAsync(MiunieUser user = null)
         {
             if (user is null)
@@ -50,8 +46,6 @@ public async Task ShowProfileAsync(MiunieUser user = null)
         }
 
         [Command("rep log")]
-        [Summary("Pull up your current reputation log~")]
-        [Examples("rep log", "rep log 1")]
         public async Task ShowReputationLogAsync(int page = 1)
         {
             var source = _entityConvertor.ConvertUser(Context.User as SocketGuildUser);
@@ -60,8 +54,6 @@ public async Task ShowReputationLogAsync(int page = 1)
         }
 
         [Command("rep log for")]
-        [Summary("Pull up a reputation log for the specified user!")]
-        [Examples("rep log for @Miunie", "rep log for @Mackie 1")]
         public async Task ShowReputationLogAsync(MiunieUser user, int page = 1)
         {
             var source = _entityConvertor.ConvertUser(Context.User as SocketGuildUser);
@@ -70,8 +62,6 @@ public async Task ShowReputationLogAsync(MiunieUser user, int page = 1)
         }
 
         [Command("+rep")]
-        [Summary("Give a good ol' positive reputation to a user!")]
-        [Examples("+rep @Miunie")]
         public async Task AddReputationAsync(MiunieUser user)
         {
             var source = _entityConvertor.ConvertUser(Context.User as SocketGuildUser);
@@ -80,8 +70,6 @@ public async Task AddReputationAsync(MiunieUser user)
         }
 
         [Command("-rep")]
-        [Summary("Give a cold-blooded negative reputation to a user...")]
-        [Examples("-rep @You")]
         public async Task RemoveReputationAsync(MiunieUser user)
         {
             var source = _entityConvertor.ConvertUser(Context.User as SocketGuildUser);
@@ -90,8 +78,6 @@ public async Task RemoveReputationAsync(MiunieUser user)
         }
 
         [Command("guild")]
-        [Summary("Pull up information about this guild.")]
-        [Examples("guild")]
         public async Task ShowGuildInfoAsync()
         {
             var guild = _entityConvertor.ConvertGuild(Context.Guild);