-
-
Notifications
You must be signed in to change notification settings - Fork 404
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
show request type in notifications #346 and fix an issue from previou…
…s commit for #345
- Loading branch information
Drewster727
committed
Jun 22, 2016
1 parent
96f27f8
commit f76e544
Showing
6 changed files
with
458 additions
and
428 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,40 +1,42 @@ | ||
| #region Copyright | ||
| // /************************************************************************ | ||
| // Copyright (c) 2016 Jamie Rees | ||
| // File: NotificationModel.cs | ||
| // Created By: Jamie Rees | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // ************************************************************************/ | ||
| #endregion | ||
| using System; | ||
|
|
||
| namespace PlexRequests.Services.Notification | ||
| { | ||
| public class NotificationModel | ||
| { | ||
| public string Title { get; set; } | ||
| public string Body { get; set; } | ||
| public DateTime DateTime { get; set; } | ||
| public NotificationType NotificationType { get; set; } | ||
| public string User { get; set; } | ||
| public string UserEmail { get; set; } | ||
| } | ||
| #region Copyright | ||
| // /************************************************************************ | ||
| // Copyright (c) 2016 Jamie Rees | ||
| // File: NotificationModel.cs | ||
| // Created By: Jamie Rees | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // ************************************************************************/ | ||
| #endregion | ||
| using PlexRequests.Store; | ||
| using System; | ||
|
|
||
| namespace PlexRequests.Services.Notification | ||
| { | ||
| public class NotificationModel | ||
| { | ||
| public string Title { get; set; } | ||
| public string Body { get; set; } | ||
| public DateTime DateTime { get; set; } | ||
| public NotificationType NotificationType { get; set; } | ||
| public string User { get; set; } | ||
| public string UserEmail { get; set; } | ||
| public RequestType RequestType { get; set; } | ||
| } | ||
| } |
283 changes: 142 additions & 141 deletions
283
PlexRequests.Services/Notification/PushbulletNotification.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,142 +1,143 @@ | ||
| #region Copyright | ||
| // /************************************************************************ | ||
| // Copyright (c) 2016 Jamie Rees | ||
| // File: PushbulletNotification.cs | ||
| // Created By: Jamie Rees | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // ************************************************************************/ | ||
| #endregion | ||
| using System; | ||
| using System.Threading.Tasks; | ||
|
|
||
| using NLog; | ||
|
|
||
| using PlexRequests.Api.Interfaces; | ||
| using PlexRequests.Core; | ||
| using PlexRequests.Core.SettingModels; | ||
| using PlexRequests.Services.Interfaces; | ||
|
|
||
| namespace PlexRequests.Services.Notification | ||
| { | ||
| public class PushbulletNotification : INotification | ||
| { | ||
| public PushbulletNotification(IPushbulletApi pushbulletApi, ISettingsService<PushbulletNotificationSettings> settings) | ||
| { | ||
| PushbulletApi = pushbulletApi; | ||
| SettingsService = settings; | ||
| } | ||
| private IPushbulletApi PushbulletApi { get; } | ||
| private ISettingsService<PushbulletNotificationSettings> SettingsService { get; } | ||
|
|
||
| private static Logger Log = LogManager.GetCurrentClassLogger(); | ||
| public string NotificationName => "PushbulletNotification"; | ||
| public async Task NotifyAsync(NotificationModel model) | ||
| { | ||
| var configuration = GetSettings(); | ||
| await NotifyAsync(model, configuration); | ||
| } | ||
|
|
||
| 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) | ||
| { | ||
| case NotificationType.NewRequest: | ||
| await PushNewRequestAsync(model, pushSettings); | ||
| break; | ||
| case NotificationType.Issue: | ||
| await PushIssueAsync(model, pushSettings); | ||
| break; | ||
| case NotificationType.RequestAvailable: | ||
| break; | ||
| case NotificationType.RequestApproved: | ||
| break; | ||
| case NotificationType.AdminNote: | ||
| break; | ||
| case NotificationType.Test: | ||
| await PushTestAsync(pushSettings); | ||
| break; | ||
| default: | ||
| throw new ArgumentOutOfRangeException(); | ||
| } | ||
| } | ||
|
|
||
| private bool ValidateConfiguration(PushbulletNotificationSettings settings) | ||
| { | ||
| if (!settings.Enabled) | ||
| { | ||
| return false; | ||
| } | ||
| if (string.IsNullOrEmpty(settings.AccessToken)) | ||
| { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| private PushbulletNotificationSettings GetSettings() | ||
| { | ||
| return SettingsService.GetSettings(); | ||
| } | ||
|
|
||
| private async Task PushNewRequestAsync(NotificationModel model, PushbulletNotificationSettings settings) | ||
| { | ||
| var message = $"{model.Title} has been requested by user: {model.User}"; | ||
| var pushTitle = $"Plex Requests: {model.Title} has been requested!"; | ||
| await Push(settings, message, pushTitle); | ||
| } | ||
|
|
||
| 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 pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}"; | ||
| await Push(settings, message, pushTitle); | ||
| } | ||
|
|
||
| private async Task PushTestAsync(PushbulletNotificationSettings settings) | ||
| { | ||
| var message = "This is just a test! Success!"; | ||
| var pushTitle = "Plex Requests: Test Message!"; | ||
| await Push(settings, message, pushTitle); | ||
| } | ||
|
|
||
| private async Task Push(PushbulletNotificationSettings settings, string message, string title) | ||
| { | ||
| try | ||
| { | ||
| var result = await PushbulletApi.PushAsync(settings.AccessToken, title, 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); | ||
| } | ||
| } | ||
| } | ||
| #region Copyright | ||
| // /************************************************************************ | ||
| // Copyright (c) 2016 Jamie Rees | ||
| // File: PushbulletNotification.cs | ||
| // Created By: Jamie Rees | ||
| // | ||
| // Permission is hereby granted, free of charge, to any person obtaining | ||
| // a copy of this software and associated documentation files (the | ||
| // "Software"), to deal in the Software without restriction, including | ||
| // without limitation the rights to use, copy, modify, merge, publish, | ||
| // distribute, sublicense, and/or sell copies of the Software, and to | ||
| // permit persons to whom the Software is furnished to do so, subject to | ||
| // the following conditions: | ||
| // | ||
| // The above copyright notice and this permission notice shall be | ||
| // included in all copies or substantial portions of the Software. | ||
| // | ||
| // THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, | ||
| // EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF | ||
| // MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND | ||
| // NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE | ||
| // LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION | ||
| // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION | ||
| // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| // ************************************************************************/ | ||
| #endregion | ||
| using System; | ||
| using System.Threading.Tasks; | ||
|
|
||
| using NLog; | ||
|
|
||
| using PlexRequests.Api.Interfaces; | ||
| using PlexRequests.Core; | ||
| using PlexRequests.Core.SettingModels; | ||
| using PlexRequests.Services.Interfaces; | ||
| using PlexRequests.Store; | ||
|
|
||
| namespace PlexRequests.Services.Notification | ||
| { | ||
| public class PushbulletNotification : INotification | ||
| { | ||
| public PushbulletNotification(IPushbulletApi pushbulletApi, ISettingsService<PushbulletNotificationSettings> settings) | ||
| { | ||
| PushbulletApi = pushbulletApi; | ||
| SettingsService = settings; | ||
| } | ||
| private IPushbulletApi PushbulletApi { get; } | ||
| private ISettingsService<PushbulletNotificationSettings> SettingsService { get; } | ||
|
|
||
| private static Logger Log = LogManager.GetCurrentClassLogger(); | ||
| public string NotificationName => "PushbulletNotification"; | ||
| public async Task NotifyAsync(NotificationModel model) | ||
| { | ||
| var configuration = GetSettings(); | ||
| await NotifyAsync(model, configuration); | ||
| } | ||
|
|
||
| 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) | ||
| { | ||
| case NotificationType.NewRequest: | ||
| await PushNewRequestAsync(model, pushSettings); | ||
| break; | ||
| case NotificationType.Issue: | ||
| await PushIssueAsync(model, pushSettings); | ||
| break; | ||
| case NotificationType.RequestAvailable: | ||
| break; | ||
| case NotificationType.RequestApproved: | ||
| break; | ||
| case NotificationType.AdminNote: | ||
| break; | ||
| case NotificationType.Test: | ||
| await PushTestAsync(pushSettings); | ||
| break; | ||
| default: | ||
| throw new ArgumentOutOfRangeException(); | ||
| } | ||
| } | ||
|
|
||
| private bool ValidateConfiguration(PushbulletNotificationSettings settings) | ||
| { | ||
| if (!settings.Enabled) | ||
| { | ||
| return false; | ||
| } | ||
| if (string.IsNullOrEmpty(settings.AccessToken)) | ||
| { | ||
| return false; | ||
| } | ||
| return true; | ||
| } | ||
|
|
||
| private PushbulletNotificationSettings GetSettings() | ||
| { | ||
| return SettingsService.GetSettings(); | ||
| } | ||
|
|
||
| private async Task PushNewRequestAsync(NotificationModel model, PushbulletNotificationSettings settings) | ||
| { | ||
| var message = $"The {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} '{model.Title}' has been requested by user: {model.User}"; | ||
| var pushTitle = $"Plex Requests: The {RequestTypeDisplay.Get(model.RequestType)?.ToLower()} {model.Title} has been requested!"; | ||
| await Push(settings, message, pushTitle); | ||
| } | ||
|
|
||
| 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 pushTitle = $"Plex Requests: A new issue has been reported for {model.Title}"; | ||
| await Push(settings, message, pushTitle); | ||
| } | ||
|
|
||
| private async Task PushTestAsync(PushbulletNotificationSettings settings) | ||
| { | ||
| var message = "This is just a test! Success!"; | ||
| var pushTitle = "Plex Requests: Test Message!"; | ||
| await Push(settings, message, pushTitle); | ||
| } | ||
|
|
||
| private async Task Push(PushbulletNotificationSettings settings, string message, string title) | ||
| { | ||
| try | ||
| { | ||
| var result = await PushbulletApi.PushAsync(settings.AccessToken, title, 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); | ||
| } | ||
| } | ||
| } | ||
| } |
Oops, something went wrong.