From cb0b993ceb01acd6474e43a3540d1541b7e59072 Mon Sep 17 00:00:00 2001 From: Eveldee Date: Sat, 25 Mar 2023 10:57:57 +0100 Subject: [PATCH] [CompositeRoles] Directly deserialiaze to ulong --- Cocotte/Modules/Activities/CompositeRolesListener.cs | 5 ++--- Cocotte/Options/CompositeRolesOptions.cs | 2 +- Cocotte/Utils/CdnUtils.cs | 2 +- Cocotte/compositeRoles.json | 4 ++-- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Cocotte/Modules/Activities/CompositeRolesListener.cs b/Cocotte/Modules/Activities/CompositeRolesListener.cs index e617fee..16c5ce8 100644 --- a/Cocotte/Modules/Activities/CompositeRolesListener.cs +++ b/Cocotte/Modules/Activities/CompositeRolesListener.cs @@ -8,14 +8,13 @@ namespace Cocotte.Modules.Activities; public class CompositeRolesListener { private readonly ILogger _logger; - private readonly IDictionary _compositeRoles; + private readonly IReadOnlyDictionary _compositeRoles; public CompositeRolesListener(ILogger logger, IOptions compositeRolesOptions) { _logger = logger; - // Initialize dictionary: transform string guildIds to ulong - _compositeRoles = compositeRolesOptions.Value.CompositeRoles.ToDictionary(kp => ulong.Parse(kp.Key), kp => kp.Value); + _compositeRoles = compositeRolesOptions.Value.CompositeRoles; } public async Task UserUpdated(Cacheable cacheable, SocketGuildUser guildUser) diff --git a/Cocotte/Options/CompositeRolesOptions.cs b/Cocotte/Options/CompositeRolesOptions.cs index 97b3c45..232bb27 100644 --- a/Cocotte/Options/CompositeRolesOptions.cs +++ b/Cocotte/Options/CompositeRolesOptions.cs @@ -4,7 +4,7 @@ public class CompositeRolesOptions { public const string SectionName = "CompositeRolesOptions"; - public required IReadOnlyDictionary CompositeRoles { get; init; } + public required IReadOnlyDictionary CompositeRoles { get; init; } } public class GuildCompositeRoles diff --git a/Cocotte/Utils/CdnUtils.cs b/Cocotte/Utils/CdnUtils.cs index 05a0824..bf242e9 100644 --- a/Cocotte/Utils/CdnUtils.cs +++ b/Cocotte/Utils/CdnUtils.cs @@ -10,7 +10,7 @@ public class CdnUtils /// /// Needs to be updated each time a media is updated on the CDN /// - private const string RandomSuffix = "a57z45a"; + private const string RandomSuffix = "assets1"; public static string GetAsset(string assetName) { diff --git a/Cocotte/compositeRoles.json b/Cocotte/compositeRoles.json index 7459f62..6f7578f 100644 --- a/Cocotte/compositeRoles.json +++ b/Cocotte/compositeRoles.json @@ -1,7 +1,7 @@ { "CompositeRolesOptions": { "CompositeRoles": { - "someGuildId (ulong)": [ + "someGuildId": [ { "TargetRoleId": 1, "CompositeRolesIds": [ @@ -11,7 +11,7 @@ ] } ], - "anotherGuildId (ulong)": [ + "anotherGuildId": [ { "TargetRoleId": 45, "CompositeRolesIds": [