#1659 Made the option to ignore notifcations for auto approve

This commit is contained in:
Jamie 2017-12-20 16:23:47 +00:00
commit 8d5dfe9424
8 changed files with 53 additions and 6 deletions

View file

@ -2,7 +2,9 @@
using Microsoft.EntityFrameworkCore;
using Ombi.Core.Authentication;
using Ombi.Core.Rule.Interfaces;
using Ombi.Core.Settings;
using Ombi.Helpers;
using Ombi.Settings.Settings.Models;
using Ombi.Store.Entities;
using Ombi.Store.Entities.Requests;
@ -10,33 +12,42 @@ namespace Ombi.Core.Rule.Rules.Specific
{
public class SendNotificationRule : SpecificRule, ISpecificRule<object>
{
public SendNotificationRule(OmbiUserManager um)
public SendNotificationRule(OmbiUserManager um, ISettingsService<OmbiSettings> settings)
{
UserManager = um;
Settings = settings;
}
public override SpecificRules Rule => SpecificRules.CanSendNotification;
private OmbiUserManager UserManager { get; }
private ISettingsService<OmbiSettings> Settings { get; }
public async Task<RuleResult> Execute(object obj)
{
var req = (BaseRequest)obj;
var sendNotification = !req.Approved; /*|| !prSettings.IgnoreNotifyForAutoApprovedRequests;*/
var settings = await Settings.GetSettingsAsync();
var sendNotification = true;
var requestedUser = await UserManager.Users.FirstOrDefaultAsync(x => x.Id == req.RequestedUserId);
if (req.RequestType == RequestType.Movie)
{
sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveMovie);
if (settings.DoNotSendNotificationsForAutoApprove)
{
sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveMovie);
}
}
else if(req.RequestType == RequestType.TvShow)
else if (req.RequestType == RequestType.TvShow)
{
sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveTv);
if (settings.DoNotSendNotificationsForAutoApprove)
{
sendNotification = !await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.AutoApproveTv);
}
}
if (await UserManager.IsInRoleAsync(requestedUser, OmbiRoles.Admin))
{
sendNotification = false; // Don't bother sending a notification if the user is an admin
}
return new RuleResult
{