ivanch/kasbot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changing folder structure

Browse Source
This commit is contained in:
José Henrique Ivanchechen 2023-08-10 16:01:39 -03:00
parent 73b0bac359
commit 3b2a4dc6d5
16 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -1,7 +1,7 @@
appsettings.*.json appsettings.*.json
.env* .env*
Properties/launchSettings.json Kasbot.APP/*/launchSettings.json
.vs .vs
.vscode .vscode

5
Dockerfile
View File

@ -2,9 +2,12 @@ FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build-env
WORKDIR /App WORKDIR /App
# Copy everything # Copy everything
COPY . ./ COPY ./Kasbot.APP ./Kasbot.APP
COPY ./Kasbot.sln ./Kasbot.sln
# Restore as distinct layers # Restore as distinct layers
RUN dotnet restore RUN dotnet restore
# Build a release # Build a release
RUN dotnet build -c Release -o out RUN dotnet build -c Release -o out

0
Annotations/FlagAttribute.cs → Kasbot.APP/Annotations/FlagAttribute.cs
View File

0
Extensions/RestMessageExtensions.cs → Kasbot.APP/Extensions/RestMessageExtensions.cs
View File

0
Extensions/SocketMessageExtensions.cs → Kasbot.APP/Extensions/SocketMessageExtensions.cs
View File

2
Kasbot.csproj → Kasbot.APP/Kasbot.App.csproj
View File

@ -14,7 +14,7 @@
</ItemGroup> </ItemGroup>
<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="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
<PackageReference Include="YoutubeExplode" Version="6.3.1" /> <PackageReference Include="YoutubeExplode" Version="6.3.1" />
</ItemGroup> </ItemGroup>

0
Models/Connection.cs → Kasbot.APP/Models/Connection.cs
View File

0
Models/Flags.cs → Kasbot.APP/Models/Flags.cs
View File

4
Modules/CommandModule.cs → Kasbot.APP/Modules/CommandModule.cs
View File

@ -2,9 +2,9 @@ using Discord;
using Discord.Commands; using Discord.Commands;
using Kasbot.Models; using Kasbot.Models;
using Kasbot.Services; using Kasbot.Services;
using TextCommandFramework.Services; using Kasbot.Services;
namespace TextCommandFramework.Modules namespace Kasbot.Modules
{ {
public class CommandModule : ModuleBase<ShardedCommandContext> public class CommandModule : ModuleBase<ShardedCommandContext>
{ {

5
Program.cs → Kasbot.APP/Program.cs
View File

@ -4,14 +4,13 @@ using Discord.WebSocket;
using Kasbot.Services; using Kasbot.Services;
using Kasbot.Services.Internal; using Kasbot.Services.Internal;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using TextCommandFramework.Services;
namespace TextCommandFramework namespace Kasbot
{ {
class Program class Program
{ {
private static string TOKEN = Environment.GetEnvironmentVariable("TOKEN"); 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) static void Main(string[] args)
{ {

2
Services/CommandHandlingService.cs → Kasbot.APP/Services/CommandHandlingService.cs
View File

@ -7,7 +7,7 @@ using System;
using System.Reflection; using System.Reflection;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace TextCommandFramework.Services namespace Kasbot.Services
{ {
public class CommandHandlingService public class CommandHandlingService
{ {

0
Services/Internal/AudioService.cs → Kasbot.APP/Services/Internal/AudioService.cs
View File

0
Services/Internal/YoutubeService.cs → Kasbot.APP/Services/Internal/YoutubeService.cs
View File

2
Services/PictureService.cs → Kasbot.APP/Services/PictureService.cs
View File

@ -2,7 +2,7 @@ using System.IO;
using System.Net.Http; using System.Net.Http;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace TextCommandFramework.Services namespace Kasbot.Services
{ {
public class PictureService public class PictureService
{ {

3
Services/PlayerService.cs → Kasbot.APP/Services/PlayerService.cs
View File

@ -159,7 +159,8 @@ namespace Kasbot.Services
(outAudioStream) => (outAudioStream) =>
{ {
Clients[guildId].CurrentAudioStream = outAudioStream; Clients[guildId].CurrentAudioStream = outAudioStream;
}, async (ac) => },
async (ac) =>
{ {
if (ac.Exception != null) if (ac.Exception != null)
{ {

10
Kasbot.sln
View File

@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17 # Visual Studio Version 17
VisualStudioVersion = 17.4.33213.308 VisualStudioVersion = 17.4.33213.308
MinimumVisualStudioVersion = 10.0.40219.1 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 EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -11,10 +11,10 @@ Global
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {BD715B63-0FC8-42F5-A449-9FF029B8E599}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Debug|Any CPU.Build.0 = Debug|Any CPU {BD715B63-0FC8-42F5-A449-9FF029B8E599}.Debug|Any CPU.Build.0 = Debug|Any CPU
{70A0CD18-5914-4104-A1A1-C531B96FCC20}.Release|Any CPU.ActiveCfg = Release|Any CPU {BD715B63-0FC8-42F5-A449-9FF029B8E599}.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}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE