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

Resolved #75

Browse source
This commit is contained in:
tidusjar 2016-03-22 21:31:52 +00:00
parent 0585ff73ec
commit f64ccd7327
2 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,7 +77,15 @@ namespace PlexRequests.Services.Notification
private bool ValidateConfiguration()
{
return !Settings.Enabled && !string.IsNullOrEmpty(Settings.AccessToken);
if (!Settings.Enabled)
{
return false;
}
if (string.IsNullOrEmpty(Settings.AccessToken))
{
return false;
}
return true;
}
private PushbulletNotificationSettings GetSettings()
@ -106,8 +114,8 @@ namespace PlexRequests.Services.Notification
private bool PushIssue(NotificationModel model)
{
var message = $"A new issue: {model.Title} has been reported by user: {model.User} for the title: {model.Body}";
var pushTitle = $"Plex Requests: A new issue has been reported for {model.Body}";
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}";
try
{
var result = PushbulletApi.Push(Settings.AccessToken, pushTitle, message, Settings.DeviceIdentifier);

13
PlexRequests.UI/Modules/RequestsModule.cs
View file

@ -25,6 +25,7 @@
// ************************************************************************/
#endregion
using System;
using System.Collections.Generic;
using System.Linq;
@ -37,6 +38,7 @@ using Nancy.Security;
using PlexRequests.Api;
using PlexRequests.Core;
using PlexRequests.Core.SettingModels;
using PlexRequests.Services.Notification;
using PlexRequests.Store;
using PlexRequests.UI.Models;
@ -166,6 +168,17 @@ namespace PlexRequests.UI.Modules
var result = Service.UpdateRequest(originalRequest);
var model = new NotificationModel
{
User = Session[SessionKeys.UsernameKey].ToString(),
NotificationType = NotificationType.Issue,
Title = originalRequest.Title,
DateTime = DateTime.Now,
Body = issue == IssueState.Other ? comment : issue.Humanize()
};
NotificationService.Publish(model);
return Response.AsJson(result
? new JsonResponseModel { Result = true }
: new JsonResponseModel { Result = false, Message = "Could not add issue, please try again or contact the administrator!" });