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

Fixed #1712

Browse source
This commit is contained in:
tidusjar 2017-11-17 23:09:38 +00:00
parent 9a8bd096b5
commit ab42723dc9
2 changed files with 21 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -193,7 +193,11 @@ namespace Ombi.Core.Engine
request.Denied = false; request.Denied = false;
await MovieRepository.Update(request); await MovieRepository.Update(request);
var canNotify = await RunSpecificRule(request, SpecificRules.CanSendNotification);
if (canNotify.Success)
{
NotificationHelper.Notify(request, NotificationType.RequestApproved); NotificationHelper.Notify(request, NotificationType.RequestApproved);
}
if (request.Approved) if (request.Approved)
{ {

16
src/Ombi.Core/Rule/Rules/Specific/CanRequestRule.cs
View file

@ -2,6 +2,7 @@
using System.Threading.Tasks; using System.Threading.Tasks;
using Ombi.Core.Rule.Interfaces; using Ombi.Core.Rule.Interfaces;
using Ombi.Helpers; using Ombi.Helpers;
using Ombi.Store.Entities;
using Ombi.Store.Entities.Requests; using Ombi.Store.Entities.Requests;
namespace Ombi.Core.Rule.Rules.Specific namespace Ombi.Core.Rule.Rules.Specific
@ -21,8 +22,23 @@ namespace Ombi.Core.Rule.Rules.Specific
var req = (BaseRequest)obj; var req = (BaseRequest)obj;
var sendNotification = !req.Approved; /*|| !prSettings.IgnoreNotifyForAutoApprovedRequests;*/ var sendNotification = !req.Approved; /*|| !prSettings.IgnoreNotifyForAutoApprovedRequests;*/
if (req.RequestType == RequestType.Movie)
{
sendNotification = !User.IsInRole(OmbiRoles.AutoApproveMovie);
}
else if(req.RequestType == RequestType.TvShow)
{
sendNotification = !User.IsInRole(OmbiRoles.AutoApproveTv);
}
if (User.IsInRole(OmbiRoles.Admin)) if (User.IsInRole(OmbiRoles.Admin))
{
sendNotification = false; // Don't bother sending a notification if the user is an admin sendNotification = false; // Don't bother sending a notification if the user is an admin
}
return Task.FromResult(new RuleResult return Task.FromResult(new RuleResult
{ {
Success = sendNotification Success = sendNotification