t0w0bi/ClubPenguinServer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

potentially fix discord bot

Browse Source
This commit is contained in:
rootdarkarchon
2023-02-01 19:26:00 +01:00
parent 3f31e14b68
commit 39b9427b5c
1 changed files with 10 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
MareSynchronosServer/MareSynchronosServices/Discord/DiscordBot.cs
View File

@@ -20,6 +20,7 @@ internal class DiscordBot : IHostedService
private readonly DiscordSocketClient _discordClient; private readonly DiscordSocketClient _discordClient;
private CancellationTokenSource? _updateStatusCts; private CancellationTokenSource? _updateStatusCts;
private CancellationTokenSource? _vanityUpdateCts; private CancellationTokenSource? _vanityUpdateCts;
private InteractionService _interactionModule;
public DiscordBot(DiscordBotServices botServices, IServiceProvider services, IConfigurationService<ServicesConfiguration> configuration, public DiscordBot(DiscordBotServices botServices, IServiceProvider services, IConfigurationService<ServicesConfiguration> configuration,
ILogger<DiscordBot> logger, IConnectionMultiplexer connectionMultiplexer) ILogger<DiscordBot> logger, IConnectionMultiplexer connectionMultiplexer)
@@ -40,15 +41,7 @@ internal class DiscordBot : IHostedService
private async Task DiscordClient_Ready() private async Task DiscordClient_Ready()
{ {
var guild = (await _discordClient.Rest.GetGuildsAsync()).First(); var guild = (await _discordClient.Rest.GetGuildsAsync()).First();
var interactionModule = new InteractionService(_discordClient); await _interactionModule.RegisterCommandsToGuildAsync(guild.Id, true).ConfigureAwait(false);
await interactionModule.AddModuleAsync(typeof(MareModule), _services).ConfigureAwait(false);
await interactionModule.RegisterCommandsToGuildAsync(guild.Id, true).ConfigureAwait(false);
_discordClient.InteractionCreated += async (x) =>
{
var ctx = new SocketInteractionContext(_discordClient, x);
await interactionModule.ExecuteCommandAsync(ctx, _services);
};
_ = RemoveUsersNotInVanityRole(); _ = RemoveUsersNotInVanityRole();
} }
@@ -192,10 +185,18 @@ internal class DiscordBot : IHostedService
var token = _configurationService.GetValueOrDefault(nameof(ServicesConfiguration.DiscordBotToken), string.Empty); var token = _configurationService.GetValueOrDefault(nameof(ServicesConfiguration.DiscordBotToken), string.Empty);
if (!string.IsNullOrEmpty(token)) if (!string.IsNullOrEmpty(token))
{ {
_interactionModule = new InteractionService(_discordClient);
await _interactionModule.AddModuleAsync(typeof(MareModule), _services).ConfigureAwait(false);
await _discordClient.LoginAsync(TokenType.Bot, token).ConfigureAwait(false); await _discordClient.LoginAsync(TokenType.Bot, token).ConfigureAwait(false);
await _discordClient.StartAsync().ConfigureAwait(false); await _discordClient.StartAsync().ConfigureAwait(false);
_discordClient.Ready += DiscordClient_Ready; _discordClient.Ready += DiscordClient_Ready;
_discordClient.InteractionCreated += async (x) =>
{
var ctx = new SocketInteractionContext(_discordClient, x);
await _interactionModule.ExecuteCommandAsync(ctx, _services);
};
await _botServices.Start(); await _botServices.Start();
_ = UpdateStatusAsync(); _ = UpdateStatusAsync();