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

#1588 When we make changes to any requests that we can trigger a notification, always send it to all notification agents, even if the user wont recieve it.

Browse source
This commit is contained in:
Jamie.Rees 2017-10-19 08:45:03 +01:00
parent 2ec87ac3d6
commit 9261232bab
9 changed files with 101 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/Ombi.Core/Engine/MovieRequestEngine.cs
View file

@ -86,12 +86,12 @@ namespace Ombi.Core.Engine
if (requestModel.Approved) // The rules have auto approved this
{
var result = await Sender.Send(requestModel);
if (result.Success && result.Sent)
var result = await ApproveMovie(requestModel);
if (result.RequestAdded)
{
return await AddMovieRequest(requestModel, fullMovieName);
}
if (!result.Success)
if (!result.IsError)
{
Logger.LogWarning("Tried auto sending movie but failed. Message: {0}", result.Message);
return new RequestEngineResult
@ -150,6 +150,7 @@ namespace Ombi.Core.Engine
public async Task<RequestEngineResult> ApproveMovie(MovieRequests request)
{
await MovieRepository.Update(request);
NotificationHelper.Notify(request, NotificationType.RequestApproved);
if (request.Approved)
{
var result = await Sender.Send(request);
@ -189,6 +190,17 @@ namespace Ombi.Core.Engine
var allRequests = await MovieRepository.Get().ToListAsync();
var results = allRequests.FirstOrDefault(x => x.Id == request.Id);
if (!(results.Denied ?? false) && (request.Denied ?? false))
{
// We are denying a request
NotificationHelper.Notify(request, NotificationType.RequestDeclined);
}
if (!results.Available && request.Available)
{
// We changed the availability manually
NotificationHelper.Notify(request, NotificationType.RequestAvailable);
}
results.Approved = request.Approved;
results.Available = request.Available;
results.Denied = request.Denied;