diff --git a/.editorconfig b/.editorconfig index bb647a7..8d71c08 100644 --- a/.editorconfig +++ b/.editorconfig @@ -58,7 +58,6 @@ resharper_indent_nested_usings_stmt = true resharper_indent_nested_while_stmt = true resharper_indent_preprocessor_if = usual_indent resharper_indent_preprocessor_other = usual_indent -resharper_int_align_fields = true resharper_int_align_methods = true resharper_int_align_parameters = true resharper_int_align_properties = true diff --git a/Boyfriend.cs b/Boyfriend.cs index 4301e20..1b1577b 100644 --- a/Boyfriend.cs +++ b/Boyfriend.cs @@ -23,7 +23,7 @@ public static class Boyfriend { }; private static DateTimeOffset _nextSongAt = DateTimeOffset.MinValue; - private static uint _nextSongIndex; + private static uint _nextSongIndex; private static readonly Tuple[] ActivityList = { Tuple.Create( @@ -72,6 +72,8 @@ public static class Boyfriend { } private static async void TickAllGuildsAsync(object? sender, ElapsedEventArgs e) { + if (GuildTickTasks.Count is not 0) return; + foreach (var guild in Client.Guilds) GuildTickTasks.Add(TickGuildAsync(guild)); try { Task.WaitAll(GuildTickTasks.ToArray()); } catch (AggregateException ex) { diff --git a/Data/GuildData.cs b/Data/GuildData.cs index 42959b0..1896ad5 100644 --- a/Data/GuildData.cs +++ b/Data/GuildData.cs @@ -74,7 +74,6 @@ public record GuildData { MemberData.Add(deserialised!.Id, deserialised); } - guild.DownloadUsersAsync().Wait(); foreach (var member in guild.Users.Where(user => !user.IsBot)) { if (MemberData.TryGetValue(member.Id, out var memberData)) { if (!memberData.IsInGuild