Attempt to safely startup from docker even if no migration exists

mwerschy · Jan 20, 2021 · c8b84d7 · c8b84d7
1 parent c17810a
commit c8b84d7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 9 deletions.
diff --git a/src/Silk.Core/Bot.cs b/src/Silk.Core/Bot.cs
@@ -13,6 +13,7 @@
 using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Hosting;
 using Microsoft.Extensions.Logging;
+using Npgsql;
 using Silk.Core.Database;
 using Silk.Core.Utilities;
 
@@ -44,8 +45,12 @@ public Bot(IServiceProvider services, DiscordShardedClient client, ILogger<Bot>
             _logger = logger;
             _exceptionHelper = exceptionHelper;
             _eventSubscriber = eventSubscriber;
-
+            
             SilkDBContext = dbFactory.CreateDbContext();
+
+            try { _ = SilkDBContext.Guilds.FirstOrDefault(); }
+            catch (PostgresException) { SilkDBContext.Database.MigrateAsync().GetAwaiter().GetResult(); }
+
             Instance = this;
             Client = client;
         }

diff --git a/src/Silk.Core/Commands/Tests/ReplyCommand.cs b/src/Silk.Core/Commands/Tests/ReplyCommand.cs
@@ -8,6 +8,7 @@ namespace Silk.Core.Commands.Tests
     public class ReplyCommand : BaseCommandModule
     {
         [Command]
+        [Hidden]
         public async Task Reply(CommandContext ctx)
         {
             var builder = new DiscordMessageBuilder();

diff --git a/src/Silk.Core/Commands/Tests/RoleMenu/RoleMenuCommand.cs b/src/Silk.Core/Commands/Tests/RoleMenu/RoleMenuCommand.cs
@@ -24,6 +24,7 @@ public class RoleMenuCommand : BaseCommandModule
     {
 
         [Command("create")]
+        [Hidden]
         [Description("Create a role menu! \n(Note, if you're adding roles with spaces, you must put them in quotes (`\"\"`)!")]
         [RequireFlag(UserFlag.Staff)]
         public async Task CreateCommand(CommandContext ctx, [RemainingText] params DiscordRole[] roles)

diff --git a/src/Silk.Core/Program.cs b/src/Silk.Core/Program.cs
@@ -32,7 +32,7 @@ public class Program
             MinimumLogLevel = LogLevel.Error
         };
 
-        public static async Task Main(string[] args) => await CreateHostBuilder(args).RunConsoleAsync().ConfigureAwait(false);
+        public static async Task Main(string[] args) => await CreateHostBuilder(args).UseConsoleLifetime().StartAsync().ConfigureAwait(false);
 
 
         public static IHostBuilder CreateHostBuilder(string[] args)

diff --git a/src/Silk.Core/Services/DatabaseService.cs b/src/Silk.Core/Services/DatabaseService.cs
@@ -48,12 +48,15 @@ public async Task<GuildModel> GetOrCreateGuildAsync(ulong guildId)
         {
             await using SilkDbContext db = GetContext();
             GuildModel? guild = await db.Guilds.FirstOrDefaultAsync(g => g.Id == guildId);
-
-            if (guild is not null) return guild;
+            bool guildWasNull = guild is null;
+            guild ??= new() {Id = guildId, Users = new(), Prefix = Bot.DefaultCommandPrefix, Configuration = new() { Guild = guild!, GuildId = guildId}};
+            if (guildWasNull)
+            {
+                _logger.LogTrace("Guild was null");
+                db.Guilds.Add(guild);
+                await db.SaveChangesAsync();
+            }
 
-            guild = new() {Id = guildId, Users = new(), Prefix = Bot.DefaultCommandPrefix, Configuration = new()};
-            db.Guilds.Add(guild);
-            await db.SaveChangesAsync();
             return guild;
         }
 

diff --git a/src/Silk.Core/Tools/EventHelpers/GuildAddedHandler.cs b/src/Silk.Core/Tools/EventHelpers/GuildAddedHandler.cs
@@ -29,7 +29,7 @@ public class GuildAddedHandler
         public Task OnGuildAvailable(DiscordClient c, GuildCreateEventArgs e)
         {
             if (startupCacheCompleted) return Task.CompletedTask; // Prevent double logging when joining a new guild //
-            _logger.LogDebug($"Beginning Cache. Shard [{c.ShardId + 1}/{c.ShardCount}] | Guild [{++currentGuild}/{c.Guilds.Count}]");
+            _logger.LogDebug($"Adding guild to cache queue. Shard [{c.ShardId + 1}/{c.ShardCount}] | Guild [{++currentGuild}/{c.Guilds.Count}]");
             cacheQueue.Add((e.Guild.Id, e.Guild.Members.Values));
             startupCacheCompleted = currentGuild == c.Guilds.Count;
             return Task.CompletedTask;
@@ -63,7 +63,7 @@ private async Task CacheMembersAsync((ulong id, IEnumerable<DiscordMember> membe
             await _dbService.UpdateGuildAsync(guild);
         }
 
-        private Task CacheGuildAsync(DiscordGuild guild) => _dbService.GetOrCreateGuildAsync(guild.Id);
+        private async Task CacheGuildAsync(DiscordGuild guild) => await _dbService.GetOrCreateGuildAsync(guild.Id);
 
         // Used in conjunction with OnGuildJoin() //
         private async Task SendWelcomeMessage(DiscordClient c, GuildCreateEventArgs e)