Merge pull request #21 from pi4erd/development

Lavalink v4 support and Victoria v7
pi4erd · Jul 24, 2024 · 60209ed · 60209ed
2 parents a4d7958 + a54140d
commit 60209ed
Show file tree

Hide file tree

Showing 21 changed files with 790 additions and 1,200 deletions.
diff --git a/.github/workflows/debug-workflow.yml b/.github/workflows/debug-workflow.yml
@@ -43,6 +43,6 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64 #,linux/arm64
+          platforms: linux/amd64
           tags: ${{ steps.meta.outputs.tags }} # the debug shouldn't upload to the 'latest' tag
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml
@@ -36,6 +36,6 @@ jobs:
           context: .
           file: ./Dockerfile
           push: true
-          platforms: linux/amd64 #,linux/arm64
+          platforms: linux/amd64
           tags: ${{ secrets.DOCKER_USERNAME }}/talkingbot:latest,${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}
diff --git a/.gitignore b/.gitignore
@@ -371,4 +371,5 @@ build
 TalkingBot/.DS_Store
 .DS_Store
 
+Cache
 Config.json
diff --git a/TalkingBot/Program.cs b/TalkingBot/Program.cs
@@ -17,7 +17,6 @@ public static Task Main(string[] args) =>
         private static async Task MainAsync(string[] args)
         {
             string cnfpath = "Config.json";
-            string jsonconfig = "";
             if(args.Length > 1) 
             {
                 int idx = Array.FindIndex(args, 0, args.Length, str => str == "-C");
@@ -36,7 +35,7 @@ private static async Task MainAsync(string[] args)
                 Console.WriteLine("Config not found at: {0}\nCreating new one...", cnfpath);
                 await Config.CreateDefaultConfig(cnfpath);
             }
-            jsonconfig = File.ReadAllText(cnfpath);
+            string jsonconfig = File.ReadAllText(cnfpath);
             TalkingBotConfig config = JsonConvert.DeserializeObject<TalkingBotConfig>(jsonconfig)!;
 
             Console.Clear();
@@ -45,7 +44,6 @@ private static async Task MainAsync(string[] args)
 
             Console.CancelKeyPress += delegate
             {
-                client.Dispose();
                 Environment.Exit(0);
             };
 

diff --git a/TalkingBot/TalkingBot.csproj b/TalkingBot/TalkingBot.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Discord.Net" Version="3.12.0" />
+    <PackageReference Include="Discord.Net" Version="3.15.1" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
   </ItemGroup>