From a98e8ba43e865444aa8f2d86d8fe241766896a1a Mon Sep 17 00:00:00 2001 From: mctaylors <95250141+mctaylors@users.noreply.github.com> Date: Sun, 23 Jul 2023 23:23:51 +0300 Subject: [PATCH] resolving issues --- src/Data/GuildSettings.cs | 2 +- src/Services/GuildUpdateService.cs | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/src/Data/GuildSettings.cs b/src/Data/GuildSettings.cs index 797adeb..bd5757d 100644 --- a/src/Data/GuildSettings.cs +++ b/src/Data/GuildSettings.cs @@ -41,7 +41,7 @@ public static class GuildSettings { public static readonly BoolOption AutoStartEvents = new("AutoStartEvents", false); /// - /// Controls the editing of the display name in the guild when the user tries to hoist themselves. + /// Controls whether or not users who try to hoist themselves should be renamed. /// public static readonly BoolOption RenameHoistedUsers = new("RenameHoistedUsers", false); diff --git a/src/Services/GuildUpdateService.cs b/src/Services/GuildUpdateService.cs index 8f5838e..f621653 100644 --- a/src/Services/GuildUpdateService.cs +++ b/src/Services/GuildUpdateService.cs @@ -134,7 +134,7 @@ public partial class GuildUpdateService : BackgroundService { if (!guildMemberResult.IsDefined(out var guildMember)) return; if (!guildMember.User.IsDefined(out var user)) return; - await TickMemberAsync(guildId, user, guildMember, memberData, defaultRole, ct); + await TickMemberAsync(guildId, user, guildMember, memberData, defaultRole, data.Settings, ct); } var eventsResult = await _eventApi.ListScheduledEventsForGuildAsync(guildId, ct: ct); @@ -214,7 +214,7 @@ public partial class GuildUpdateService : BackgroundService { private async Task TickMemberAsync( Snowflake guildId, IUser user, IGuildMember member, MemberData memberData, Snowflake defaultRole, - CancellationToken ct) { + JsonNode cfg, CancellationToken ct) { if (defaultRole.Value is not 0 && !memberData.Roles.Contains(defaultRole.Value)) _ = _guildApi.AddGuildMemberRoleAsync( guildId, user.ID, defaultRole, ct: ct); @@ -231,7 +231,6 @@ public partial class GuildUpdateService : BackgroundService { for (var i = memberData.Reminders.Count - 1; i >= 0; i--) await TickReminderAsync(memberData.Reminders[i], user, memberData, ct); - var cfg = await _dataService.GetSettings(guildId, ct); if (GuildSettings.RenameHoistedUsers.Get(cfg)) await FilterNicknameAsync(guildId, user, member, ct); }