friendlynamazu/server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix check for vanity roles

Browse Source
This commit is contained in:
rootdarkarchon
2023-10-21 02:00:21 +02:00
parent b0a05800b9
commit 6006f42fc2
1 changed files with 3 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -204,9 +204,9 @@ internal class DiscordBot : IHostedService
await _interactionModule.RegisterCommandsToGuildAsync(guild.Id, true).ConfigureAwait(false); await _interactionModule.RegisterCommandsToGuildAsync(guild.Id, true).ConfigureAwait(false);
await CreateOrUpdateModal(guild).ConfigureAwait(false); await CreateOrUpdateModal(guild).ConfigureAwait(false);
_ = UpdateVanityRoles(guild);
_ = RemoveUsersNotInVanityRole(); _ = RemoveUsersNotInVanityRole();
_ = ProcessReportsQueue(); _ = ProcessReportsQueue();
_ = UpdateVanityRoles(guild);
} }
private async Task UpdateVanityRoles(RestGuild guild) private async Task UpdateVanityRoles(RestGuild guild)
@@ -395,9 +395,7 @@ internal class DiscordBot : IHostedService
_vanityUpdateCts = new(); _vanityUpdateCts = new();
var token = _vanityUpdateCts.Token; var token = _vanityUpdateCts.Token;
var guild = (await _discordClient.Rest.GetGuildsAsync()).First(); var guild = (await _discordClient.Rest.GetGuildsAsync()).First();
var commands = await guild.GetApplicationCommandsAsync();
var appId = await _discordClient.GetApplicationInfoAsync().ConfigureAwait(false); var appId = await _discordClient.GetApplicationInfoAsync().ConfigureAwait(false);
var vanityCommandId = commands.First(c => c.ApplicationId == appId.Id && c.Name == "setvanityuid").Id;
while (!token.IsCancellationRequested) while (!token.IsCancellationRequested)
{ {
@@ -406,31 +404,9 @@ internal class DiscordBot : IHostedService
_logger.LogInformation($"Cleaning up Vanity UIDs"); _logger.LogInformation($"Cleaning up Vanity UIDs");
_logger.LogInformation("Getting application commands from guild {guildName}", guild.Name); _logger.LogInformation("Getting application commands from guild {guildName}", guild.Name);
var restGuild = await _discordClient.Rest.GetGuildAsync(guild.Id); var restGuild = await _discordClient.Rest.GetGuildAsync(guild.Id);
var vanityCommand = await restGuild.GetSlashCommandAsync(vanityCommandId).ConfigureAwait(false);
GuildApplicationCommandPermission commandPermissions = null;
try
{
_logger.LogInformation($"Getting command permissions");
commandPermissions = await vanityCommand.GetCommandPermission().ConfigureAwait(false);
}
catch (Exception ex)
{
_logger.LogError(ex, "Error getting command permissions");
throw new Exception("Can't get command permissions");
}
_logger.LogInformation($"Getting allowed role ids from permissions"); ulong[] allowedRoleIds = _configurationService.GetValueOrDefault(nameof(ServicesConfiguration.VanityRoles), Array.Empty<ulong>());
List<ulong> allowedRoleIds = new(); _logger.LogInformation($"Allowed role ids: {string.Join(", ", allowedRoleIds)}");
try
{
allowedRoleIds = (from perm in commandPermissions.Permissions where perm.TargetType == ApplicationCommandPermissionTarget.Role where perm.Permission select perm.TargetId).ToList();
}
catch (Exception ex)
{
_logger.LogError(ex, "Error resolving permissions to roles");
}
_logger.LogInformation($"Found allowed role ids: {string.Join(", ", allowedRoleIds)}");
if (allowedRoleIds.Any()) if (allowedRoleIds.Any())
{ {