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

fix commands not being added properly to discord, remove cached auth on regeneration

Browse Source
This commit is contained in:
Stanley Dimant
2022-08-30 17:12:02 +02:00
parent 900e71c8fc
commit 1fce2ac8d6
1 changed files with 73 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -10,6 +10,7 @@ using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Discord; using Discord;
using Discord.WebSocket; using Discord.WebSocket;
using MareSynchronosServices.Authentication;
using MareSynchronosShared.Data; using MareSynchronosShared.Data;
using MareSynchronosShared.Metrics; using MareSynchronosShared.Metrics;
using MareSynchronosShared.Models; using MareSynchronosShared.Models;
@@ -72,60 +73,60 @@ public class DiscordBot : IHostedService
switch (arg.Data.Name) switch (arg.Data.Name)
{ {
case "register": case "register":
{
if (arg.Data.Options.FirstOrDefault(f => f.Name == "overwrite_old_account") != null)
{ {
await DeletePreviousUserAccount(arg.User.Id).ConfigureAwait(false); if (arg.Data.Options.FirstOrDefault(f => f.Name == "overwrite_old_account") != null)
} {
await DeletePreviousUserAccount(arg.User.Id).ConfigureAwait(false);
}
var modal = new ModalBuilder(); var modal = new ModalBuilder();
modal.WithTitle("Verify with Lodestone"); modal.WithTitle("Verify with Lodestone");
modal.WithCustomId("register_modal"); modal.WithCustomId("register_modal");
modal.AddTextInput("Enter the Lodestone URL of your Character", "lodestoneurl", TextInputStyle.Short, "https://*.finalfantasyxiv.com/lodestone/character/<CHARACTERID>/", required: true); modal.AddTextInput("Enter the Lodestone URL of your Character", "lodestoneurl", TextInputStyle.Short, "https://*.finalfantasyxiv.com/lodestone/character/<CHARACTERID>/", required: true);
await arg.RespondWithModalAsync(modal.Build()).ConfigureAwait(false); await arg.RespondWithModalAsync(modal.Build()).ConfigureAwait(false);
break; break;
} }
case "recover": case "recover":
{ {
var modal = new ModalBuilder(); var modal = new ModalBuilder();
modal.WithTitle("Verify with Lodestone"); modal.WithTitle("Verify with Lodestone");
modal.WithCustomId("recover_modal"); modal.WithCustomId("recover_modal");
modal.AddTextInput("Enter the Lodestone URL of your Character", "lodestoneurl", TextInputStyle.Short, "https://*.finalfantasyxiv.com/lodestone/character/<CHARACTERID>/", required: true); modal.AddTextInput("Enter the Lodestone URL of your Character", "lodestoneurl", TextInputStyle.Short, "https://*.finalfantasyxiv.com/lodestone/character/<CHARACTERID>/", required: true);
await arg.RespondWithModalAsync(modal.Build()).ConfigureAwait(false); await arg.RespondWithModalAsync(modal.Build()).ConfigureAwait(false);
break; break;
} }
case "verify": case "verify":
{
EmbedBuilder eb = new();
if (verificationQueue.Any(u => u.User.Id == arg.User.Id))
{ {
eb.WithTitle("Already queued for verfication"); EmbedBuilder eb = new();
eb.WithDescription("You are already queued for verification. Please wait."); if (verificationQueue.Any(u => u.User.Id == arg.User.Id))
await arg.RespondAsync(embeds: new[] { eb.Build() }, ephemeral: true).ConfigureAwait(false); {
} eb.WithTitle("Already queued for verfication");
else if (!DiscordLodestoneMapping.ContainsKey(arg.User.Id)) eb.WithDescription("You are already queued for verification. Please wait.");
{ await arg.RespondAsync(embeds: new[] { eb.Build() }, ephemeral: true).ConfigureAwait(false);
eb.WithTitle("Cannot verify registration"); }
eb.WithDescription("You need to **/register** first before you can **/verify**"); else if (!DiscordLodestoneMapping.ContainsKey(arg.User.Id))
await arg.RespondAsync(embeds: new[] { eb.Build() }, ephemeral: true).ConfigureAwait(false); {
} eb.WithTitle("Cannot verify registration");
else eb.WithDescription("You need to **/register** first before you can **/verify**");
{ await arg.RespondAsync(embeds: new[] { eb.Build() }, ephemeral: true).ConfigureAwait(false);
await arg.DeferAsync(ephemeral: true).ConfigureAwait(false); }
verificationQueue.Enqueue(arg); else
} {
await arg.DeferAsync(ephemeral: true).ConfigureAwait(false);
verificationQueue.Enqueue(arg);
}
break; break;
} }
case "setvanityuid": case "setvanityuid":
{ {
EmbedBuilder eb = new(); EmbedBuilder eb = new();
var newUid = (string)arg.Data.Options.First(f => f.Name == "vanity_uid").Value; var newUid = (string)arg.Data.Options.First(f => f.Name == "vanity_uid").Value;
eb = await HandleVanityUid(eb, arg.User.Id, newUid); eb = await HandleVanityUid(eb, arg.User.Id, newUid);
await arg.RespondAsync(embeds: new[] { eb.Build() }, ephemeral: true).ConfigureAwait(false); await arg.RespondAsync(embeds: new[] { eb.Build() }, ephemeral: true).ConfigureAwait(false);
break; break;
} }
default: default:
await arg.RespondAsync("idk what you did to get here to start, just follow the instructions as provided.", ephemeral: true).ConfigureAwait(false); await arg.RespondAsync("idk what you did to get here to start, just follow the instructions as provided.", ephemeral: true).ConfigureAwait(false);
break; break;
@@ -211,19 +212,20 @@ public class DiscordBot : IHostedService
private async Task DiscordClient_ModalSubmitted(SocketModal arg) private async Task DiscordClient_ModalSubmitted(SocketModal arg)
{ {
switch (arg.Data.CustomId) { switch (arg.Data.CustomId)
{
case "register_modal": case "register_modal":
{ {
var embed = await HandleRegisterModalAsync(arg).ConfigureAwait(false); var embed = await HandleRegisterModalAsync(arg).ConfigureAwait(false);
await arg.RespondAsync(embeds: new Embed[] {embed}, ephemeral: true).ConfigureAwait(false); await arg.RespondAsync(embeds: new Embed[] { embed }, ephemeral: true).ConfigureAwait(false);
break; break;
} }
case "recover_modal": case "recover_modal":
{ {
var embed = await HandleRecoverModalAsync(arg).ConfigureAwait(false); var embed = await HandleRecoverModalAsync(arg).ConfigureAwait(false);
await arg.RespondAsync(embeds: new Embed[] {embed}, ephemeral: true).ConfigureAwait(false); await arg.RespondAsync(embeds: new Embed[] { embed }, ephemeral: true).ConfigureAwait(false);
break; break;
} }
} }
} }
@@ -375,6 +377,9 @@ public class DiscordBot : IHostedService
await db.Auth.AddAsync(auth).ConfigureAwait(false); await db.Auth.AddAsync(auth).ConfigureAwait(false);
await db.SaveChangesAsync().ConfigureAwait(false); await db.SaveChangesAsync().ConfigureAwait(false);
var authHandler = scope.ServiceProvider.GetService<SecretKeyAuthenticationHandler>();
authHandler.RemoveAuthentication(existingLodestoneAuth.User.UID);
} }
} }
@@ -510,10 +515,16 @@ public class DiscordBot : IHostedService
var guild = (await discordClient.Rest.GetGuildsAsync()).First(); var guild = (await discordClient.Rest.GetGuildsAsync()).First();
var commands = await guild.GetApplicationCommandsAsync(); var commands = await guild.GetApplicationCommandsAsync();
if (!commands.Any(c => c.Name.Contains("setvanityuid"))) if (!commands.Any(c => c.Name.Contains("register")))
{ {
await guild.CreateApplicationCommandAsync(register.Build()).ConfigureAwait(false); await guild.CreateApplicationCommandAsync(register.Build()).ConfigureAwait(false);
}
if (!commands.Any(c => c.Name.Contains("verify")))
{
await guild.CreateApplicationCommandAsync(verify.Build()).ConfigureAwait(false); await guild.CreateApplicationCommandAsync(verify.Build()).ConfigureAwait(false);
}
if (!commands.Any(c => c.Name.Contains("setvanityuid")))
{
await guild.CreateApplicationCommandAsync(recover.Build()).ConfigureAwait(false); await guild.CreateApplicationCommandAsync(recover.Build()).ConfigureAwait(false);
var vanityCommand = await guild.CreateApplicationCommandAsync(vanityuid.Build()).ConfigureAwait(false); var vanityCommand = await guild.CreateApplicationCommandAsync(vanityuid.Build()).ConfigureAwait(false);
vanityCommandId = vanityCommand.Id; vanityCommandId = vanityCommand.Id;
@@ -522,6 +533,10 @@ public class DiscordBot : IHostedService
{ {
vanityCommandId = commands.First(c => c.Name.Contains("setvanityuid")).Id; vanityCommandId = commands.First(c => c.Name.Contains("setvanityuid")).Id;
} }
if (!commands.Any(c => c.Name.Contains("recover")))
{
await guild.CreateApplicationCommandAsync(recover.Build()).ConfigureAwait(false);
}
} }
catch (Exception ex) catch (Exception ex)
{ {