Removed NotifyMyAndroid and Pushalot

Fixed: Removed NotifyMyAndroid notifications
Fixed: Remove Pushalot notifications
pull/2789/head
Mark McDowall 6 years ago committed by Taloth Saldono
parent ffc49c9049
commit 62b03adb53

@ -0,0 +1,15 @@
using FluentMigrator;
using NzbDrone.Core.Datastore.Migration.Framework;
namespace NzbDrone.Core.Datastore.Migration
{
[Migration(125)]
public class remove_notify_my_android_and_pushalot_notifications : NzbDroneMigrationBase
{
protected override void MainDbUpgrade()
{
Delete.FromTable("Notifications").Row(new { Implementation = "NotifyMyAndroid" });
Delete.FromTable("Notifications").Row(new { Implementation = "Pushalot" });
}
}
}

@ -1,38 +0,0 @@
using System.Collections.Generic;
using FluentValidation.Results;
using NzbDrone.Common.Extensions;
namespace NzbDrone.Core.Notifications.NotifyMyAndroid
{
public class NotifyMyAndroid : NotificationBase<NotifyMyAndroidSettings>
{
private readonly INotifyMyAndroidProxy _proxy;
public NotifyMyAndroid(INotifyMyAndroidProxy proxy)
{
_proxy = proxy;
}
public override string Link => "https://www.notifymyandroid.com/";
public override string Name => "Notify My Android";
public override void OnGrab(GrabMessage grabMessage)
{
_proxy.SendNotification(EPISODE_GRABBED_TITLE, grabMessage.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
}
public override void OnDownload(DownloadMessage message)
{
_proxy.SendNotification(EPISODE_DOWNLOADED_TITLE, message.Message, Settings.ApiKey, (NotifyMyAndroidPriority)Settings.Priority);
}
public override ValidationResult Test()
{
var failures = new List<ValidationFailure>();
failures.AddIfNotNull(_proxy.Test(Settings));
return new ValidationResult(failures);
}
}
}

@ -1,11 +0,0 @@
namespace NzbDrone.Core.Notifications.NotifyMyAndroid
{
public enum NotifyMyAndroidPriority
{
VeryLow = -2,
Moderate = -1,
Normal = 0,
High = 1,
Emergency = 2
}
}

@ -1,85 +0,0 @@
using System;
using System.Linq;
using System.Net;
using System.Xml.Linq;
using FluentValidation.Results;
using NLog;
using NzbDrone.Core.Exceptions;
using RestSharp;
using NzbDrone.Core.Rest;
namespace NzbDrone.Core.Notifications.NotifyMyAndroid
{
public interface INotifyMyAndroidProxy
{
void SendNotification(string title, string message, string apiKye, NotifyMyAndroidPriority priority);
ValidationFailure Test(NotifyMyAndroidSettings settings);
}
public class NotifyMyAndroidProxy : INotifyMyAndroidProxy
{
private readonly Logger _logger;
private const string URL = "https://www.notifymyandroid.com/publicapi";
public NotifyMyAndroidProxy(Logger logger)
{
_logger = logger;
}
public void SendNotification(string title, string message, string apiKey, NotifyMyAndroidPriority priority)
{
var client = RestClientFactory.BuildClient(URL);
var request = new RestRequest("notify", Method.POST);
request.RequestFormat = DataFormat.Xml;
request.AddParameter("apikey", apiKey);
request.AddParameter("application", "Sonarr");
request.AddParameter("event", title);
request.AddParameter("description", message);
request.AddParameter("priority", (int)priority);
var response = client.ExecuteAndValidate(request);
ValidateResponse(response);
}
private void Verify(string apiKey)
{
var client = RestClientFactory.BuildClient(URL);
var request = new RestRequest("verify", Method.GET);
request.RequestFormat = DataFormat.Xml;
request.AddParameter("apikey", apiKey, ParameterType.GetOrPost);
var response = client.ExecuteAndValidate(request);
ValidateResponse(response);
}
private void ValidateResponse(IRestResponse response)
{
var xDoc = XDocument.Parse(response.Content);
var nma = xDoc.Descendants("nma").Single();
var error = nma.Descendants("error").SingleOrDefault();
if (error != null)
{
((HttpStatusCode)Convert.ToInt32(error.Attribute("code").Value)).VerifyStatusCode(error.Value);
}
}
public ValidationFailure Test(NotifyMyAndroidSettings settings)
{
try
{
const string title = "Test Notification";
const string body = "This is a test message from Sonarr";
Verify(settings.ApiKey);
SendNotification(title, body, settings.ApiKey, (NotifyMyAndroidPriority)settings.Priority);
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to send test message");
return new ValidationFailure("ApiKey", "Unable to send test message");
}
return null;
}
}
}

@ -1,33 +0,0 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.NotifyMyAndroid
{
public class NotifyMyAndroidSettingsValidator : AbstractValidator<NotifyMyAndroidSettings>
{
public NotifyMyAndroidSettingsValidator()
{
RuleFor(c => c.ApiKey).NotEmpty();
}
}
public class NotifyMyAndroidSettings : IProviderConfig
{
private static readonly NotifyMyAndroidSettingsValidator Validator = new NotifyMyAndroidSettingsValidator();
[FieldDefinition(0, Label = "API Key", HelpLink = "http://www.notifymyandroid.com/")]
public string ApiKey { get; set; }
[FieldDefinition(1, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(NotifyMyAndroidPriority))]
public int Priority { get; set; }
public bool IsValid => !string.IsNullOrWhiteSpace(ApiKey) && Priority >= -1 && Priority <= 2;
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

@ -1,40 +0,0 @@
using System.Collections.Generic;
using FluentValidation.Results;
using NzbDrone.Common.Extensions;
using NzbDrone.Core.Tv;
namespace NzbDrone.Core.Notifications.Pushalot
{
public class Pushalot : NotificationBase<PushalotSettings>
{
private readonly IPushalotProxy _proxy;
public Pushalot(IPushalotProxy proxy)
{
_proxy = proxy;
}
public override string Name => "Pushalot";
public override string Link => "https://pushalot.com/";
public override void OnGrab(GrabMessage grabMessage)
{
_proxy.SendNotification(EPISODE_GRABBED_TITLE, grabMessage.Message, Settings);
}
public override void OnDownload(DownloadMessage message)
{
_proxy.SendNotification(EPISODE_DOWNLOADED_TITLE, message.Message, Settings);
}
public override ValidationResult Test()
{
var failures = new List<ValidationFailure>();
failures.AddIfNotNull(_proxy.Test(Settings));
return new ValidationResult(failures);
}
}
}

@ -1,9 +0,0 @@
namespace NzbDrone.Core.Notifications.Pushalot
{
public enum PushalotPriority
{
Silent = -1,
Normal = 0,
Important = 1
}
}

@ -1,106 +0,0 @@
using System;
using System.Net;
using FluentValidation.Results;
using NLog;
using NzbDrone.Common.Serializer;
using NzbDrone.Core.Rest;
using RestSharp;
namespace NzbDrone.Core.Notifications.Pushalot
{
public interface IPushalotProxy
{
void SendNotification(string title, string message, PushalotSettings settings);
ValidationFailure Test(PushalotSettings settings);
}
public class PushalotProxy : IPushalotProxy
{
private readonly Logger _logger;
private const string URL = "https://pushalot.com/api/sendmessage";
public PushalotProxy(Logger logger)
{
_logger = logger;
}
public void SendNotification(string title, string message, PushalotSettings settings)
{
var client = RestClientFactory.BuildClient(URL);
var request = BuildRequest();
request.AddParameter("Source", "Sonarr");
if (settings.Image)
{
request.AddParameter("Image", "https://raw.githubusercontent.com/Sonarr/Sonarr/develop/Logo/128.png");
}
request.AddParameter("Title", title);
request.AddParameter("Body", message);
request.AddParameter("AuthorizationToken", settings.AuthToken);
if ((PushalotPriority)settings.Priority == PushalotPriority.Important)
{
request.AddParameter("IsImportant", true);
}
if ((PushalotPriority)settings.Priority == PushalotPriority.Silent)
{
request.AddParameter("IsSilent", true);
}
client.ExecuteAndValidate(request);
}
public RestRequest BuildRequest()
{
var request = new RestRequest(Method.POST);
return request;
}
public ValidationFailure Test(PushalotSettings settings)
{
try
{
const string title = "Test Notification";
const string body = "This is a test message from Sonarr";
SendNotification(title, body, settings);
}
catch (RestException ex)
{
if (ex.Response.StatusCode == HttpStatusCode.Unauthorized)
{
_logger.Error(ex, "Authentication Token is invalid");
return new ValidationFailure("AuthToken", "Authentication Token is invalid");
}
if (ex.Response.StatusCode == HttpStatusCode.NotAcceptable)
{
_logger.Error(ex, "Message limit reached");
return new ValidationFailure("AuthToken", "Message limit reached");
}
if (ex.Response.StatusCode == HttpStatusCode.Gone)
{
_logger.Error(ex, "Authorization Token is no longer valid");
return new ValidationFailure("AuthToken", "Authorization Token is no longer valid, please use a new one.");
}
var response = Json.Deserialize<PushalotResponse>(ex.Response.Content);
_logger.Error(ex, "Unable to send test message");
return new ValidationFailure("AuthToken", response.Description);
}
catch (Exception ex)
{
_logger.Error(ex, "Unable to send test message");
return new ValidationFailure("", "Unable to send test message");
}
return null;
}
}
}

@ -1,9 +0,0 @@
namespace NzbDrone.Core.Notifications.Pushalot
{
public class PushalotResponse
{
public bool Success { get; set; }
public int Status { get; set; }
public string Description { get; set; }
}
}

@ -1,41 +0,0 @@
using FluentValidation;
using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation;
namespace NzbDrone.Core.Notifications.Pushalot
{
public class PushalotSettingsValidator : AbstractValidator<PushalotSettings>
{
public PushalotSettingsValidator()
{
RuleFor(c => c.AuthToken).NotEmpty();
}
}
public class PushalotSettings : IProviderConfig
{
public PushalotSettings()
{
Image = true;
}
private static readonly PushalotSettingsValidator Validator = new PushalotSettingsValidator();
[FieldDefinition(0, Label = "Authorization Token", HelpLink = "https://pushalot.com/manager/authorizations")]
public string AuthToken { get; set; }
[FieldDefinition(1, Label = "Priority", Type = FieldType.Select, SelectOptions = typeof(PushalotPriority))]
public int Priority { get; set; }
[FieldDefinition(2, Label = "Image", Type = FieldType.Checkbox, HelpText = "Include Sonarr logo with notifications")]
public bool Image { get; set; }
public bool IsValid => !string.IsNullOrWhiteSpace(AuthToken);
public NzbDroneValidationResult Validate()
{
return new NzbDroneValidationResult(Validator.Validate(this));
}
}
}

@ -315,6 +315,7 @@
<Compile Include="Datastore\Migration\121_update_animetosho_url.cs" />
<Compile Include="Datastore\Migration\122_add_remux_qualities_in_profile.cs" />
<Compile Include="Datastore\Migration\124_remove_media_browser_metadata.cs" />
<Compile Include="Datastore\Migration\125_remove_notify_my_android_and_pushalot_notifications.cs" />
<Compile Include="Datastore\Migration\117_add_webrip_and_br480_qualites_in_profile.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
<Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
@ -1038,10 +1039,6 @@
<Compile Include="Notifications\NotificationFactory.cs" />
<Compile Include="Notifications\NotificationRepository.cs" />
<Compile Include="Notifications\NotificationService.cs" />
<Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroid.cs" />
<Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidPriority.cs" />
<Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidProxy.cs" />
<Compile Include="Notifications\NotifyMyAndroid\NotifyMyAndroidSettings.cs" />
<Compile Include="Notifications\Plex\HomeTheater\PlexClient.cs">
<SubType>Code</SubType>
</Compile>
@ -1061,11 +1058,6 @@
<SubType>Code</SubType>
</Compile>
<Compile Include="Notifications\Prowl\ProwlSettings.cs" />
<Compile Include="Notifications\Pushalot\Pushalot.cs" />
<Compile Include="Notifications\Pushalot\PushalotPriority.cs" />
<Compile Include="Notifications\Pushalot\PushalotProxy.cs" />
<Compile Include="Notifications\Pushalot\PushalotResponse.cs" />
<Compile Include="Notifications\Pushalot\PushalotSettings.cs" />
<Compile Include="Notifications\PushBullet\PushBullet.cs" />
<Compile Include="Notifications\PushBullet\PushBulletProxy.cs" />
<Compile Include="Notifications\PushBullet\PushBulletSettings.cs" />

Loading…
Cancel
Save