changing folder structure
This commit is contained in:
		
							
								
								
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							@@ -1,7 +1,7 @@
 | 
			
		||||
appsettings.*.json
 | 
			
		||||
.env*
 | 
			
		||||
 | 
			
		||||
Properties/launchSettings.json
 | 
			
		||||
Kasbot.APP/*/launchSettings.json
 | 
			
		||||
 | 
			
		||||
.vs
 | 
			
		||||
.vscode
 | 
			
		||||
 
 | 
			
		||||
@@ -2,9 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
 | 
			
		||||
WORKDIR /App
 | 
			
		||||
 | 
			
		||||
# Copy everything
 | 
			
		||||
COPY . ./
 | 
			
		||||
COPY ./Kasbot.APP ./Kasbot.APP
 | 
			
		||||
COPY ./Kasbot.sln ./Kasbot.sln
 | 
			
		||||
 | 
			
		||||
# Restore as distinct layers
 | 
			
		||||
RUN dotnet restore
 | 
			
		||||
 | 
			
		||||
# Build a release
 | 
			
		||||
RUN dotnet build -c Release -o out
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -14,7 +14,7 @@
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
 | 
			
		||||
  <ItemGroup>
 | 
			
		||||
    <PackageReference Include="Discord.Net" Version="3.11.0" />
 | 
			
		||||
    <PackageReference Include="Discord.Net" Version="3.12.0" />
 | 
			
		||||
    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
 | 
			
		||||
    <PackageReference Include="YoutubeExplode" Version="6.3.1" />
 | 
			
		||||
  </ItemGroup>
 | 
			
		||||
@@ -2,9 +2,9 @@ using Discord;
 | 
			
		||||
using Discord.Commands;
 | 
			
		||||
using Kasbot.Models;
 | 
			
		||||
using Kasbot.Services;
 | 
			
		||||
using TextCommandFramework.Services;
 | 
			
		||||
using Kasbot.Services;
 | 
			
		||||
 | 
			
		||||
namespace TextCommandFramework.Modules
 | 
			
		||||
namespace Kasbot.Modules
 | 
			
		||||
{
 | 
			
		||||
    public class CommandModule : ModuleBase<ShardedCommandContext>
 | 
			
		||||
    {
 | 
			
		||||
@@ -4,14 +4,13 @@ using Discord.WebSocket;
 | 
			
		||||
using Kasbot.Services;
 | 
			
		||||
using Kasbot.Services.Internal;
 | 
			
		||||
using Microsoft.Extensions.DependencyInjection;
 | 
			
		||||
using TextCommandFramework.Services;
 | 
			
		||||
 | 
			
		||||
namespace TextCommandFramework
 | 
			
		||||
namespace Kasbot
 | 
			
		||||
{
 | 
			
		||||
    class Program
 | 
			
		||||
    {
 | 
			
		||||
        private static string TOKEN = Environment.GetEnvironmentVariable("TOKEN");
 | 
			
		||||
        private static int SHARDS = int.Parse(Environment.GetEnvironmentVariable("SHARDS"));
 | 
			
		||||
        private static int SHARDS = int.Parse(Environment.GetEnvironmentVariable("SHARDS") ?? "0");
 | 
			
		||||
 | 
			
		||||
        static void Main(string[] args)
 | 
			
		||||
        {
 | 
			
		||||
@@ -7,7 +7,7 @@ using System;
 | 
			
		||||
using System.Reflection;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace TextCommandFramework.Services
 | 
			
		||||
namespace Kasbot.Services
 | 
			
		||||
{
 | 
			
		||||
    public class CommandHandlingService
 | 
			
		||||
    {
 | 
			
		||||
@@ -2,7 +2,7 @@ using System.IO;
 | 
			
		||||
using System.Net.Http;
 | 
			
		||||
using System.Threading.Tasks;
 | 
			
		||||
 | 
			
		||||
namespace TextCommandFramework.Services
 | 
			
		||||
namespace Kasbot.Services
 | 
			
		||||
{
 | 
			
		||||
    public class PictureService
 | 
			
		||||
    {
 | 
			
		||||
@@ -159,7 +159,8 @@ namespace Kasbot.Services
 | 
			
		||||
                (outAudioStream) =>
 | 
			
		||||
                {
 | 
			
		||||
                    Clients[guildId].CurrentAudioStream = outAudioStream;
 | 
			
		||||
                }, async (ac) =>
 | 
			
		||||
                },
 | 
			
		||||
                async (ac) =>
 | 
			
		||||
                {
 | 
			
		||||
                    if (ac.Exception != null)
 | 
			
		||||
                    {
 | 
			
		||||
							
								
								
									
										10
									
								
								Kasbot.sln
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								Kasbot.sln
									
									
									
									
									
								
							@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 | 
			
		||||
# Visual Studio Version 17
 | 
			
		||||
VisualStudioVersion = 17.4.33213.308
 | 
			
		||||
MinimumVisualStudioVersion = 10.0.40219.1
 | 
			
		||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Kasbot", "Kasbot.csproj", "{70A0CD18-5914-4104-A1A1-C531B96FCC20}"
 | 
			
		||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Kasbot.App", "Kasbot.APP\Kasbot.App.csproj", "{BD715B63-0FC8-42F5-A449-9FF029B8E599}"
 | 
			
		||||
EndProject
 | 
			
		||||
Global
 | 
			
		||||
	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 | 
			
		||||
@@ -11,10 +11,10 @@ Global
 | 
			
		||||
		Release|Any CPU = Release|Any CPU
 | 
			
		||||
	EndGlobalSection
 | 
			
		||||
	GlobalSection(ProjectConfigurationPlatforms) = postSolution
 | 
			
		||||
		{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 | 
			
		||||
		{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Debug|Any CPU.Build.0 = Debug|Any CPU
 | 
			
		||||
		{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Release|Any CPU.ActiveCfg = Release|Any CPU
 | 
			
		||||
		{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Release|Any CPU.Build.0 = Release|Any CPU
 | 
			
		||||
		{BD715B63-0FC8-42F5-A449-9FF029B8E599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 | 
			
		||||
		{BD715B63-0FC8-42F5-A449-9FF029B8E599}.Debug|Any CPU.Build.0 = Debug|Any CPU
 | 
			
		||||
		{BD715B63-0FC8-42F5-A449-9FF029B8E599}.Release|Any CPU.ActiveCfg = Release|Any CPU
 | 
			
		||||
		{BD715B63-0FC8-42F5-A449-9FF029B8E599}.Release|Any CPU.Build.0 = Release|Any CPU
 | 
			
		||||
	EndGlobalSection
 | 
			
		||||
	GlobalSection(SolutionProperties) = preSolution
 | 
			
		||||
		HideSolutionNode = FALSE
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user