Merge branch 'master' into userdb-efcore

# Conflicts:
#	Emby.Server.Implementations/Data/SqliteUserDataRepository.cs
#	Emby.Server.Implementations/Library/UserManager.cs
#	Jellyfin.Data/Entities/User.cs
#	Jellyfin.Data/ISavingChanges.cs
#	Jellyfin.Server.Implementations/Jellyfin.Server.Implementations.csproj
#	Jellyfin.Server.Implementations/JellyfinDb.cs
#	Jellyfin.Server/Migrations/MigrationRunner.cs
#	MediaBrowser.Model/Notifications/NotificationOptions.cs
#	MediaBrowser.sln

1 files changed, 7 insertions, 2 deletions

diff --git a/Jellyfin.Data/Entities/User.cs b/Jellyfin.Data/Entities/User.cs
index 1aaa8a180e..8cf144b17c 100644
--- a/Jellyfin.Data/Entities/User.cs
+++ b/Jellyfin.Data/Entities/User.cs
@@ -8,14 +8,15 @@ using Jellyfin.Data.Enums;
 
 namespace Jellyfin.Data.Entities
 {
-    [Table("User")]
-    public class User
+    public partial class User
     {
         /// <summary>
         /// The values being delimited here are Guids, so commas work as they do not appear in Guids.
         /// </summary>
         private const char Delimiter = ',';
 
+        partial void Init();
+
         /// <summary>
         /// Default constructor. Protected due to required properties, but present because EF needs it.
         /// </summary>
@@ -26,6 +27,8 @@ namespace Jellyfin.Data.Entities
             ProviderMappings = new HashSet<ProviderMapping>();
             Preferences = new HashSet<Preference>();
             AccessSchedules = new HashSet<AccessSchedule>();
+
+            Init();
         }
 
         /// <summary>
@@ -77,6 +80,8 @@ namespace Jellyfin.Data.Entities
             RememberSubtitleSelections = true;
             EnableNextEpisodeAutoPlay = true;
             EnableAutoLogin = false;
+
+            Init();
         }
 
         /// <summary>