mirror of
https://github.com/jellyfin/jellyfin.git
synced 2026-06-19 22:20:33 +01:00
Merge remote-tracking branch 'upstream/master' into search-rebased
# Conflicts: # Emby.Server.Implementations/Library/LibraryManager.cs # Jellyfin.Server.Implementations/Item/PeopleRepository.cs # MediaBrowser.Controller/Library/ILibraryManager.cs # MediaBrowser.Controller/Persistence/IPeopleRepository.cs
This commit is contained in:
@@ -27,6 +27,7 @@ namespace Jellyfin.Database.Implementations.Entities
|
||||
ArgumentException.ThrowIfNullOrEmpty(passwordResetProviderId);
|
||||
|
||||
Username = username;
|
||||
NormalizedUsername = username.ToUpperInvariant();
|
||||
AuthenticationProviderId = authenticationProviderId;
|
||||
PasswordResetProviderId = passwordResetProviderId;
|
||||
|
||||
@@ -73,6 +74,16 @@ namespace Jellyfin.Database.Implementations.Entities
|
||||
[StringLength(255)]
|
||||
public string Username { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the user's normalized name.
|
||||
/// </summary>
|
||||
/// <remarks>
|
||||
/// Required, Max length = 255.
|
||||
/// </remarks>
|
||||
[MaxLength(255)]
|
||||
[StringLength(255)]
|
||||
public string NormalizedUsername { get; set; }
|
||||
|
||||
/// <summary>
|
||||
/// Gets or sets the user's password, or <c>null</c> if none is set.
|
||||
/// </summary>
|
||||
|
||||
@@ -108,5 +108,50 @@ public enum ViewType
|
||||
/// <summary>
|
||||
/// Shows upcoming.
|
||||
/// </summary>
|
||||
Upcoming = 20
|
||||
Upcoming = 20,
|
||||
|
||||
/// <summary>
|
||||
/// Shows authors.
|
||||
/// </summary>
|
||||
Authors = 21,
|
||||
|
||||
/// <summary>
|
||||
/// Shows books.
|
||||
/// </summary>
|
||||
Books = 22,
|
||||
|
||||
/// <summary>
|
||||
/// Shows folders.
|
||||
/// </summary>
|
||||
Folders = 23,
|
||||
|
||||
/// <summary>
|
||||
/// Shows mixed media.
|
||||
/// </summary>
|
||||
Mixed = 24,
|
||||
|
||||
/// <summary>
|
||||
/// Shows photos.
|
||||
/// </summary>
|
||||
Photos = 25,
|
||||
|
||||
/// <summary>
|
||||
/// Shows photo albums.
|
||||
/// </summary>
|
||||
PhotoAlbums = 26,
|
||||
|
||||
/// <summary>
|
||||
/// Shows series timers.
|
||||
/// </summary>
|
||||
SeriesTimers = 27,
|
||||
|
||||
/// <summary>
|
||||
/// Shows studios.
|
||||
/// </summary>
|
||||
Studios = 28,
|
||||
|
||||
/// <summary>
|
||||
/// Shows videos.
|
||||
/// </summary>
|
||||
Videos = 29
|
||||
}
|
||||
|
||||
@@ -50,6 +50,10 @@ namespace Jellyfin.Database.Implementations.ModelConfiguration
|
||||
builder
|
||||
.HasIndex(entity => entity.Username)
|
||||
.IsUnique();
|
||||
|
||||
builder
|
||||
.HasIndex(entity => entity.NormalizedUsername)
|
||||
.IsUnique();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user