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

#96 add the necessary back-end code to produce a test message for all notification types (still have to add the test buttons for pushbullet/pushover)

Browse source
This commit is contained in:
Drewster727 2016-03-28 13:44:11 -05:00
parent 45208e528f
commit 9742b42fdf
3 changed files with 76 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

5
PlexRequests.Services/Notification/EmailMessageNotification.cs
View file

@ -60,10 +60,7 @@ namespace PlexRequests.Services.Notification
var emailSettings = (EmailNotificationSettings)settings; var emailSettings = (EmailNotificationSettings)settings;
if (!ValidateConfiguration(emailSettings)) if (!ValidateConfiguration(emailSettings)) return;
{
return;
}
switch (model.NotificationType) switch (model.NotificationType)
{ {

53
PlexRequests.Services/Notification/PushbulletNotification.cs
View file

@ -51,18 +51,25 @@ namespace PlexRequests.Services.Notification
public string NotificationName => "PushbulletNotification"; public string NotificationName => "PushbulletNotification";
public async Task NotifyAsync(NotificationModel model) public async Task NotifyAsync(NotificationModel model)
{ {
if (!ValidateConfiguration()) var configuration = GetSettings();
{ await NotifyAsync(model, configuration);
return; }
}
public async Task NotifyAsync(NotificationModel model, Settings settings)
{
if (settings == null) await NotifyAsync(model);
var pushSettings = (PushbulletNotificationSettings)settings;
if (!ValidateConfiguration(pushSettings)) return;
switch (model.NotificationType) switch (model.NotificationType)
{ {
case NotificationType.NewRequest: case NotificationType.NewRequest:
await PushNewRequestAsync(model); await PushNewRequestAsync(model, pushSettings);
break; break;
case NotificationType.Issue: case NotificationType.Issue:
await PushIssueAsync(model); await PushIssueAsync(model, pushSettings);
break; break;
case NotificationType.RequestAvailable: case NotificationType.RequestAvailable:
break; break;
@ -70,18 +77,21 @@ namespace PlexRequests.Services.Notification
break; break;
case NotificationType.AdminNote: case NotificationType.AdminNote:
break; break;
case NotificationType.Test:
await PushTestAsync(model, pushSettings);
break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
} }
private bool ValidateConfiguration() private bool ValidateConfiguration(PushbulletNotificationSettings settings)
{ {
if (!Settings.Enabled) if (!settings.Enabled)
{ {
return false; return false;
} }
if (string.IsNullOrEmpty(Settings.AccessToken)) if (string.IsNullOrEmpty(settings.AccessToken))
{ {
return false; return false;
} }
@ -93,13 +103,13 @@ namespace PlexRequests.Services.Notification
return SettingsService.GetSettings(); return SettingsService.GetSettings();
} }
private async Task PushNewRequestAsync(NotificationModel model) private async Task PushNewRequestAsync(NotificationModel model, PushbulletNotificationSettings settings)
{ {
var message = $"{model.Title} has been requested by user: {model.User}"; var message = $"{model.Title} has been requested by user: {model.User}";
var pushTitle = $"Plex Requests: {model.Title} has been requested!"; var pushTitle = $"Plex Requests: {model.Title} has been requested!";
try try
{ {
var result = await PushbulletApi.PushAsync(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier); var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
if (result == null) if (result == null)
{ {
Log.Error("Pushbullet api returned a null value, the notification did not get pushed"); Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
@ -111,13 +121,13 @@ namespace PlexRequests.Services.Notification
} }
} }
private async Task PushIssueAsync(NotificationModel model) private async Task PushIssueAsync(NotificationModel model, PushbulletNotificationSettings settings)
{ {
var message = $"A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}"; var message = $"A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
var pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}"; var pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}";
try try
{ {
var result = await PushbulletApi.PushAsync(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier); var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
if (result != null) if (result != null)
{ {
Log.Error("Pushbullet api returned a null value, the notification did not get pushed"); Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
@ -129,9 +139,22 @@ namespace PlexRequests.Services.Notification
} }
} }
public Task NotifyAsync(NotificationModel model, Settings settings) private async Task PushTestAsync(NotificationModel model, PushbulletNotificationSettings settings)
{ {
throw new NotImplementedException(); var message = "This is just a test! Success!";
var pushTitle = "Plex Requests: Test Message!";
try
{
var result = await PushbulletApi.PushAsync(settings.AccessToken, pushTitle, message, settings.DeviceIdentifier);
if (result != null)
{
Log.Error("Pushbullet api returned a null value, the notification did not get pushed");
}
}
catch (Exception e)
{
Log.Error(e);
}
} }
} }
} }

52
PlexRequests.Services/Notification/PushoverNotification.cs
View file

@ -51,18 +51,25 @@ namespace PlexRequests.Services.Notification
public string NotificationName => "PushoverNotification"; public string NotificationName => "PushoverNotification";
public async Task NotifyAsync(NotificationModel model) public async Task NotifyAsync(NotificationModel model)
{ {
if (!ValidateConfiguration()) var configuration = GetSettings();
{ await NotifyAsync(model, configuration);
return; }
}
public async Task NotifyAsync(NotificationModel model, Settings settings)
{
if (settings == null) await NotifyAsync(model);
var pushSettings = (PushoverNotificationSettings)settings;
if (!ValidateConfiguration(pushSettings)) return;
switch (model.NotificationType) switch (model.NotificationType)
{ {
case NotificationType.NewRequest: case NotificationType.NewRequest:
await PushNewRequestAsync(model); await PushNewRequestAsync(model, pushSettings);
break; break;
case NotificationType.Issue: case NotificationType.Issue:
await PushIssueAsync(model); await PushIssueAsync(model, pushSettings);
break; break;
case NotificationType.RequestAvailable: case NotificationType.RequestAvailable:
break; break;
@ -70,18 +77,21 @@ namespace PlexRequests.Services.Notification
break; break;
case NotificationType.AdminNote: case NotificationType.AdminNote:
break; break;
case NotificationType.Test:
await PushTestAsync(model, pushSettings);
break;
default: default:
throw new ArgumentOutOfRangeException(); throw new ArgumentOutOfRangeException();
} }
} }
private bool ValidateConfiguration() private bool ValidateConfiguration(PushoverNotificationSettings settings)
{ {
if (!Settings.Enabled) if (!settings.Enabled)
{ {
return false; return false;
} }
if (string.IsNullOrEmpty(Settings.AccessToken) || string.IsNullOrEmpty(Settings.UserToken)) if (string.IsNullOrEmpty(settings.AccessToken) || string.IsNullOrEmpty(settings.UserToken))
{ {
return false; return false;
} }
@ -93,12 +103,12 @@ namespace PlexRequests.Services.Notification
return SettingsService.GetSettings(); return SettingsService.GetSettings();
} }
private async Task PushNewRequestAsync(NotificationModel model) private async Task PushNewRequestAsync(NotificationModel model, PushoverNotificationSettings settings)
{ {
var message = $"Plex Requests: {model.Title} has been requested by user: {model.User}"; var message = $"Plex Requests: {model.Title} has been requested by user: {model.User}";
try try
{ {
var result = await PushoverApi.PushAsync(Settings.AccessToken, message, Settings.UserToken); var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
if (result?.status != 1) if (result?.status != 1)
{ {
Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed"); Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
@ -110,12 +120,12 @@ namespace PlexRequests.Services.Notification
} }
} }
private async Task PushIssueAsync(NotificationModel model) private async Task PushIssueAsync(NotificationModel model, PushoverNotificationSettings settings)
{ {
var message = $"Plex Requests: A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}"; var message = $"Plex Requests: A new issue: {model.Body} has been reported by user: {model.User} for the title: {model.Title}";
try try
{ {
var result = await PushoverApi.PushAsync(Settings.AccessToken, message, Settings.UserToken); var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
if (result?.status != 1) if (result?.status != 1)
{ {
Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed"); Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
@ -127,9 +137,21 @@ namespace PlexRequests.Services.Notification
} }
} }
public Task NotifyAsync(NotificationModel model, Settings settings) private async Task PushTestAsync(NotificationModel model, PushoverNotificationSettings settings)
{ {
throw new NotImplementedException(); var message = $"Plex Requests: Test Message!";
try
{
var result = await PushoverApi.PushAsync(settings.AccessToken, message, settings.UserToken);
if (result?.status != 1)
{
Log.Error("Pushover api returned a status that was not 1, the notification did not get pushed");
}
}
catch (Exception e)
{
Log.Error(e);
}
} }
} }
} }