github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-08-19 12:59:39 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the issue with the null streaming country

Browse source
This commit is contained in:
tidusjar 2021-01-07 20:14:13 +00:00
commit de886dd800
5 changed files with 10 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs
View file

@ -117,7 +117,8 @@ namespace Ombi.Schedule.Jobs.Emby
ProviderUserId = embyUser.Id, ProviderUserId = embyUser.Id,
Alias = isConnectUser ? embyUser.Name : string.Empty, Alias = isConnectUser ? embyUser.Name : string.Empty,
MovieRequestLimit = userManagementSettings.MovieRequestLimit, MovieRequestLimit = userManagementSettings.MovieRequestLimit,
EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
StreamingCountry = userManagementSettings.DefaultStreamingCountry
}; };
var result = await _userManager.CreateAsync(newUser); var result = await _userManager.CreateAsync(newUser);
if (!result.Succeeded) if (!result.Succeeded)

3
src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs
View file

@ -115,7 +115,8 @@ namespace Ombi.Schedule.Jobs.Jellyfin
UserType = UserType.JellyfinUser, UserType = UserType.JellyfinUser,
ProviderUserId = jellyfinUser.Id, ProviderUserId = jellyfinUser.Id,
MovieRequestLimit = userManagementSettings.MovieRequestLimit, MovieRequestLimit = userManagementSettings.MovieRequestLimit,
EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
StreamingCountry = userManagementSettings.DefaultStreamingCountry;
}; };
_log.LogInformation("Creating Jellyfin user {0}", newUser.UserName); _log.LogInformation("Creating Jellyfin user {0}", newUser.UserName);
var result = await _userManager.CreateAsync(newUser); var result = await _userManager.CreateAsync(newUser);

6
src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs
View file

@ -98,7 +98,8 @@ namespace Ombi.Schedule.Jobs.Plex
Email = plexUser?.Email ?? string.Empty, Email = plexUser?.Email ?? string.Empty,
Alias = string.Empty, Alias = string.Empty,
MovieRequestLimit = userManagementSettings.MovieRequestLimit, MovieRequestLimit = userManagementSettings.MovieRequestLimit,
EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
StreamingCountry = userManagementSettings.DefaultStreamingCountry
}; };
_log.LogInformation("Creating Plex user {0}", newUser.UserName); _log.LogInformation("Creating Plex user {0}", newUser.UserName);
var result = await _userManager.CreateAsync(newUser); var result = await _userManager.CreateAsync(newUser);
@ -161,7 +162,8 @@ namespace Ombi.Schedule.Jobs.Plex
UserName = plexAdmin.username ?? plexAdmin.id, UserName = plexAdmin.username ?? plexAdmin.id,
ProviderUserId = plexAdmin.id, ProviderUserId = plexAdmin.id,
Email = plexAdmin.email ?? string.Empty, Email = plexAdmin.email ?? string.Empty,
Alias = string.Empty Alias = string.Empty,
StreamingCountry = settings.DefaultStreamingCountry;
}; };
var result = await _userManager.CreateAsync(newUser); var result = await _userManager.CreateAsync(newUser);

1
src/Ombi.Settings/Settings/Models/UserManagementSettings.cs
View file

@ -10,6 +10,7 @@ namespace Ombi.Settings.Settings.Models
public bool ImportJellyfinUsers { get; set; } public bool ImportJellyfinUsers { get; set; }
public int MovieRequestLimit { get; set; } public int MovieRequestLimit { get; set; }
public int EpisodeRequestLimit { get; set; } public int EpisodeRequestLimit { get; set; }
public string DefaultStreamingCountry { get; set; } = "US";
public List<string> DefaultRoles { get; set; } = new List<string>(); public List<string> DefaultRoles { get; set; } = new List<string>();
public List<string> BannedPlexUserIds { get; set; } = new List<string>(); public List<string> BannedPlexUserIds { get; set; } = new List<string>();
public List<string> BannedEmbyUserIds { get; set; } = new List<string>(); public List<string> BannedEmbyUserIds { get; set; } = new List<string>();

1
src/Ombi.Store/Context/OmbiContext.cs
View file

@ -69,6 +69,7 @@ namespace Ombi.Store.Context
UserName = "Api", UserName = "Api",
UserType = UserType.SystemUser, UserType = UserType.SystemUser,
NormalizedUserName = "API", NormalizedUserName = "API",
StreamingCountry = "US"
}); });
SaveChanges(); SaveChanges();
tran.Commit(); tran.Commit();