Merge pull request #58 from MJHeijster/feature/DeadChatDetectionAndLi…

…nkingAndOverriding No longer overwriting the user every time.
MJHeijster · Jun 5, 2022 · a85c2c2 · a85c2c2
2 parents 068be6d + 8629ef7
commit a85c2c2
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/StatBot/Database/DatabaseHandlers/UserHandler.cs b/StatBot/Database/DatabaseHandlers/UserHandler.cs
@@ -38,9 +38,12 @@ public static void InsertOrUpdateUser(User user)
         {
             if (userCache == null)
                 userCache = GetUsers();
-            if (!userCache.Contains(user))
+            var userFromCache = userCache.FirstOrDefault(c => c.Id == user.Id) ?? new User();
+            user.OverrideName = userFromCache.OverrideName;
+            if (!userCache.Any(c => c.Id == user.Id && c.Username == user.Username && c.Discrim == user.Discrim && c.AvatarUri == user.AvatarUri && c.IsBot == user.IsBot && c.OverrideName == user.OverrideName))
             {
-                string command = $"REPLACE INTO Users(Id, Username, Discrim, AvatarUri, IsBot) VALUES({user.Id},'{user.Username}','{user.Discrim}','{user.AvatarUri}',{user.IsBot})";
+
+                string command = $"REPLACE INTO Users(Id, Username, Discrim, AvatarUri, IsBot, OverrideName) VALUES({user.Id},'{user.Username}','{user.Discrim}','{user.AvatarUri}',{user.IsBot}, '{user.OverrideName}')";
                 using (var connection = new SqliteConnection("Data Source=Database\\Statbot.db;"))
                 {
                     connection.Open();
@@ -137,6 +140,10 @@ public static List<User> GetUsers(bool includingOld = false)
                         {
                             oldUsers = GetOldUsers(id);
                         }
+                        if (!oldUsers.Any())
+                        {
+                            oldUsers = null;
+                        }
                         users.Add(new User(id, rdr[1], rdr[2], rdr[3], rdr[4], rdr[5], rdr[6], oldUsers));
 
                     }

diff --git a/StatBot/Database/Entities/User.cs b/StatBot/Database/Entities/User.cs
@@ -69,6 +69,13 @@ public User(SocketUser author)
 			Discrim = author.Discriminator;
 			AvatarUri = author.GetAvatarUrl();
 		}
+        /// <summary>
+        /// Initializes a new instance of the <see cref="User"/> class.
+        /// </summary>
+        public User()
+        {
+
+        }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="User" /> class.