TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-04-20 00:43:36 +03:00
Code Issues Wiki Activity

resolving issues

Browse source
This commit is contained in:
Macintxsh 2023-07-23 23:23:51 +03:00
parent d5ee8592c4
commit a98e8ba43e
Signed by: mctaylors
GPG key ID: 2E1BF7AD0D4BB0B4
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Data/GuildSettings.cs
View file

@ -41,7 +41,7 @@ public static class GuildSettings {
public static readonly BoolOption AutoStartEvents = new("AutoStartEvents", false); public static readonly BoolOption AutoStartEvents = new("AutoStartEvents", false);
/// <summary> /// <summary>
/// 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.
/// </summary> /// </summary>
public static readonly BoolOption RenameHoistedUsers = new("RenameHoistedUsers", false); public static readonly BoolOption RenameHoistedUsers = new("RenameHoistedUsers", false);

5
src/Services/GuildUpdateService.cs
View file

@ -134,7 +134,7 @@ public partial class GuildUpdateService : BackgroundService {
if (!guildMemberResult.IsDefined(out var guildMember)) return; if (!guildMemberResult.IsDefined(out var guildMember)) return;
if (!guildMember.User.IsDefined(out var user)) 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); var eventsResult = await _eventApi.ListScheduledEventsForGuildAsync(guildId, ct: ct);
@ -214,7 +214,7 @@ public partial class GuildUpdateService : BackgroundService {
private async Task TickMemberAsync( private async Task TickMemberAsync(
Snowflake guildId, IUser user, IGuildMember member, MemberData memberData, Snowflake defaultRole, 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)) if (defaultRole.Value is not 0 && !memberData.Roles.Contains(defaultRole.Value))
_ = _guildApi.AddGuildMemberRoleAsync( _ = _guildApi.AddGuildMemberRoleAsync(
guildId, user.ID, defaultRole, ct: ct); 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--) for (var i = memberData.Reminders.Count - 1; i >= 0; i--)
await TickReminderAsync(memberData.Reminders[i], user, memberData, ct); 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); if (GuildSettings.RenameHoistedUsers.Get(cfg)) await FilterNicknameAsync(guildId, user, member, ct);
} }