mirror of
https://github.com/Ombi-app/Ombi.git
synced 2025-08-14 18:47:15 -07:00
#96 modify notifications interface/service to accept a non-type specific settings object.
This commit is contained in:
parent
4b3f79b4a8
commit
45208e528f
6 changed files with 13 additions and 11 deletions
|
@ -54,11 +54,13 @@ namespace PlexRequests.Services.Notification
|
|||
await NotifyAsync(model, configuration);
|
||||
}
|
||||
|
||||
public async Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
|
||||
public async Task NotifyAsync(NotificationModel model, Settings settings)
|
||||
{
|
||||
if (settings == null) await NotifyAsync(model);
|
||||
|
||||
if (!ValidateConfiguration(settings))
|
||||
var emailSettings = (EmailNotificationSettings)settings;
|
||||
|
||||
if (!ValidateConfiguration(emailSettings))
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
@ -66,10 +68,10 @@ namespace PlexRequests.Services.Notification
|
|||
switch (model.NotificationType)
|
||||
{
|
||||
case NotificationType.NewRequest:
|
||||
await EmailNewRequest(model, settings);
|
||||
await EmailNewRequest(model, emailSettings);
|
||||
break;
|
||||
case NotificationType.Issue:
|
||||
await EmailIssue(model, settings);
|
||||
await EmailIssue(model, emailSettings);
|
||||
break;
|
||||
case NotificationType.RequestAvailable:
|
||||
throw new NotImplementedException();
|
||||
|
@ -81,7 +83,7 @@ namespace PlexRequests.Services.Notification
|
|||
throw new NotImplementedException();
|
||||
|
||||
case NotificationType.Test:
|
||||
await EmailTest(model, settings);
|
||||
await EmailTest(model, emailSettings);
|
||||
break;
|
||||
|
||||
default:
|
||||
|
|
|
@ -48,7 +48,7 @@ namespace PlexRequests.Services.Notification
|
|||
await Task.WhenAll(notificationTasks).ConfigureAwait(false);
|
||||
}
|
||||
|
||||
public async Task Publish(NotificationModel model, EmailNotificationSettings settings)
|
||||
public async Task Publish(NotificationModel model, Settings settings)
|
||||
{
|
||||
var notificationTasks = Observers.Values.Select(notification => NotifyAsync(notification, model, settings));
|
||||
|
||||
|
@ -72,7 +72,7 @@ namespace PlexRequests.Services.Notification
|
|||
|
||||
}
|
||||
|
||||
private static async Task NotifyAsync(INotification notification, NotificationModel model, EmailNotificationSettings settings)
|
||||
private static async Task NotifyAsync(INotification notification, NotificationModel model, Settings settings)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
|
@ -129,7 +129,7 @@ namespace PlexRequests.Services.Notification
|
|||
}
|
||||
}
|
||||
|
||||
public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
|
||||
public Task NotifyAsync(NotificationModel model, Settings settings)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
|
@ -127,7 +127,7 @@ namespace PlexRequests.Services.Notification
|
|||
}
|
||||
}
|
||||
|
||||
public Task NotifyAsync(NotificationModel model, EmailNotificationSettings settings)
|
||||
public Task NotifyAsync(NotificationModel model, Settings settings)
|
||||
{
|
||||
throw new NotImplementedException();
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue