From cc3cc4a729f49236f548ecd458bf97346a26a3b7 Mon Sep 17 00:00:00 2001
From: Jon Bloom <github@jon.tw>
Date: Wed, 3 Jun 2020 20:41:08 -0400
Subject: [PATCH 1/3] Replace smartquotes in meta info

---
 src/Ombi/Views/Shared/_Layout.cshtml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Ombi/Views/Shared/_Layout.cshtml b/src/Ombi/Views/Shared/_Layout.cshtml
index 8c39df925..22c6c98f1 100644
--- a/src/Ombi/Views/Shared/_Layout.cshtml
+++ b/src/Ombi/Views/Shared/_Layout.cshtml
@@ -78,7 +78,7 @@
     <meta name="description" content="Ombi, media request tool">
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>@appName</title>
-    <meta property="og:title" content=“@appName” />
+    <meta property="og:title" content="@appName" />
     <meta property="og:image" content="~/images/logo.png" />
     <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
     <link href="https://fonts.googleapis.com/css?family=Roboto:300,400,500" rel="stylesheet">

From ab15439a27bdda3c9eb61e218cb689b25bacec63 Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@myairops.com>
Date: Thu, 18 Jun 2020 22:19:01 +0100
Subject: [PATCH 2/3] Added images to the search

---
 src/Ombi.Core/Engine/V2/MultiSearchEngine.cs  |  1 +
 .../Models/Search/V2/MultiSearchResult.cs     |  1 +
 .../src/app/interfaces/ISearchMovieResult.ts  |  1 +
 .../src/app/login/login.component.html        | 10 ++++---
 .../src/app/my-nav/nav-search.component.html  | 27 ++++++++++---------
 .../src/app/my-nav/nav-search.component.scss  | 16 ++++++++---
 6 files changed, 36 insertions(+), 20 deletions(-)

diff --git a/src/Ombi.Core/Engine/V2/MultiSearchEngine.cs b/src/Ombi.Core/Engine/V2/MultiSearchEngine.cs
index adcf27924..404f775cc 100644
--- a/src/Ombi.Core/Engine/V2/MultiSearchEngine.cs
+++ b/src/Ombi.Core/Engine/V2/MultiSearchEngine.cs
@@ -63,6 +63,7 @@ namespace Ombi.Core.Engine.V2
                 var result = new MultiSearchResult
                 {
                     MediaType = multiSearch.media_type,
+                    Poster = multiSearch.poster_path
                 };
 
                 if (multiSearch.media_type.Equals("movie", StringComparison.InvariantCultureIgnoreCase))
diff --git a/src/Ombi.Core/Models/Search/V2/MultiSearchResult.cs b/src/Ombi.Core/Models/Search/V2/MultiSearchResult.cs
index e514095c9..8346608b5 100644
--- a/src/Ombi.Core/Models/Search/V2/MultiSearchResult.cs
+++ b/src/Ombi.Core/Models/Search/V2/MultiSearchResult.cs
@@ -5,5 +5,6 @@
         public string Id { get; set; }
         public string MediaType { get; set; }
         public string Title { get; set; }
+        public string Poster { get; set; }
     }
 }
\ No newline at end of file
diff --git a/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResult.ts b/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResult.ts
index e52bdd8dc..f2460714f 100644
--- a/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResult.ts
+++ b/src/Ombi/ClientApp/src/app/interfaces/ISearchMovieResult.ts
@@ -38,6 +38,7 @@ export interface IMultiSearchResult {
     id: string;
    mediaType: string;
    title: string;
+   poster: string;
 }
 
 export interface ILanguageRefine {
diff --git a/src/Ombi/ClientApp/src/app/login/login.component.html b/src/Ombi/ClientApp/src/app/login/login.component.html
index fa1241cff..8b0972115 100644
--- a/src/Ombi/ClientApp/src/app/login/login.component.html
+++ b/src/Ombi/ClientApp/src/app/login/login.component.html
@@ -10,14 +10,16 @@
                 <form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
 
 
-                    <mat-form-field class="full-width">
-                        <input type="text" matInput placeholder="{{'Login.UsernamePlaceholder' | translate}}" formControlName="username" />
+                    <mat-form-field class="dark full-width" appearance="outline">
+                        <mat-label>{{'Login.UsernamePlaceholder' | translate}}</mat-label>
+                        <input type="text" matInput formControlName="username" />
                         <mat-error *ngIf="form.get('username').hasError('required')">
                             {{'Login.UsernamePlaceholder' | translate}} is <strong>required</strong></mat-error>
                     </mat-form-field>
 
-                    <mat-form-field class="full-width">
-                        <input color="black" type="password" matInput placeholder="{{'Login.PasswordPlaceholder' | translate}}" formControlName="password" />
+                    <mat-form-field class="full-width" appearance="outline">
+                        <mat-label>{{'Login.PasswordPlaceholder' | translate}}</mat-label>
+                        <input color="black" type="password" matInput formControlName="password" />
                     </mat-form-field>
 
                     <mat-checkbox formControlName="rememberMe">{{'Login.RememberMe' | translate}}</mat-checkbox>
diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
index 839007d4a..2c9064174 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
+++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.html
@@ -15,27 +15,28 @@ aria-label="Search" [ngbTypeahead]="searchModel" [resultFormatter]="formatter" [
             <mat-spinner diameter="50"></mat-spinner>
         </mat-option>
         <ng-container *ngIf="!searching">
-            <mat-option *ngFor="let result of results" [value]="result">
-                <div *ngIf="result.mediaType === 'movie'">
-                    <i class="fa fa-film"></i> &nbsp;
+            <mat-option class="option" *ngFor="let result of results" [value]="result">
+                <img *ngIf="result.poster" class="option-img" aria-hidden [src]="'https://image.tmdb.org/t/p/w300/'+result.poster" height="75">
+                <span *ngIf="result.mediaType === 'movie'">
+                    <i *ngIf="!result.poster" class="fa fa-film"></i> &nbsp;
                     <span>{{result.title}}</span>
-                </div>
-                <div *ngIf="result.mediaType === 'tv'">
-                    <i class="fa fa-tv"></i> &nbsp;
+                </span>
+                <span *ngIf="result.mediaType === 'tv'">
+                    <i *ngIf="!result.poster" class="fa fa-tv"></i> &nbsp;
 
                     <span>{{result.title}}</span>
-                </div>
+                </span>
 
-                <div *ngIf="result.mediaType === 'Artist'">
-                    <i class="fa fa-music"></i> &nbsp;
+                <span *ngIf="result.mediaType === 'Artist'">
+                    <i *ngIf="!result.poster" class="fa fa-music"></i> &nbsp;
 
                     <span>{{result.title}}</span>
-                </div>
+                </span>
 
-                <div *ngIf="result.mediaType === 'person'">
-                    <i class="fa fa-user"></i> &nbsp;
+                <span *ngIf="result.mediaType === 'person'">
+                    <i *ngIf="!result.poster" class="fa fa-user"></i> &nbsp;
                     <span>{{result.title}}</span>
-                </div>
+                </span>
             </mat-option>
         </ng-container>
     </mat-autocomplete>
diff --git a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss
index 02361f366..a62897e7d 100644
--- a/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss
+++ b/src/Ombi/ClientApp/src/app/my-nav/nav-search.component.scss
@@ -17,9 +17,9 @@ $ombi-accent: #258a6d;
 }
 
 .mat-option {
-    height: 50px;
+    height: 75px;
     line-height: 50px;
-    padding: 0px 5px;
+    padding: 0px 0px;
 }
 
 .search-bar {
@@ -33,4 +33,14 @@ $ombi-accent: #258a6d;
 
 ::ng-deep .mat-form-field-underline{
     bottom:0.5em;
-}
\ No newline at end of file
+}
+
+
+.option-img {
+    vertical-align: middle;
+    margin-right: 8px;
+  }
+
+  .options {
+      margin-bottom: 5px;
+  }
\ No newline at end of file

From 4041840523b69661e119d48e9f244a4b0aa72e98 Mon Sep 17 00:00:00 2001
From: Jamie Rees <jamie.rees@myairops.com>
Date: Thu, 18 Jun 2020 23:17:10 +0100
Subject: [PATCH 3/3] fixed the request list paging

---
 src/Ombi.Core/Engine/Interfaces/BaseEngine.cs                  | 3 ++-
 src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs                 | 1 -
 src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs                 | 2 +-
 .../components/albums-grid/albums-grid.component.ts            | 2 +-
 .../components/movies-grid/movies-grid.component.ts            | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
index 81f35383a..8ddf27656 100644
--- a/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
+++ b/src/Ombi.Core/Engine/Interfaces/BaseEngine.cs
@@ -29,7 +29,8 @@ namespace Ombi.Core.Engine.Interfaces
         private OmbiUser _user;
         protected async Task<OmbiUser> GetUser()
         {
-            return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.UserName == Username));
+            var username = Username.ToUpper();
+            return _user ?? (_user = await UserManager.Users.FirstOrDefaultAsync(x => x.NormalizedUserName == username));
         }
 
         protected async Task<string> UserAlias()
diff --git a/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs b/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs
index 491ff3363..6fc54afcd 100644
--- a/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs
+++ b/src/Ombi.Schedule/Jobs/Emby/EmbyEpisodeSync.cs
@@ -75,7 +75,6 @@ namespace Ombi.Schedule.Jobs.Emby
                 await CacheEpisodes(server);
             }
 
-
             await _notification.Clients.Clients(NotificationHub.AdminConnectionIds)
                 .SendAsync(NotificationHub.NotificationEvent, "Emby Episode Sync Finished");
             await OmbiQuartz.TriggerJob(nameof(IRefreshMetadata), "System");
diff --git a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs
index 7ecea31c8..0a90d2c5f 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/RefreshMetadata.cs
@@ -70,7 +70,7 @@ namespace Ombi.Schedule.Jobs.Ombi
                 {
                     await StartEmby(embySettings);
                     
-                await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby");
+                    await OmbiQuartz.TriggerJob(nameof(IEmbyAvaliabilityChecker), "Emby");
                 }
             }
             catch (Exception e)
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts
index 4a9c3d0d7..633ddf1c2 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/albums-grid/albums-grid.component.ts
@@ -74,7 +74,7 @@ export class AlbumsGridComponent implements OnInit, AfterViewInit {
         this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
         this.paginator.showFirstLastButtons = true;
 
-        merge(this.sort.sortChange, this.paginator.page, this.currentFilter)
+        merge(this.sort.sortChange, this.paginator.page)
             .pipe(
                 startWith({}),
                 switchMap((value: any) => {
diff --git a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
index 5d7372de6..93cf37a64 100644
--- a/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
+++ b/src/Ombi/ClientApp/src/app/requests-list/components/movies-grid/movies-grid.component.ts
@@ -74,7 +74,7 @@ export class MoviesGridComponent implements OnInit, AfterViewInit {
         this.sort.sortChange.subscribe(() => this.paginator.pageIndex = 0);
         this.paginator.showFirstLastButtons = true;
 
-        merge(this.sort.sortChange, this.paginator.page, this.currentFilter)
+        merge(this.sort.sortChange, this.paginator.page)
             .pipe(
                 startWith({}),
                 switchMap((value: any) => {