Merge branch 'settings-changes' into feature/v4

.azuredevops/pipelines/publish-job.yml

@@ -62,6 +62,18 @@ stages:
           $response = Invoke-WebRequest -Uri "https://ombireleasenote.azurewebsites.net/api/ReleaseNotesFunction?buildId=$(Build.BuildId)"
           Write-Host "##vso[task.setvariable variable=ReleaseNotes;]$response"
 
+    - task: GitHubRelease@1
+      inputs:
+        gitHubConnection: 'github.com_tidusjar'
+        repositoryName: 'tidusjar/Ombi'
+        action: 'create'
+        target: '$(Build.SourceVersion)'
+        tagSource: 'userSpecifiedTag'
+        tag: '$(gitTag)'
+        isDraft: true
+        changeLogCompareToRelease: 'lastNonDraftRelease'
+        changeLogType: 'commitBased'
+
     - task: GitHubRelease@1
       inputs:
         gitHubConnection: 'github.com_tidusjar'

src/Ombi.Core/Engine/Interfaces/IMovieEngineV2.cs

@@ -24,5 +24,7 @@ namespace Ombi.Core.Engine.Interfaces
         Task<IEnumerable<SearchMovieViewModel>> UpcomingMovies(int currentlyLoaded, int toLoad);
         Task<ActorCredits> GetMoviesByActor(int actorId, string langCode);
         int ResultLimit { get; set; }
+
+        Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId, CancellationToken requestAborted);
     }
 }

src/Ombi.Core/Engine/V2/MovieSearchEngineV2.cs

@@ -352,5 +352,18 @@ namespace Ombi.Core.Engine.V2
                 viewModel.Subscribed = sub != null;
             }
         }
+
+        public async Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId, CancellationToken cancellationToken)
+        {            
+            var langCode = await DefaultLanguageCode(null);
+            var findResult = await Cache.GetOrAdd(nameof(GetMovieInfoByImdbId) + imdbId + langCode,
+                async () => await MovieApi.Find(imdbId, ExternalSource.imdb_id), DateTime.Now.AddHours(12), cancellationToken);
+            
+            var movie = findResult.movie_results.FirstOrDefault();
+            var movieInfo = await Cache.GetOrAdd(nameof(GetMovieInfoByImdbId) + movie.id + langCode,
+                async () => await MovieApi.GetFullMovieInfo(movie.id, cancellationToken, langCode), DateTime.Now.AddHours(12), cancellationToken);
+
+            return await ProcessSingleMovie(movieInfo);
+        }
     }
 }

src/Ombi.Core/Engine/V2/TvSearchEngineV2.cs

@@ -147,6 +147,12 @@ namespace Ombi.Core.Engine.V2
             item.SeasonRequests = oldModel.SeasonRequests;
             item.RequestId = oldModel.RequestId;
 
+            if (!string.IsNullOrEmpty(item.Images?.Medium))
+            {
+                item.Images.Medium = item.Images.Medium.Replace("http", "https");
+            }
+            
+
             return await GetExtraInfo(showInfoTask, item);
         }
 

src/Ombi/ClientApp/src/app/app.module.ts

@@ -33,6 +33,8 @@ import { MatCardModule } from "@angular/material/card";
 import { MatInputModule } from "@angular/material/input";
 import { MatSlideToggleModule } from "@angular/material/slide-toggle";
 import { MatTabsModule } from "@angular/material/tabs";
+import { MatTooltipModule } from "@angular/material/tooltip";
+
 
 import { MDBBootstrapModule, CardsFreeModule, NavbarModule } from "angular-bootstrap-md";
 
@@ -60,10 +62,8 @@ import { LayoutModule } from '@angular/cdk/layout';
 import { SearchV2Service } from "./services/searchV2.service";
 import { NavSearchComponent } from "./my-nav/nav-search.component";
 import { OverlayModule } from "@angular/cdk/overlay";
-import { getBaseLocation } from "./shared/functions/common-functions";
 import { StorageService } from "./shared/storage/storage-service";
 import { SignalRNotificationService } from "./services/signlarnotification.service";
-
 const routes: Routes = [
     { path: "*", component: PageNotFoundComponent },
     { path: "", redirectTo: "/discover", pathMatch: "full" },
@@ -125,6 +125,7 @@ export function JwtTokenGetter() {
         MatButtonModule,
         NavbarModule,
         MatCardModule,
+        MatTooltipModule,
         MatInputModule,
         MatTabsModule,
         ReactiveFormsModule,

src/Ombi/ClientApp/src/app/interfaces/ICommon.ts

@@ -33,4 +33,8 @@ export interface INavBar {
     link: string;
     requiresAdmin: boolean;
     enabled: boolean;
+    toolTip?: boolean;
+    toolTipMessage?: string;
+    style?: string;
+    donation?: boolean;
 }

src/Ombi/ClientApp/src/app/issues/issuestable.component.html

@@ -51,9 +51,9 @@
     <ng-container matColumnDef="actions">
         <th mat-header-cell *matHeaderCellDef> </th>
         <td mat-cell *matCellDef="let element">
-            <button *ngIf="element.requestType === 1" mat-raised-button color="accent" [routerLink]="'/details/movie/request/' + element.requestId">{{ 'Issues.Details' | translate}}</button>
-            <button *ngIf="element.requestType === 0" mat-raised-button color="accent" [routerLink]="'/details/show/request/' + element.requestId">{{ 'Issues.Details' | translate}}</button>
-            <button *ngIf="element.requestType === 2" mat-raised-button color="accent" [routerLink]="'/details/artist/request/' + element.requestId">{{ 'Issues.Details' | translate}}</button>
+            <button *ngIf="element.requestType === 1" mat-raised-button color="accent" [routerLink]="'/details/movie/' + element.providerId">{{ 'Issues.Details' | translate}}</button>
+            <button *ngIf="element.requestType === 0" mat-raised-button color="accent" [routerLink]="'/details/tv/' + element.providerId">{{ 'Issues.Details' | translate}}</button>
+            <button *ngIf="element.requestType === 2" mat-raised-button color="accent" [routerLink]="'/details/artist/request/' + element.providerId">{{ 'Issues.Details' | translate}}</button>
             <!-- <button mat-raised-button color="warn" (click)="openOptions(element)" *ngIf="isAdmin"> {{ 'Requests.Options' | translate}}</button> -->
         </td>
     </ng-container>

src/Ombi/ClientApp/src/app/login/login.component.html

@@ -1,10 +1,11 @@
-
-  <div *ngIf="background" @fadeInOut class="bg" [style.background-image]="background"></div>
+<div *ngIf="background" @fadeInOut class="bg" [style.background-image]="background">
+</div>
 <div class="small-middle-container">
     <div *ngIf="form && customizationSettings && authenticationSettings">
 
         <mat-card class="mat-elevation-z8 top-margin">
-    <img mat-card-image src="{{baseUrl}}/images/logo.png">
+            <img mat-card-image *ngIf="!customizationSettings.logo" src="{{baseUrl}}/images/logo.png">
+            <img mat-card-image *ngIf="customizationSettings.logo" [src]="customizationSettings.logo">
             <mat-card-content *ngIf="!authenticationSettings.enableOAuth || loginWithOmbi">
                 <form *ngIf="authenticationSettings" class="form-signin" novalidate [formGroup]="form" (ngSubmit)="onSubmit(form)">
 

src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.html

@@ -59,7 +59,7 @@
                             'MediaDetails.Denied' | translate }}</button>
           </span>
 
-                    <button *ngIf="(hasRequest && movieRequest) || movie.available" mat-raised-button class="btn-spacing" color="danger" (click)="issue()">
+                    <button mat-raised-button class="btn-spacing" color="danger" (click)="issue()">
             <i class="fa fa-exclamation"></i> {{
                 'Requests.ReportIssue' | translate }}</button>
 
@@ -109,8 +109,8 @@
 
                     <div class="row">
                         <div class="col-12">
-                            <div class="issuesPanel" *ngIf="movie.requestId">
-                                <issues-panel [requestId]="movie.requestId" [isAdmin]="isAdmin"></issues-panel>
+                            <div class="issuesPanel">
+                                <issues-panel [providerId]="movie.imdbId" [isAdmin]="isAdmin"></issues-panel>
                             </div>
 
                             <mat-accordion class=" mat-elevation-z8 spacing-below ">

src/Ombi/ClientApp/src/app/media-details/components/movie/movie-details.component.ts

@@ -24,32 +24,31 @@ export class MovieDetailsComponent {
     public showAdvanced: boolean; // Set on the UI
 
     private theMovidDbId: number;
+    private imdbId: string;
 
     constructor(private searchService: SearchV2Service, private route: ActivatedRoute,
         private sanitizer: DomSanitizer, private imageService: ImageService,
         public dialog: MatDialog, private requestService: RequestService,
         public messageService: MessageService, private auth: AuthService) {
         this.route.params.subscribe((params: any) => {
-
-                this.theMovidDbId = params.movieDbId;
-            if (params.requestId) {
-                this.load(+params.requestId);
-            } else {
-                this.load(undefined);
+            debugger;
+                if (typeof params.movieDbId === 'string' || params.movieDbId instanceof String) {
+                    if (params.movieDbId.startsWith("tt")) {
+                        this.imdbId = params.movieDbId;
                     }
-            
+                }
+                this.theMovidDbId = params.movieDbId;
+                this.load();
         });
     }
 
-    public async load(requestId: number|undefined) {
+    public async load() {
 
         this.isAdmin = this.auth.hasRole("admin") || this.auth.hasRole("poweruser");
 
-        if (requestId) {
-            var result = await this.searchService.getFullMovieDetailsByRequestId(requestId);
-            this.theMovidDbId = result.id
-
-            this.movie = result;
+        if (this.imdbId) {
+            this.searchService.getMovieByImdbId(this.imdbId).subscribe(async x => {
+                this.movie = x;
                 if (this.movie.requestId > 0) {
                     // Load up this request
                     this.hasRequest = true;
@@ -59,6 +58,7 @@ export class MovieDetailsComponent {
                     this.movie.background = this.sanitizer.bypassSecurityTrustStyle
                         ("url(" + x + ")");
                 });
+            });
         } else {
             this.searchService.getFullMovieDetails(this.theMovidDbId).subscribe(async x => {
                 this.movie = x;
@@ -109,7 +109,7 @@ export class MovieDetailsComponent {
     public async issue() {
         const dialogRef = this.dialog.open(NewIssueComponent, {
             width: '500px',
-            data: {requestId: this.movieRequest ? this.movieRequest.id : null,  requestType: RequestType.movie, imdbid: this.movie.imdbId, title: this.movie.title}
+            data: {requestId: this.movieRequest ? this.movieRequest.id : null,  requestType: RequestType.movie, providerId: this.movie.imdbId ? this.movie.imdbId : this.movie.id, title: this.movie.title}
           });
     }
 

src/Ombi/ClientApp/src/app/media-details/components/shared/interfaces/interfaces.ts

@@ -9,6 +9,6 @@ export interface IDenyDialogData {
 export interface IIssueDialogData {
     requestType: RequestType;
     requestId: number;
-    imdbId: string;
+    providerId: string;
     title: string;
 }

src/Ombi/ClientApp/src/app/media-details/components/shared/issues-panel/issues-panel.component.ts

@@ -10,7 +10,7 @@ import { TranslateService } from "@ngx-translate/core";
 })
 export class IssuesPanelComponent implements OnInit {
     
-    @Input() public requestId: number;
+    @Input() public providerId: string;
     @Input() public isAdmin: boolean;
 
     public issuesCount: number;
@@ -26,7 +26,7 @@ export class IssuesPanelComponent implements OnInit {
     }
 
     public async ngOnInit() {
-        this.issues = await this.issuesService.getIssuesByRequestId(this.requestId);
+        this.issues = await this.issuesService.getIssuesByProviderId(this.providerId);
         this.issuesCount = this.issues.length;
         this.calculateOutstanding();
         this.settings = await this.settingsService.getIssueSettings().toPromise();

src/Ombi/ClientApp/src/app/media-details/components/shared/new-issue/new-issue.component.ts

@@ -20,6 +20,7 @@ export class NewIssueComponent implements OnInit {
         private issueService: IssuesService,
         public messageService: MessageService,
         private translate: TranslateService) {
+            debugger;
             this.issue = {
                 subject: "",
                 description: "",
@@ -32,7 +33,7 @@ export class NewIssueComponent implements OnInit {
                 requestId: data.requestId,
                 requestType: data.requestType,
                 title: data.title,
-                providerId: data.imdbId,
+                providerId: data.providerId,
                 userReported: undefined,
             };
         }

src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.html

@@ -29,7 +29,7 @@
                     <button *ngIf="tv.partlyAvailable && !tv.fullyAvailable" mat-raised-button class="btn-spacing" color="accent" [disabled]>
             <i class="fa fa-check"></i> {{'Common.PartiallyAvailable' | translate }}</button>
 
-                    <button *ngIf="(tvRequest)" mat-raised-button class="btn-spacing" color="danger" (click)="issue()">
+                    <button mat-raised-button class="btn-spacing" color="danger" (click)="issue()">
               <i class="fa fa-exclamation"></i> {{
                   'Requests.ReportIssue' | translate }}</button>
 
@@ -77,7 +77,7 @@
 
                 <div class="col-12 col-md-10" *ngIf="tvRequest">
                     <div class="issuesPanel">
-                        <issues-panel [requestId]="tv.requestId" [isAdmin]="isAdmin"></issues-panel>
+                        <issues-panel [providerId]="tv.theTvDbId" [isAdmin]="isAdmin"></issues-panel>
                     </div>
                     <mat-accordion>
                         <mat-expansion-panel>

src/Ombi/ClientApp/src/app/media-details/components/tv/tv-details.component.ts

@@ -23,7 +23,6 @@ export class TvDetailsComponent implements OnInit {
     public isAdmin: boolean;
 
     private tvdbId: number;
-    private requestIdFromQuery: number;
 
     constructor(private searchService: SearchV2Service, private route: ActivatedRoute,
         private sanitizer: DomSanitizer, private imageService: ImageService,
@@ -32,7 +31,6 @@ export class TvDetailsComponent implements OnInit {
         this.route.params.subscribe((params: any) => {
             this.tvdbId = params.tvdbId;
             this.fromSearch = params.search;
-            this.requestIdFromQuery = +params.requestId; // Coming from the issues page
         });
     }
 
@@ -46,9 +44,6 @@ export class TvDetailsComponent implements OnInit {
         if (this.fromSearch) {
             this.tv = await this.searchService.getTvInfoWithMovieDbId(this.tvdbId);
             this.tvdbId = this.tv.id;
-        } else if (this.requestIdFromQuery) {
-            console.log("REQUESTID" + this.requestIdFromQuery)
-            this.tv = await this.searchService.getTvInfoWithRequestId(this.requestIdFromQuery);
         } else {
             this.tv = await this.searchService.getTvInfo(this.tvdbId);
         }
@@ -68,7 +63,7 @@ export class TvDetailsComponent implements OnInit {
     public async issue() {
         const dialogRef = this.dialog.open(NewIssueComponent, {
             width: '500px',
-            data: {requestId: this.tvRequest ? this.tv.requestId : null,  requestType: RequestType.tvShow, imdbid: this.tv.theTvDbId, title: this.tv.title}
+            data: {requestId: this.tvRequest ? this.tv.requestId : null,  requestType: RequestType.tvShow, providerId: this.tv.theTvDbId, title: this.tv.title}
           });
     }
 

src/Ombi/ClientApp/src/app/media-details/media-details.module.ts

@@ -12,16 +12,13 @@ import { PipeModule } from "../pipes/pipe.module";
 
 import * as fromComponents from './components';
 import { AuthGuard } from "../auth/auth.guard";
-import { RequestServiceV2 } from "../services/requestV2.service";
 import { ArtistDetailsComponent } from "./components/artist/artist-details.component";
 
 
 const routes: Routes = [
     { path: "movie/:movieDbId", component: MovieDetailsComponent, canActivate: [AuthGuard] },
-    { path: "movie/request/:requestId", component: MovieDetailsComponent, canActivate: [AuthGuard] },
     { path: "tv/:tvdbId/:search", component: TvDetailsComponent, canActivate: [AuthGuard] },
     { path: "tv/:tvdbId", component: TvDetailsComponent, canActivate: [AuthGuard] },
-    { path: "show/request/:requestId", component: TvDetailsComponent, canActivate: [AuthGuard] },
     { path: "artist/:artistId", component: ArtistDetailsComponent, canActivate: [AuthGuard] },
 ];
 @NgModule({

src/Ombi/ClientApp/src/app/my-nav/my-nav.component.html

@@ -3,15 +3,26 @@
         <mat-toolbar>{{applicationName}}</mat-toolbar>
         <mat-nav-list>
             <span *ngFor="let nav of navItems">
-        <a *ngIf="(nav.requiresAdmin && isAdmin || !nav.requiresAdmin) && nav.enabled" mat-list-item [routerLink]="nav.link"
-          [routerLinkActive]="getTheme()">
+
+              <div *ngIf="(nav.requiresAdmin && isAdmin || !nav.requiresAdmin) && nav.enabled">
+                
+
+
+              <a *ngIf="nav.donation" mat-list-item [href]="nav.link" target="_blank" matTooltip="{{nav.toolTipMessage | translate}}" matTooltipPosition="right" [routerLinkActive]="getTheme()">
+
+                <mat-icon aria-label="Side nav toggle icon" [style]="nav.style" >{{nav.icon}}</mat-icon>
+                &nbsp;{{nav.name | translate}}
+              </a>
+              <a *ngIf="!nav.donation" mat-list-item [routerLink]="nav.link" [style]="nav.color" [routerLinkActive]="getTheme()">
+
                 <mat-icon aria-label="Side nav toggle icon">{{nav.icon}}</mat-icon>
                 &nbsp;{{nav.name | translate}}
-        </a> </span>
+              </a> 
+              
+            </div>
+            </span>
 
-      <a id="bottom-nav-link" mat-list-item
-        [routerLinkActive]="getTheme()" aria-label="Toggle sidenav"
-        (click)="logOut();">
+            <a class="bottom-nav-link" mat-list-item [routerLinkActive]="getTheme()" aria-label="Toggle sidenav" (click)="logOut();">
                 <mat-icon aria-label="Side nav toggle icon">exit_to_app</mat-icon>
                 {{ 'NavigationBar.Logout' | translate }}
             </a>

src/Ombi/ClientApp/src/app/my-nav/my-nav.component.ts

@@ -47,6 +47,7 @@ export class MyNavComponent implements OnInit {
       { name: "NavigationBar.Issues", icon: "notification_important", link: "/issues", requiresAdmin: false, enabled: this.issuesEnabled },
       { name: "NavigationBar.UserManagement", icon: "account_circle", link: "/usermanagement", requiresAdmin: true, enabled: true },
       { name: "NavigationBar.Calendar", icon: "calendar_today", link: "/calendar", requiresAdmin: false, enabled: true },
+      { name: "NavigationBar.Donate", icon: "attach_money", link: "https://www.paypal.me/PlexRequestsNet", donation: true, requiresAdmin: true, enabled: true, toolTip: true, style: "color:red;", toolTipMessage: 'NavigationBar.DonateTooltip' },
       { name: "NavigationBar.Settings", icon: "settings", link: "/Settings/About", requiresAdmin: true, enabled: true },
       { name: "NavigationBar.UserPreferences", icon: "person", link: "/user-preferences", requiresAdmin: false, enabled: true },
     ];

src/Ombi/ClientApp/src/app/services/issues.service.ts

@@ -33,6 +33,10 @@ export class IssuesService extends ServiceHelpers {
         return this.http.get<IIssues[]>(`${this.url}request/${requestId}`, {headers: this.headers}).toPromise();
     }
 
+    public getIssuesByProviderId(providerId: string): Promise<IIssues[]> {
+        return this.http.get<IIssues[]>(`${this.url}provider/${providerId}`, {headers: this.headers}).toPromise();
+    }
+
     public getIssuesPage(take: number, skip: number, status: IssueStatus): Observable<IIssues[]> {
         return this.http.get<IIssues[]>(`${this.url}${take}/${skip}/${status}`,  {headers: this.headers});
     }

src/Ombi/ClientApp/src/app/services/searchV2.service.ts

@@ -24,6 +24,10 @@ export class SearchV2Service extends ServiceHelpers {
         return this.http.get<ISearchMovieResultV2>(`${this.url}/Movie/${theMovieDbId}`);
     }
 
+    public getMovieByImdbId(imdbId: string): Observable<ISearchMovieResultV2> {
+        return this.http.get<ISearchMovieResultV2>(`${this.url}/Movie/imdb/${imdbId}`);
+    }
+    
     public getFullMovieDetailsByRequestId(requestId: number): Promise<ISearchMovieResultV2> {
         return this.http.get<ISearchMovieResultV2>(`${this.url}/Movie/request/${requestId}`).toPromise();
     }

src/Ombi/Controllers/V1/IssuesController.cs

@@ -178,6 +178,15 @@ namespace Ombi.Controllers.V1
                 .Include(x => x.UserReported).ToListAsync());
         }
 
+                
+        [HttpGet("provider/{id}")]
+        public async Task<IActionResult> GetIssueByProviderId([FromRoute] string id)
+        {
+            return new OkObjectResult(await _issues.GetAll().Where(x => x.ProviderId == id)
+                .Include(x => x.IssueCategory)
+                .Include(x => x.UserReported).ToListAsync());
+        }
+
         /// <summary>
         /// Get's all the issue comments by id
         /// </summary>

src/Ombi/Controllers/V1/SettingsController.cs

@@ -1143,6 +1143,11 @@ namespace Ombi.Controllers.V1
                 // Make sure we do not display the newsletter
                 templates = templates.Where(x => x.NotificationType != NotificationType.Newsletter);
             }
+            if (agent != NotificationAgent.Email)
+            {
+                templates = templates.Where(x => x.NotificationType != NotificationType.WelcomeEmail);
+            }
+
             var tem =  templates.ToList();
             return tem.OrderBy(x => x.NotificationType.ToString()).ToList();
         }

src/Ombi/Controllers/V2/SearchController.cs

@@ -61,6 +61,12 @@ namespace Ombi.Controllers.V2
             return await _movieEngineV2.GetFullMovieInformation(movieDbId, Request.HttpContext.RequestAborted);
         }
 
+        [HttpGet("movie/imdb/{imdbid}")]
+        public async Task<MovieFullInfoViewModel> GetMovieInfoByImdbId(string imdbId)
+        {
+            return await _movieEngineV2.GetMovieInfoByImdbId(imdbId, Request.HttpContext.RequestAborted);
+        }
+
         /// <summary>
         /// Returns details for a single movie
         /// </summary>