From 9a1a8ecd1c87974d6a2f571e31d9a46d5b456032 Mon Sep 17 00:00:00 2001 From: Eveldee Date: Thu, 3 Nov 2022 15:15:25 +0100 Subject: [PATCH] Initial commit --- .gitignore | 688 ++++++++++++++++++++++ Cocotte.sln | 16 + Cocotte/Cocotte.csproj | 14 + Cocotte/Modules/PingModule.cs | 19 + Cocotte/Options/DiscordOptions.cs | 9 + Cocotte/Program.cs | 40 ++ Cocotte/Properties/launchSettings.json | 11 + Cocotte/Services/CocotteService.cs | 122 ++++ Cocotte/Services/DiscordLoggingService.cs | 56 ++ Cocotte/Services/SharedCounter.cs | 6 + Cocotte/Utils/LogExtensions.cs | 29 + Cocotte/appsettings.Development.json | 8 + Cocotte/appsettings.json | 8 + 13 files changed, 1026 insertions(+) create mode 100644 .gitignore create mode 100644 Cocotte.sln create mode 100644 Cocotte/Cocotte.csproj create mode 100644 Cocotte/Modules/PingModule.cs create mode 100644 Cocotte/Options/DiscordOptions.cs create mode 100644 Cocotte/Program.cs create mode 100644 Cocotte/Properties/launchSettings.json create mode 100644 Cocotte/Services/CocotteService.cs create mode 100644 Cocotte/Services/DiscordLoggingService.cs create mode 100644 Cocotte/Services/SharedCounter.cs create mode 100644 Cocotte/Utils/LogExtensions.cs create mode 100644 Cocotte/appsettings.Development.json create mode 100644 Cocotte/appsettings.json diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9ddd1c8 --- /dev/null +++ b/.gitignore @@ -0,0 +1,688 @@ +# Created by https://www.toptal.com/developers/gitignore/api/visualstudio,visualstudiocode,rider,csharp,dotnetcore +# Edit at https://www.toptal.com/developers/gitignore?templates=visualstudio,visualstudiocode,rider,csharp,dotnetcore + +### Csharp ### +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/main/VisualStudio.gitignore + +.idea + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Ww][Ii][Nn]32/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# ASP.NET Scaffolding +ScaffoldingReadMe.txt + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.tlog +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Coverlet is a free, cross platform Code Coverage Tool +coverage*.json +coverage*.xml +coverage*.info + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) +*.vbp + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) +*.dsw +*.dsp + +# Visual Studio 6 technical files + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# Visual Studio History (VSHistory) files +.vshistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ + +# Fody - auto-generated XML schema +FodyWeavers.xsd + +# VS Code files for those working on multiple tools +.vscode/* +!.vscode/settings.json +!.vscode/tasks.json +!.vscode/launch.json +!.vscode/extensions.json +*.code-workspace + +# Local History for Visual Studio Code +.history/ + +# Windows Installer files from build outputs +*.cab +*.msi +*.msix +*.msm +*.msp + +# JetBrains Rider +*.sln.iml + +### DotnetCore ### +# .NET Core build folders +bin/ +obj/ + +# Common node modules locations +/node_modules +/wwwroot/node_modules + +### Rider ### +# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider +# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 + +# User-specific stuff +.idea/**/workspace.xml +.idea/**/tasks.xml +.idea/**/usage.statistics.xml +.idea/**/dictionaries +.idea/**/shelf + +# AWS User-specific +.idea/**/aws.xml + +# Generated files +.idea/**/contentModel.xml + +# Sensitive or high-churn files +.idea/**/dataSources/ +.idea/**/dataSources.ids +.idea/**/dataSources.local.xml +.idea/**/sqlDataSources.xml +.idea/**/dynamic.xml +.idea/**/uiDesigner.xml +.idea/**/dbnavigator.xml + +# Gradle +.idea/**/gradle.xml +.idea/**/libraries + +# Gradle and Maven with auto-import +# When using Gradle or Maven with auto-import, you should exclude module files, +# since they will be recreated, and may cause churn. Uncomment if using +# auto-import. +# .idea/artifacts +# .idea/compiler.xml +# .idea/jarRepositories.xml +# .idea/modules.xml +# .idea/*.iml +# .idea/modules +# *.iml +# *.ipr + +# CMake +cmake-build-*/ + +# Mongo Explorer plugin +.idea/**/mongoSettings.xml + +# File-based project format +*.iws + +# IntelliJ +out/ + +# mpeltonen/sbt-idea plugin +.idea_modules/ + +# JIRA plugin +atlassian-ide-plugin.xml + +# Cursive Clojure plugin +.idea/replstate.xml + +# SonarLint plugin +.idea/sonarlint/ + +# Crashlytics plugin (for Android Studio and IntelliJ) +com_crashlytics_export_strings.xml +crashlytics.properties +crashlytics-build.properties +fabric.properties + +# Editor-based Rest Client +.idea/httpRequests + +# Android studio 3.1+ serialized cache file +.idea/caches/build_file_checksums.ser + +### VisualStudioCode ### +!.vscode/*.code-snippets + +# Local History for Visual Studio Code + +# Built Visual Studio Code Extensions +*.vsix + +### VisualStudioCode Patch ### +# Ignore all local history of files +.history +.ionide + +### VisualStudio ### + +# User-specific files + +# User-specific files (MonoDevelop/Xamarin Studio) + +# Mono auto generated files + +# Build results + +# Visual Studio 2015/2017 cache/options directory +# Uncomment if you have tasks that create the project's static files in wwwroot + +# Visual Studio 2017 auto generated files + +# MSTest test Results + +# NUnit + +# Build Results of an ATL Project + +# Benchmark Results + +# .NET Core + +# ASP.NET Scaffolding + +# StyleCop + +# Files built by Visual Studio + +# Chutzpah Test files + +# Visual C++ cache files + +# Visual Studio profiler + +# Visual Studio Trace Files + +# TFS 2012 Local Workspace + +# Guidance Automation Toolkit + +# ReSharper is a .NET coding add-in + +# TeamCity is a build add-in + +# DotCover is a Code Coverage Tool + +# AxoCover is a Code Coverage Tool + +# Coverlet is a free, cross platform Code Coverage Tool + +# Visual Studio code coverage results + +# NCrunch + +# MightyMoose + +# Web workbench (sass) + +# Installshield output folder + +# DocProject is a documentation generator add-in + +# Click-Once directory + +# Publish Web Output +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted + +# NuGet Packages +# NuGet Symbol Packages +# The packages folder can be ignored because of Package Restore +# except build/, which is used as an MSBuild target. +# Uncomment if necessary however generally it will be regenerated when needed +# NuGet v3's project.json files produces more ignorable files + +# Microsoft Azure Build Output + +# Microsoft Azure Emulator + +# Windows Store app package directories and files + +# Visual Studio cache files +# files ending in .cache can be ignored +# but keep track of directories ending in .cache + +# Others + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) + +# RIA/Silverlight projects + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) + +# SQL Server files + +# Business Intelligence projects + +# Microsoft Fakes + +# GhostDoc plugin setting file + +# Node.js Tools for Visual Studio + +# Visual Studio 6 build log + +# Visual Studio 6 workspace options file + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) + +# Visual Studio 6 auto-generated project file (contains which files were open etc.) + +# Visual Studio 6 workspace and project file (working project files containing files to include in project) + +# Visual Studio 6 technical files + +# Visual Studio LightSwitch build output + +# Paket dependency manager + +# FAKE - F# Make + +# CodeRush personal settings + +# Python Tools for Visual Studio (PTVS) + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio + +# Telerik's JustMock configuration file + +# BizTalk build output + +# OpenCover UI analysis results + +# Azure Stream Analytics local run output + +# MSBuild Binary and Structured Log + +# NVidia Nsight GPU debugger configuration file + +# MFractors (Xamarin productivity tool) working folder + +# Local History for Visual Studio + +# Visual Studio History (VSHistory) files + +# BeatPulse healthcheck temp database + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 + +# Ionide (cross platform F# VS Code tools) working folder + +# Fody - auto-generated XML schema + +# VS Code files for those working on multiple tools + +# Local History for Visual Studio Code + +# Windows Installer files from build outputs + +# JetBrains Rider + +### VisualStudio Patch ### +# Additional files built by Visual Studio + +# End of https://www.toptal.com/developers/gitignore/api/visualstudio,visualstudiocode,rider,csharp,dotnetcore + +Cocotte/discord.json \ No newline at end of file diff --git a/Cocotte.sln b/Cocotte.sln new file mode 100644 index 0000000..68f1071 --- /dev/null +++ b/Cocotte.sln @@ -0,0 +1,16 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Cocotte", "Cocotte\Cocotte.csproj", "{51D69B53-9040-419B-8B87-6AB6712CCCD7}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {51D69B53-9040-419B-8B87-6AB6712CCCD7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {51D69B53-9040-419B-8B87-6AB6712CCCD7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {51D69B53-9040-419B-8B87-6AB6712CCCD7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {51D69B53-9040-419B-8B87-6AB6712CCCD7}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection +EndGlobal diff --git a/Cocotte/Cocotte.csproj b/Cocotte/Cocotte.csproj new file mode 100644 index 0000000..a0c0757 --- /dev/null +++ b/Cocotte/Cocotte.csproj @@ -0,0 +1,14 @@ + + + + net6.0 + enable + enable + dotnet-Cocotter-70E782F3-B3C1-4BA0-965D-D21E31F2F052 + + + + + + + diff --git a/Cocotte/Modules/PingModule.cs b/Cocotte/Modules/PingModule.cs new file mode 100644 index 0000000..7cdac92 --- /dev/null +++ b/Cocotte/Modules/PingModule.cs @@ -0,0 +1,19 @@ +using Discord.Interactions; + +namespace Cocotte.Modules; + +public class PingModule : InteractionModuleBase +{ + private readonly ILogger _logger; + + public PingModule(ILogger logger) + { + _logger = logger; + } + + [SlashCommand("ping", "Check if Coco is alive")] + public async Task Ping() + { + await RespondAsync($":ping_pong: It took me {Context.Client.Latency}ms to respond to you!", ephemeral: true); + } +} \ No newline at end of file diff --git a/Cocotte/Options/DiscordOptions.cs b/Cocotte/Options/DiscordOptions.cs new file mode 100644 index 0000000..cec39fc --- /dev/null +++ b/Cocotte/Options/DiscordOptions.cs @@ -0,0 +1,9 @@ +namespace Cocotte.Options; + +public class DiscordOptions +{ + public const string SectionName = "DiscordOptions"; + + public string? Token { get; init; } + public ulong? DevGuildId { get; init; } +} \ No newline at end of file diff --git a/Cocotte/Program.cs b/Cocotte/Program.cs new file mode 100644 index 0000000..3d8ee51 --- /dev/null +++ b/Cocotte/Program.cs @@ -0,0 +1,40 @@ +using Cocotte; +using Cocotte.Options; +using Cocotte.Services; +using Discord; +using Discord.Commands; +using Discord.Interactions; +using Discord.WebSocket; + +DiscordSocketConfig discordSocketConfig = new() +{ + LogLevel = LogSeverity.Debug, + MessageCacheSize = 200 +}; + +IHost host = Host.CreateDefaultBuilder(args) + .ConfigureAppConfiguration((_, configuration) => + { + configuration.AddJsonFile("discord.json", false, false); + }) + .ConfigureServices((context, services) => + { + // Options + services.Configure(context.Configuration.GetSection(DiscordOptions.SectionName)); + + // Discord.Net + services.AddHostedService(); + + services.AddSingleton(); + services.AddSingleton(discordSocketConfig); + services.AddSingleton(); + services.AddSingleton(x => new InteractionService(x.GetRequiredService())); + + services.AddHostedService(); + + // Custom + services.AddSingleton(); + }) + .Build(); + +await host.RunAsync(); \ No newline at end of file diff --git a/Cocotte/Properties/launchSettings.json b/Cocotte/Properties/launchSettings.json new file mode 100644 index 0000000..e499d8b --- /dev/null +++ b/Cocotte/Properties/launchSettings.json @@ -0,0 +1,11 @@ +{ + "profiles": { + "Cocotter": { + "commandName": "Project", + "dotnetRunMessages": true, + "environmentVariables": { + "DOTNET_ENVIRONMENT": "Development" + } + } + } +} diff --git a/Cocotte/Services/CocotteService.cs b/Cocotte/Services/CocotteService.cs new file mode 100644 index 0000000..49271fd --- /dev/null +++ b/Cocotte/Services/CocotteService.cs @@ -0,0 +1,122 @@ +using System.Reflection; +using Cocotte.Options; +using Cocotte.Utils; +using Discord; +using Discord.Interactions; +using Discord.WebSocket; +using Microsoft.Extensions.Options; + +namespace Cocotte.Services; + +public class CocotteService : BackgroundService +{ + private readonly ILogger _logger; + private readonly IServiceProvider _serviceProvider; + private readonly IHostEnvironment _hostEnvironment; + private readonly IHostApplicationLifetime _hostApplicationLifetime; + private readonly DiscordSocketClient _client; + private readonly DiscordOptions _options; + private readonly InteractionService _interactionService; + + public CocotteService(ILogger logger, IServiceProvider serviceProvider, + IHostEnvironment hostEnvironment, + IHostApplicationLifetime hostApplicationLifetime, DiscordSocketClient client, + IOptions options, InteractionService interactionService) + { + _logger = logger; + _serviceProvider = serviceProvider; + _hostApplicationLifetime = hostApplicationLifetime; + _client = client; + _options = options.Value; + _interactionService = interactionService; + _hostEnvironment = hostEnvironment; + } + + protected override async Task ExecuteAsync(CancellationToken stoppingToken) + { + // Check token first + if (_options.Token is null) + { + _logger.LogError("Couldn't find any discord bot token, exiting..."); + + _hostApplicationLifetime.StopApplication(); + + return; + } + + // Initialize modules and commands + await _interactionService.AddModulesAsync(Assembly.GetEntryAssembly(), _serviceProvider); + + _client.Ready += ClientOnReady; + _client.InteractionCreated += HandleInteraction; + + // Start bot + await _client.LoginAsync(TokenType.Bot, _options.Token); + await _client.StartAsync(); + + await Task.Delay(Timeout.Infinite, stoppingToken); + } + + private async Task ClientOnReady() + { + // Context & Slash commands can be automatically registered, but this process needs to happen after the client enters the READY state. + // Since Global Commands take around 1 hour to register, we should use a test guild to instantly update and test our commands. + if (_hostEnvironment.IsDevelopment()) + { + // Check that a dev guild is set + if (!_options.DevGuildId.HasValue) + { + _logger.LogError("Couldn't find any dev guild while application is run in dev mode, exiting..."); + + _hostApplicationLifetime.StopApplication(); + + return; + } + await _interactionService.RegisterCommandsToGuildAsync(_options.DevGuildId.Value, true); + } + else + { + await _interactionService.RegisterCommandsGloballyAsync(); + } + } + + public override async Task StopAsync(CancellationToken cancellationToken) + { + await _client.StopAsync(); + } + + private async Task HandleInteraction(SocketInteraction interaction) + { + _logger.LogTrace("[Interaction/Trace] Received interaction: by {user} in #{channel} of type {type}", interaction.User, interaction.Channel, interaction.Type); + + try + { + // Create an execution context that matches the generic type parameter of your InteractionModuleBase modules. + var context = new SocketInteractionContext(_client, interaction); + + // Execute the incoming command. + var result = await _interactionService.ExecuteCommandAsync(context, _serviceProvider); + + if (!result.IsSuccess) + { + _logger.LogDebug("[Interaction/Trace] Error while executing interaction: {interaction} in {channel}", interaction.Token, interaction.Channel); + + switch (result.Error) + { + case InteractionCommandError.UnmetPrecondition: + // implement + break; + } + } + } + catch + { + // If Slash Command execution fails it is most likely that the original interaction acknowledgement will persist. It is a good idea to delete the original + // response, or at least let the user know that something went wrong during the command execution. + if (interaction.Type is InteractionType.ApplicationCommand) + { + await interaction.GetOriginalResponseAsync().ContinueWith(async msg => await msg.Result.DeleteAsync()); + } + } + } +} \ No newline at end of file diff --git a/Cocotte/Services/DiscordLoggingService.cs b/Cocotte/Services/DiscordLoggingService.cs new file mode 100644 index 0000000..a509923 --- /dev/null +++ b/Cocotte/Services/DiscordLoggingService.cs @@ -0,0 +1,56 @@ +using Cocotte.Utils; +using Discord; +using Discord.Commands; +using Discord.WebSocket; + +namespace Cocotte.Services; + +public class DiscordLoggingService : IHostedService +{ + private readonly ILogger _logger; + private readonly DiscordSocketClient _client; + private readonly CommandService _command; + + public DiscordLoggingService(ILogger logger, DiscordSocketClient client, + CommandService command) + { + _logger = logger; + _client = client; + _command = command; + } + + public Task StartAsync(CancellationToken cancellationToken) + { + _client.Log += LogAsync; + _command.Log += LogAsync; + + return Task.CompletedTask; + } + + public Task StopAsync(CancellationToken cancellationToken) + { + _client.Log -= LogAsync; + _command.Log -= LogAsync; + + return Task.CompletedTask; + } + + private Task LogAsync(LogMessage message) + { + if (message.Exception is CommandException cmdException) + { + _logger.Log(message.Severity.ToLogLevel(), cmdException, + "[Command/{severity}] ({source}) {commandName} failed to execute in {channel}.", + message.Source, + message.Severity, + cmdException.Command.Aliases.First(), + cmdException.Context.Channel); + } + else + { + _logger.Log(message.Severity.ToLogLevel(), message.Exception, "[General/{severity}] ({source}) {message}", message.Severity, message.Source, message.Message); + } + + return Task.CompletedTask; + } +} \ No newline at end of file diff --git a/Cocotte/Services/SharedCounter.cs b/Cocotte/Services/SharedCounter.cs new file mode 100644 index 0000000..e96803f --- /dev/null +++ b/Cocotte/Services/SharedCounter.cs @@ -0,0 +1,6 @@ +namespace Cocotte.Services; + +public class SharedCounter +{ + public int Count { get; set; } = 0; +} \ No newline at end of file diff --git a/Cocotte/Utils/LogExtensions.cs b/Cocotte/Utils/LogExtensions.cs new file mode 100644 index 0000000..56b5cf0 --- /dev/null +++ b/Cocotte/Utils/LogExtensions.cs @@ -0,0 +1,29 @@ +using Discord; + +namespace Cocotte.Utils; + +public static class LogExtensions +{ + public static LogLevel ToLogLevel(this LogSeverity severity) => severity switch + { + LogSeverity.Critical => LogLevel.Critical, + LogSeverity.Debug => LogLevel.Debug, + LogSeverity.Error => LogLevel.Error, + LogSeverity.Info => LogLevel.Information, + LogSeverity.Verbose => LogLevel.Trace, + LogSeverity.Warning => LogLevel.Warning, + _ => throw new ArgumentOutOfRangeException(nameof(severity), severity, null) + }; + + public static void WriteToLogger(this LogMessage message, ILogger logger) + { + if (message.Severity == LogSeverity.Critical) + { + logger.LogCritical(message.Exception, "Discord.Net log from {source}: {message}", message.Source, message.Message); + } + else + { + logger.Log(message.Severity.ToLogLevel(), "Discord.Net log from {source}: {message}", message.Source, message.Message); + } + } +} \ No newline at end of file diff --git a/Cocotte/appsettings.Development.json b/Cocotte/appsettings.Development.json new file mode 100644 index 0000000..b2dcdb6 --- /dev/null +++ b/Cocotte/appsettings.Development.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.Hosting.Lifetime": "Information" + } + } +} diff --git a/Cocotte/appsettings.json b/Cocotte/appsettings.json new file mode 100644 index 0000000..b2dcdb6 --- /dev/null +++ b/Cocotte/appsettings.json @@ -0,0 +1,8 @@ +{ + "Logging": { + "LogLevel": { + "Default": "Information", + "Microsoft.Hosting.Lifetime": "Information" + } + } +}