From d7747bd25a0cdb006d0533ef37bf3dd2493efd7b Mon Sep 17 00:00:00 2001
From: Kwoth <master.kwoth@gmail.com>
Date: Mon, 4 Nov 2024 12:28:01 +0000
Subject: [PATCH] fix: timely fixes

---
 src/NadekoBot/Modules/Gambling/Gambling.cs    | 22 +++++++++++++++----
 .../Modules/Gambling/GamblingConfig.cs        |  5 +----
 src/NadekoBot/data/gambling.yml               |  3 +--
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/NadekoBot/Modules/Gambling/Gambling.cs b/src/NadekoBot/Modules/Gambling/Gambling.cs
index 663efe6cb..79ada8fb7 100644
--- a/src/NadekoBot/Modules/Gambling/Gambling.cs
+++ b/src/NadekoBot/Modules/Gambling/Gambling.cs
@@ -215,6 +215,7 @@ public partial class Gambling : GamblingModule<GamblingService>
                 });
 
     [Cmd]
+    [RequireContext(ContextType.Guild)]
     public async Task Timely()
     {
         var val = Config.Timely.Amount;
@@ -258,11 +259,24 @@ public partial class Gambling : GamblingModule<GamblingService>
 
 
         var val = Config.Timely.Amount;
+        var boostGuilds = Config.BoostBonus.GuildIds ?? new();
+        var guildUsers = await boostGuilds
+                               .Select(async gid =>
+                               {
+                                   try
+                                   {
+                                       var guild = await ((IDiscordClient)_client).GetGuildAsync(gid);
+                                       if (guild is null)
+                                           return null;
 
-        var guildUsers = await (Config.BoostBonus
-                                      .GuildIds
-                                ?? new())
-                               .Select(x => ((IGuild)_client.GetGuild(x))?.GetUserAsync(ctx.User.Id))
+                                       var user = await guild.GetUserAsync(ctx.User.Id);
+                                       return user;
+                                   }
+                                   catch
+                                   {
+                                       return null;
+                                   }
+                               })
                                .WhenAll();
 
         var boostGuildUser = guildUsers.FirstOrDefault(x => x?.PremiumSince is not null);
diff --git a/src/NadekoBot/Modules/Gambling/GamblingConfig.cs b/src/NadekoBot/Modules/Gambling/GamblingConfig.cs
index 8cf3b61e1..6eb18bcfe 100644
--- a/src/NadekoBot/Modules/Gambling/GamblingConfig.cs
+++ b/src/NadekoBot/Modules/Gambling/GamblingConfig.cs
@@ -425,10 +425,7 @@ public sealed partial class BotCutConfig
 public sealed partial class BoostBonusConfig
 {
     [Comment("Users will receive a bonus if they boost any of these servers")]
-    public List<ulong> GuildIds { get; set; } =
-    [
-        117523346618318850
-    ];
+    public List<ulong> GuildIds { get; set; } = new();
 
     [Comment("This bonus will be added before any other multiplier is applied to the .timely command")]
 
diff --git a/src/NadekoBot/data/gambling.yml b/src/NadekoBot/data/gambling.yml
index 3bda06d20..c2e88b87e 100644
--- a/src/NadekoBot/data/gambling.yml
+++ b/src/NadekoBot/data/gambling.yml
@@ -276,7 +276,6 @@ slots:
 # Bonus config for server boosts
 boostBonus:
   # Users will receive a bonus if they boost any of these servers
-  guildIds:
-    - 117523346618318850
+  guildIds: []
   # This bonus will be added before any other multiplier is applied to the .timely command
   baseTimelyBonus: 50