Delay Comp init until bot is connected / db init

xiaoxiao921 · Jun 18, 2020 · be4c15a · be4c15a
1 parent dec5690
commit be4c15a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 9 deletions.
diff --git a/CHEF/CHEF.cs b/CHEF/CHEF.cs
@@ -17,13 +17,11 @@ private async Task MainAsync()
         {
             await SetupBotLogin();
 
-            await ComponentHandler.Init(_client);
-
-            _client.Ready += () =>
+            _client.Ready += async () =>
             {
                 Logger.Init(_client);
                 Database.Init();
-                return Task.CompletedTask;
+                await ComponentHandler.Init(_client);
             };
 
             await Task.Delay(-1);

diff --git a/CHEF/Logger.cs b/CHEF/Logger.cs
@@ -23,11 +23,7 @@ internal static void Init(DiscordSocketClient client)
             var guild = client.GetGuild(ror2ServerId);
             if (guild != null)
             {
-                _reportToUser = guild.GetUser(iDeathHdId);
-                if (_reportToUser == null)
-                {
-                    _reportToUser = _client.Rest.GetGuildUserAsync(ror2ServerId, iDeathHdId).Result;
-                }
+                _reportToUser = guild.GetUser(iDeathHdId) ?? (IGuildUser) _client.Rest.GetGuildUserAsync(ror2ServerId, iDeathHdId).Result;
             }
         }