Merge pull request #2534 from tidusjar/develop

Develop

CHANGELOG.md

@@ -4,6 +4,107 @@
 
 ### **Fixes**
 
+- Fixed the issue with notifications not sending. [Jamie]
+
+- Removes Legacy command result variables. [Qstick]
+
+
+## v3.0.3786 (2018-09-22)
+
+### **New Features**
+
+- Update CHANGELOG.md. [Jamie]
+
+### **Fixes**
+
+- New translations en.json (Swedish) [Jamie]
+
+- New translations en.json (Spanish) [Jamie]
+
+- New translations en.json (Portuguese, Brazilian) [Jamie]
+
+- New translations en.json (Polish) [Jamie]
+
+- New translations en.json (Norwegian) [Jamie]
+
+- New translations en.json (Italian) [Jamie]
+
+- New translations en.json (German) [Jamie]
+
+- New translations en.json (French) [Jamie]
+
+- New translations en.json (Dutch) [Jamie]
+
+- New translations en.json (Danish) [Jamie]
+
+- New translations en.json (Swedish) [Jamie]
+
+- New translations en.json (Spanish) [Jamie]
+
+- New translations en.json (Portuguese, Brazilian) [Jamie]
+
+- New translations en.json (Polish) [Jamie]
+
+- New translations en.json (Norwegian) [Jamie]
+
+- New translations en.json (Italian) [Jamie]
+
+- New translations en.json (German) [Jamie]
+
+- New translations en.json (French) [Jamie]
+
+- New translations en.json (Dutch) [Jamie]
+
+- New translations en.json (Danish) [Jamie]
+
+- New translations en.json (Swedish) [Jamie]
+
+- New translations en.json (Spanish) [Jamie]
+
+- New translations en.json (Portuguese, Brazilian) [Jamie]
+
+- New translations en.json (Polish) [Jamie]
+
+- New translations en.json (Norwegian) [Jamie]
+
+- New translations en.json (Italian) [Jamie]
+
+- New translations en.json (German) [Jamie]
+
+- New translations en.json (French) [Jamie]
+
+- New translations en.json (Dutch) [Jamie]
+
+- New translations en.json (Danish) [Jamie]
+
+- New translations en.json (Swedish) [Jamie]
+
+- New translations en.json (German) [Jamie]
+
+- New translations en.json (German) [Jamie]
+
+- New translations en.json (Swedish) [Jamie]
+
+- New translations en.json (Spanish) [Jamie]
+
+- New translations en.json (Portuguese, Brazilian) [Jamie]
+
+- New translations en.json (Polish) [Jamie]
+
+- New translations en.json (Norwegian) [Jamie]
+
+- New translations en.json (Italian) [Jamie]
+
+- New translations en.json (German) [Jamie]
+
+- New translations en.json (French) [Jamie]
+
+- New translations en.json (Dutch) [Jamie]
+
+- New translations en.json (Danish) [Jamie]
+
+- New translations en.json (Portuguese, Brazilian) [Jamie]
+
 - Fix #2529 - Change data type to long. [Anojh]
 
 - Fix #2527 - Music request not triggering search and failing. [Anojh]

src/Ombi.Api.Lidarr/Models/CommandResult.cs

@@ -6,10 +6,10 @@ namespace Ombi.Api.Lidarr.Models
     public class CommandResult
     {
         public string name { get; set; }
-        public DateTime startedOn { get; set; }
+        public DateTime queued { get; set; }
         public DateTime stateChangeTime { get; set; }
         public bool sendUpdatesToClient { get; set; }
-        public string state { get; set; }
+        public string status { get; set; }
         public int id { get; set; }
     }
-}
+}

src/Ombi.Notifications/NotificationMessageCurlys.cs

@@ -17,7 +17,11 @@ namespace Ombi.Notifications
         public void Setup(NotificationOptions opts, FullBaseRequest req, CustomizationSettings s, UserNotificationPreferences pref)
         {
             LoadIssues(opts);
-            UserPreference = pref.Enabled ? pref.Value : string.Empty;
+            if (pref != null)
+            {
+                UserPreference = pref.Enabled ? pref.Value : string.Empty;
+            }
+
             string title;
             if (req == null)
             {
@@ -62,7 +66,10 @@ namespace Ombi.Notifications
         public void Setup(NotificationOptions opts, AlbumRequest req, CustomizationSettings s, UserNotificationPreferences pref)
         {
             LoadIssues(opts);
-            UserPreference = pref.Enabled ? pref.Value : string.Empty;
+            if (pref != null)
+            {
+                UserPreference = pref.Enabled ? pref.Value : string.Empty;
+            }
             string title;
             if (req == null)
             {
@@ -106,7 +113,10 @@ namespace Ombi.Notifications
         public void Setup(NotificationOptions opts, ChildRequests req, CustomizationSettings s, UserNotificationPreferences pref)
         {
             LoadIssues(opts);
-            UserPreference = pref.Enabled ? pref.Value : string.Empty;
+            if (pref != null)
+            {
+                UserPreference = pref.Enabled ? pref.Value : string.Empty;
+            }
             string title;
             if (req == null)
             {