github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Added {AvailableDate} as a Notification Variable, this is the date the request was marked as available. See here: https://github.com/tidusjar/Ombi/wiki/Notification-Template-Variables

Browse source
This commit is contained in:
tidusjar 2018-12-30 21:19:52 +00:00
parent dc216ba9bf
commit ba15853ac1
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/Ombi.Notifications/NotificationMessageCurlys.cs
View file

@ -50,6 +50,7 @@ namespace Ombi.Notifications
Overview = req?.Overview; Overview = req?.Overview;
Year = req?.ReleaseDate.Year.ToString(); Year = req?.ReleaseDate.Year.ToString();
DenyReason = req?.DeniedReason; DenyReason = req?.DeniedReason;
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
if (req?.RequestType == RequestType.Movie) if (req?.RequestType == RequestType.Movie)
{ {
PosterImage = string.Format((req?.PosterPath ?? string.Empty).StartsWith("/", StringComparison.InvariantCultureIgnoreCase) PosterImage = string.Format((req?.PosterPath ?? string.Empty).StartsWith("/", StringComparison.InvariantCultureIgnoreCase)
@ -85,6 +86,7 @@ namespace Ombi.Notifications
UserName = req?.RequestedUser?.UserName; UserName = req?.RequestedUser?.UserName;
} }
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
DenyReason = req?.DeniedReason; DenyReason = req?.DeniedReason;
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
if (pref != null) if (pref != null)
@ -133,6 +135,7 @@ namespace Ombi.Notifications
// Can be set if it's an issue // Can be set if it's an issue
UserName = req?.RequestedUser?.UserName; UserName = req?.RequestedUser?.UserName;
} }
AvailableDate = req?.MarkedAsAvailable?.ToString("D") ?? string.Empty;
Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName; Alias = (req?.RequestedUser?.Alias.HasValue() ?? false) ? req?.RequestedUser?.Alias : req?.RequestedUser?.UserName;
if (pref != null) if (pref != null)
{ {
@ -238,6 +241,7 @@ namespace Ombi.Notifications
public string NewIssueComment { get; set; } public string NewIssueComment { get; set; }
public string UserPreference { get; set; } public string UserPreference { get; set; }
public string DenyReason { get; set; } public string DenyReason { get; set; }
public string AvailableDate { get; set; }
// System Defined // System Defined
private string LongDate => DateTime.Now.ToString("D"); private string LongDate => DateTime.Now.ToString("D");
@ -273,6 +277,7 @@ namespace Ombi.Notifications
{nameof(Alias),Alias}, {nameof(Alias),Alias},
{nameof(UserPreference),UserPreference}, {nameof(UserPreference),UserPreference},
{nameof(DenyReason),DenyReason}, {nameof(DenyReason),DenyReason},
{nameof(AvailableDate),AvailableDate},
}; };
} }
} }

2
src/Ombi/ClientApp/app/search/moviesearch.component.ts
View file

@ -6,7 +6,7 @@ import { Subject } from "rxjs";
import { debounceTime, distinctUntilChanged } from "rxjs/operators"; import { debounceTime, distinctUntilChanged } from "rxjs/operators";
import { AuthService } from "../auth/auth.service"; import { AuthService } from "../auth/auth.service";
import { IIssueCategory, IRequestEngineResult, ISearchMovieResult, ILanguageRefine } from "../interfaces"; import { IIssueCategory, ILanguageRefine, IRequestEngineResult, ISearchMovieResult } from "../interfaces";
import { NotificationService, RequestService, SearchService } from "../services"; import { NotificationService, RequestService, SearchService } from "../services";
import * as languageData from "../../other/iso-lang.json"; import * as languageData from "../../other/iso-lang.json";

2
src/Ombi/ClientApp/app/services/search.service.ts
View file

@ -22,7 +22,7 @@ export class SearchService extends ServiceHelpers {
} }
public searchMovieWithRefined(searchTerm: string, year: number | undefined, langCode: string): Observable<ISearchMovieResult[]> { public searchMovieWithRefined(searchTerm: string, year: number | undefined, langCode: string): Observable<ISearchMovieResult[]> {
return this.http.post<ISearchMovieResult[]>(`${this.url}/Movie/`, { searchTerm: searchTerm, year: year, languageCode: langCode }); return this.http.post<ISearchMovieResult[]>(`${this.url}/Movie/`, { searchTerm, year, languageCode: langCode });
} }
public similarMovies(theMovieDbId: number): Observable<ISearchMovieResult[]> { public similarMovies(theMovieDbId: number): Observable<ISearchMovieResult[]> {