Fixed the issue with the null streaming country

Ombi-app · Jan 7, 2021 · de886dd · de886dd
1 parent ea7307a
commit de886dd
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 4 deletions.
diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyUserImporter.cs
@@ -117,7 +117,8 @@ await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                             ProviderUserId = embyUser.Id,
                             Alias = isConnectUser ? embyUser.Name : string.Empty,
                             MovieRequestLimit = userManagementSettings.MovieRequestLimit,
-                            EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit
+                            EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
+                            StreamingCountry = userManagementSettings.DefaultStreamingCountry
                         };
                         var result = await _userManager.CreateAsync(newUser);
                         if (!result.Succeeded)

diff --git a/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs b/src/Ombi.Schedule/Jobs/Jellyfin/JellyfinUserImporter.cs
@@ -115,7 +115,8 @@ await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                             UserType = UserType.JellyfinUser,
                             ProviderUserId = jellyfinUser.Id,
                             MovieRequestLimit = userManagementSettings.MovieRequestLimit,
-                            EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit
+                            EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
+                            StreamingCountry = userManagementSettings.DefaultStreamingCountry;
                         };
                         _log.LogInformation("Creating Jellyfin user {0}", newUser.UserName);
                         var result = await _userManager.CreateAsync(newUser);

diff --git a/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs b/src/Ombi.Schedule/Jobs/Plex/PlexUserImporter.cs
@@ -98,7 +98,8 @@ await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                             Email = plexUser?.Email ?? string.Empty,
                             Alias = string.Empty,
                             MovieRequestLimit = userManagementSettings.MovieRequestLimit,
-                            EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit
+                            EpisodeRequestLimit = userManagementSettings.EpisodeRequestLimit,
+                            StreamingCountry = userManagementSettings.DefaultStreamingCountry
                         };
                         _log.LogInformation("Creating Plex user {0}", newUser.UserName);
                         var result = await _userManager.CreateAsync(newUser);
@@ -161,7 +162,8 @@ private async Task ImportAdmin(UserManagementSettings settings, PlexServers serv
                 UserName = plexAdmin.username ?? plexAdmin.id,
                 ProviderUserId = plexAdmin.id,
                 Email = plexAdmin.email ?? string.Empty,
-                Alias = string.Empty
+                Alias = string.Empty,
+                StreamingCountry = settings.DefaultStreamingCountry;
             };
 
             var result = await _userManager.CreateAsync(newUser);

diff --git a/src/Ombi.Settings/Settings/Models/UserManagementSettings.cs b/src/Ombi.Settings/Settings/Models/UserManagementSettings.cs
@@ -10,6 +10,7 @@ public class UserManagementSettings : Settings
         public bool ImportJellyfinUsers { get; set; }
         public int MovieRequestLimit { 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> BannedPlexUserIds { get; set; } = new List<string>();
         public List<string> BannedEmbyUserIds { get; set; } = new List<string>();

diff --git a/src/Ombi.Store/Context/OmbiContext.cs b/src/Ombi.Store/Context/OmbiContext.cs
@@ -69,6 +69,7 @@ public void Seed()
                         UserName = "Api",
                         UserType = UserType.SystemUser,
                         NormalizedUserName = "API",
+                        StreamingCountry = "US"
                     });
                     SaveChanges();
                     tran.Commit();