[WIP] Genericize send message

.github/ISSUE_TEMPLATE/bug_report.md

@@ -2,7 +2,7 @@
 name: Bug report
 about: Create a report to help us improve
 title: "[BUG]"
-labels: ''
+labels: bug
 assignees: ''
 
 ---

.github/ISSUE_TEMPLATE/feature_request.md

@@ -2,7 +2,7 @@
 name: Feature request
 about: Suggest an idea for this project
 title: "[FEATURE]"
-labels: ''
+labels: enhancement
 assignees: ''
 
 ---

.github/workflows/dotnet.yml

@@ -2,9 +2,9 @@ name: .NET
 
 on:
   push:
-    branches: [ "2.2" ]
+    branches: [ "2.4" ]
   pull_request:
-    branches: [ "2.2" ]
+    branches: [ "2.4" ]
 
 jobs:
   build:
@@ -21,3 +21,34 @@ jobs:
       run: dotnet restore
     - name: Build
       run: dotnet build --no-restore
+    - name: Push package
+      run: |
+        # Grab some versioning information
+        commithash=$(git rev-parse --short HEAD)
+        currtime=$(date +%s)
+        echo "commit hash is $commithash"
+        echo "time is $currtime"
+
+        # Enter project directory
+        cd Mirai.Net
+
+        # Build package
+        dotnet restore
+        dotnet build
+
+        # Pack a nuget package with all the default config
+        dotnet pack
+
+        # Enter package output directory
+        cd bin/Debug
+
+        # Getting file named with .nupkg extension
+        file=""
+        cdir=`ls ./*.nupkg`
+        for eachfile in $cdir
+        do
+          file=$eachfile
+        done
+
+        # Push it to source "nuget"
+        dotnet nuget push $file --api-key ${{ secrets.NUGET_KEY  }} --source "nuget" --skip-duplicate

.gitignore

@@ -2,4 +2,6 @@ bin/
 obj/
 /packages/
 riderModule.iml
-/_ReSharper.Caches/
+/_ReSharper.Caches/
+/.vs/
+/MSBuild_Logs

Mirai.Net.Test/Mirai.Net.Test.csproj

@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <LangVersion>latest</LangVersion>
     </PropertyGroup>
 
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="CommandLineParser" Version="2.9.0-preview1" />
+      <PackageReference Include="CommandLineParser" Version="2.9.1" />
     </ItemGroup>
 
 </Project>

Mirai.Net.Test/Module1.cs

@@ -1,10 +1,8 @@
 using System;
 using System.Linq;
-using Mirai.Net.Data.Commands;
 using Mirai.Net.Data.Messages;
 using Mirai.Net.Data.Messages.Concretes;
 using Mirai.Net.Data.Messages.Receivers;
-using Mirai.Net.Data.Modules;
 using Mirai.Net.Modules;
 using Mirai.Net.Utils.Scaffolds;
 
@@ -15,23 +13,21 @@ public class Module1 : IModule
         public async void Execute(MessageReceiverBase @base)
         {
             var receiver = @base.Concretize<GroupMessageReceiver>();
+            if (receiver.Sender.Id != "2933170747")
+            {
+                return;
+            }
             var plain = receiver.MessageChain.GetPlainMessage();
-
-            if (plain.CanExecute<SayCommand>())
+            if (plain == "/off")
             {
-                var command = receiver.MessageChain.GetPlainMessage().ParseCommand<SayCommand>();
-                await receiver.SendMessageAsync(command.Value);
+                IsEnable = false;
+                await receiver.SendMessageAsync("Current module will be turned off");
+                return;
             }
 
+            await receiver.SendMessageAsync(plain);
         }
 
         public bool? IsEnable { get; set; }
-
-        [CommandEntity(Name = "say", Identifier = "/")]
-        class SayCommand
-        {
-            [CommandArgument(Name = "v", IsRequired = true)]
-            public string Value { get; set; }
-        }
     }
 }

Mirai.Net.Test/Program.cs

@@ -1,25 +1,21 @@
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
 using System.Linq;
+using System.Net;
 using System.Reactive.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using AHpx.Extensions.JsonExtensions;
-using AHpx.Extensions.StringExtensions;
-using Flurl;
-using Mirai.Net.Data.Commands;
-using Mirai.Net.Data.Events.Concretes.Message;
+using Manganese.Array;
+using Manganese.Text;
+using Mirai.Net.Data.Events.Concretes.Request;
 using Mirai.Net.Data.Messages;
 using Mirai.Net.Data.Messages.Concretes;
 using Mirai.Net.Data.Messages.Receivers;
-using Mirai.Net.Data.Modules;
 using Mirai.Net.Data.Sessions;
-using Mirai.Net.Data.Shared;
 using Mirai.Net.Sessions;
 using Mirai.Net.Sessions.Http.Managers;
-using Mirai.Net.Utils;
+using Mirai.Net.Utils.Internal;
 using Mirai.Net.Utils.Scaffolds;
+using Newtonsoft.Json;
 
 namespace Mirai.Net.Test
 {
@@ -29,43 +25,24 @@ private static async Task Main()
         {
             var exit = new ManualResetEvent(false);
 
-            using var bot = new MiraiBot
+            var bot = new MiraiBot
             {
-                Address = "localhost:8080",
+                Address = new ConnectConfig
+                {
+                    HttpAddress = new ConnectConfig.AdapterConfig("localhost", "8080"),
+                    WebsocketAddress = new ConnectConfig.AdapterConfig("localhost", "8080")
+                },
                 VerifyKey = "1145141919810",
-                QQ = "2672886221"
+                QQ = "1590454991"
             };
 
             await bot.LaunchAsync();
 
             var modules = new Module1().GetModules();
-
-            bot.MessageReceived
-                .OfType<GroupMessageReceiver>()
-                .Subscribe(async r =>
-                {
-                    modules.SubscribeModule(r);
+            bot.MessageReceived.WithModules(modules);
 
-                    // await r.SendMessageAsync(r.MessageChain.Append());
-                });
-
+            Console.WriteLine("launched");
             exit.WaitOne();
         }
     }
-
-    [CommandEntity(Name = "test")]
-    class TestCommand
-    {
-        [CommandArgument(Name = "arg1")]
-        public string Arg1 { get; set; }
-
-        [CommandArgument(Name = "arg2", Default = 114514)]
-        public int Arg2 { get; set; }
-
-        [CommandArgument(Name = "arg3")]
-        public string[] Arg3 { get; set; }
-
-        [CommandArgument(Name = "arg4")]
-        public bool Arg4 { get; set; }
-    }
 }

Mirai.Net.UnitTest/CommandShould.cs

@@ -1,5 +1,4 @@
-using Mirai.Net.Data.Commands;
-using Mirai.Net.Utils.Scaffolds;
+
 using Xunit;
 
 namespace Mirai.Net.UnitTest;
@@ -18,7 +17,7 @@ public class CommandShould
     [InlineData("/test-arg4 awd awd -arg5 114.514")]
     public void CanExecute(string command)
     {
-        Assert.True(command.CanExecute<TestClass>());
+
     }
 
     [Theory]
@@ -30,39 +29,13 @@ public void CanExecute(string command)
     [InlineData("/test -arg2 a -arg4 -arg5 awd")]
     public void CantExecute(string command)
     {
-        Assert.False(command.CanExecute<TestClass>());
-    }
-
-    [CommandEntity(Name = "test")]
-    class TestClass
-    {
-        [CommandArgument(Name = "arg1")]
-        public string Arg1 { get; set; }
-
-        [CommandArgument(Name = "arg2")]
-        public int Arg2 { get; set; }
-
-        [CommandArgument(Name = "arg3")]
-        public string[] Arg3 { get; set; }
-
-        [CommandArgument(Name = "arg4")]
-        public bool Arg4 { get; set; }
 
-        [CommandArgument(Name = "arg5")]
-        public double Arg5 { get; set; }
     }
-
-    [CommandEntity(Name = "test")]
-    class DefaultClass
-    {
-        [CommandArgument(Name = "arg4", IsRequired = true)]
-        public bool Arg4 { get; set; }
-    }
-
+
     [Fact]
     public void CantExecuteDefault()
     {
-        Assert.False("/test -arg4".CanExecute<DefaultClass>());
+
     }
 
 }

Mirai.Net.UnitTest/Mirai.Net.UnitTest.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
 
         <IsPackable>false</IsPackable>
 
@@ -10,13 +10,13 @@
 
     <ItemGroup>
         <PackageReference Include="AHpx.Extensions" Version="1.0.1" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.4" />
-        <PackageReference Include="xunit" Version="2.4.1" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+        <PackageReference Include="xunit" Version="2.6.4" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="3.0.2">
+        <PackageReference Include="coverlet.collector" Version="6.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>