From fc8bbc9ee71b6106ef6722410baa25108e31cf5b Mon Sep 17 00:00:00 2001
From: Brendan McShane <brendanmcs7@gmail.com>
Date: Fri, 25 Aug 2023 13:32:42 -0400
Subject: [PATCH 1/2] Set to nullable

---
 .../Services/Database/Repository/Interface/IUserRepository.cs | 4 ++--
 CCSODiscordBot/Services/Database/Repository/UserRepository.cs | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CCSODiscordBot/Services/Database/Repository/Interface/IUserRepository.cs b/CCSODiscordBot/Services/Database/Repository/Interface/IUserRepository.cs
index d8494a1..46a3480 100644
--- a/CCSODiscordBot/Services/Database/Repository/Interface/IUserRepository.cs
+++ b/CCSODiscordBot/Services/Database/Repository/Interface/IUserRepository.cs
@@ -21,14 +21,14 @@ public interface IUserRepository
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        Task<DataTables.User> GetByBsonIdAsync(string id);
+        Task<DataTables.User?> GetByBsonIdAsync(string id);
         /// <summary>
         /// Get user by Discord ID
         /// Only shows users from specific guild.
         /// </summary>
         /// <param name="id"></param>
         /// <returns></returns>
-        Task<DataTables.User> GetByDiscordIdAsync(ulong userID, ulong guildID);
+        Task<DataTables.User?> GetByDiscordIdAsync(ulong userID, ulong guildID);
         /// <summary>
         /// Get users with a linq filter
         /// </summary>
diff --git a/CCSODiscordBot/Services/Database/Repository/UserRepository.cs b/CCSODiscordBot/Services/Database/Repository/UserRepository.cs
index def1315..af09ac0 100644
--- a/CCSODiscordBot/Services/Database/Repository/UserRepository.cs
+++ b/CCSODiscordBot/Services/Database/Repository/UserRepository.cs
@@ -25,11 +25,11 @@ public async Task CreateNewUserAsync(DataTables.User newGuild)
         {
             return await _userCollection.Find(_ => true).ToListAsync();
         }
-        public async Task<DataTables.User> GetByBsonIdAsync(string id)
+        public async Task<DataTables.User?> GetByBsonIdAsync(string id)
         {
             return await _userCollection.Find(_ => _.Id == id).FirstOrDefaultAsync();
         }
-        public async Task<DataTables.User> GetByDiscordIdAsync(ulong userID, ulong guildID)
+        public async Task<DataTables.User?> GetByDiscordIdAsync(ulong userID, ulong guildID)
         {
             return await _userCollection.Find(_ => _.DiscordID == userID && _.DiscordGuildID == guildID).FirstOrDefaultAsync();
         }

From c94b91d14d23358261b7760530399b3797f7f56f Mon Sep 17 00:00:00 2001
From: Brendan McShane <brendanmcs7@gmail.com>
Date: Fri, 25 Aug 2023 13:34:46 -0400
Subject: [PATCH 2/2] Fix null ref error

---
 .../Modules/SSOCommands/UserCommands/UserSlashCommands.cs       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CCSODiscordBot/Modules/SSOCommands/UserCommands/UserSlashCommands.cs b/CCSODiscordBot/Modules/SSOCommands/UserCommands/UserSlashCommands.cs
index 5601ca6..7f640d8 100644
--- a/CCSODiscordBot/Modules/SSOCommands/UserCommands/UserSlashCommands.cs
+++ b/CCSODiscordBot/Modules/SSOCommands/UserCommands/UserSlashCommands.cs
@@ -24,7 +24,7 @@ public async Task SyncSSO()
 
             // Get and check user verification:
             var user = await _iUserRepository.GetByDiscordIdAsync(Context.User.Id, Context.Guild.Id);
-            if (!user.Verified)
+            if (user == null || !user.Verified)
             {
                 ButtonBuilder getStartedButton = new ButtonBuilder();
                 getStartedButton.WithLabel("Get Started");