Fixed #882

Ombi-app · Jan 10, 2017 · a9ebe04 · a9ebe04
1 parent 7f913de
commit a9ebe04
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/Ombi.Store/Repository/UserRepository.cs b/Ombi.Store/Repository/UserRepository.cs
@@ -47,21 +47,24 @@ public UserRepository(ISqliteConfiguration config, ICacheProvider cache) : base(
         public UsersModel GetUser(string userGuid)
         {
             var sql = @"SELECT * FROM Users
-            WHERE Userguid = @UserGuid";
+            WHERE Userguid = @UserGuid
+             COLLATE NOCASE";
             return Db.QueryFirstOrDefault<UsersModel>(sql, new {UserGuid = userGuid});
         }
 
         public UsersModel GetUserByUsername(string username)
         {
             var sql = @"SELECT * FROM Users
-            WHERE UserName = @UserName";
+            WHERE UserName = @UserName
+             COLLATE NOCASE";
             return Db.QueryFirstOrDefault<UsersModel>(sql, new {UserName = username});
         }
 
         public async Task<UsersModel> GetUserAsync(string userguid)
         {
             var sql = @"SELECT * FROM Users
-            WHERE UserGuid = @UserGuid";
+            WHERE UserGuid = @UserGuid
+             COLLATE NOCASE";
             return await Db.QueryFirstOrDefaultAsync<UsersModel>(sql, new {UserGuid = userguid});
         }
 

diff --git a/Ombi.UI/Modules/SearchModule.cs b/Ombi.UI/Modules/SearchModule.cs
@@ -565,7 +565,7 @@ private async Task<Response> RequestMovie(int movieId)
             };
             try
             {
-                if (ShouldAutoApprove(RequestType.Movie, settings, Username))
+                if (ShouldAutoApprove(RequestType.Movie))
                 {
                     model.Approved = true;
 
@@ -885,7 +885,7 @@ await NotificationService.Publish(new NotificationModel
 
             try
             {
-                if (ShouldAutoApprove(RequestType.TvShow, settings, Username))
+                if (ShouldAutoApprove(RequestType.TvShow))
                 {
                     model.Approved = true;
                     var s = await sonarrSettings;
@@ -981,7 +981,7 @@ private async Task<Response> AddUserToRequest(RequestedModel existingRequest, Pl
 
         private bool ShouldSendNotification(RequestType type, PlexRequestSettings prSettings)
         {
-            var sendNotification = ShouldAutoApprove(type, prSettings, Username)
+            var sendNotification = ShouldAutoApprove(type)
                 ? !prSettings.IgnoreNotifyForAutoApprovedRequests
                 : true;
 
@@ -1089,7 +1089,7 @@ private async Task<Response> RequestAlbum(string releaseId)
 
             try
             {
-                if (ShouldAutoApprove(RequestType.Album, settings, Username))
+                if (ShouldAutoApprove(RequestType.Album))
                 {
                     model.Approved = true;
                     var hpSettings = HeadphonesService.GetSettings();
@@ -1363,7 +1363,7 @@ private async Task<IEnumerable<EpisodesModel>> GetEpisodeRequestDifference(int s
             return diff;
         }
 
-        public bool ShouldAutoApprove(RequestType requestType, PlexRequestSettings prSettings, string username)
+        public bool ShouldAutoApprove(RequestType requestType)
         {
             var admin = Security.HasPermissions(Context.CurrentUser, Permissions.Administrator);
             // if the user is an admin, they go ahead and allow auto-approval