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

Fixed the casting error #1292

Browse source
This commit is contained in:
Jamie.Rees 2017-03-29 08:25:00 +01:00
parent 830c887d98
commit f7926f13b5
3 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Ombi.Services/Interfaces/INotificationService.cs
View file

@ -39,6 +39,7 @@ namespace Ombi.Services.Interfaces
/// <param name="model">The model.</param>
/// <returns></returns>
Task Publish(NotificationModel model);
Task PublishTest(NotificationModel model, Settings settings, INotification type);
/// <summary>
/// Sends a notification to the user, this is usually for testing the settings.
/// </summary>

5
Ombi.Services/Notification/NotificationService.cs
View file

@ -100,5 +100,10 @@ namespace Ombi.Services.Notification
throw new InvalidOperationException(ex.Message);
}
}
public async Task PublishTest(NotificationModel model, Settings settings, INotification type)
{
await type.NotifyAsync(model, settings);
}
}
}

10
Ombi.UI/Modules/Admin/AdminModule.cs
View file

@ -639,7 +639,7 @@ namespace Ombi.UI.Modules.Admin
{
NotificationService.Subscribe(new EmailMessageNotification(EmailService));
settings.Enabled = true;
await NotificationService.Publish(notificationModel, settings);
await NotificationService.PublishTest(notificationModel, settings, new EmailMessageNotification(EmailService));
Log.Info("Sent email notification test");
}
catch (Exception ex)
@ -743,7 +743,7 @@ namespace Ombi.UI.Modules.Admin
{
NotificationService.Subscribe(new PushbulletNotification(PushbulletApi, PushbulletService));
settings.Enabled = true;
await NotificationService.Publish(notificationModel, settings);
await NotificationService.PublishTest(notificationModel, settings, new PushbulletNotification(PushbulletApi, PushbulletService));
Log.Info("Sent pushbullet notification test");
}
catch (Exception)
@ -809,7 +809,7 @@ namespace Ombi.UI.Modules.Admin
{
NotificationService.Subscribe(new PushoverNotification(PushoverApi, PushoverService));
settings.Enabled = true;
await NotificationService.Publish(notificationModel, settings);
await NotificationService.PublishTest(notificationModel, settings, new PushoverNotification(PushoverApi, PushoverService));
Log.Info("Sent pushover notification test");
}
catch (Exception)
@ -1004,7 +1004,7 @@ namespace Ombi.UI.Modules.Admin
{
NotificationService.Subscribe(new SlackNotification(SlackApi, SlackSettings));
settings.Enabled = true;
await NotificationService.Publish(notificationModel, settings);
await NotificationService.PublishTest(notificationModel, settings, new SlackNotification(SlackApi, SlackSettings));
Log.Info("Sent slack notification test");
}
catch (Exception e)
@ -1075,7 +1075,7 @@ namespace Ombi.UI.Modules.Admin
{
NotificationService.Subscribe(new DiscordNotification(DiscordApi, DiscordSettings));
settings.Enabled = true;
await NotificationService.Publish(notificationModel, settings);
await NotificationService.PublishTest(notificationModel, settings, new DiscordNotification(DiscordApi, DiscordSettings));
Log.Info("Sent Discord notification test");
}
catch (Exception e)