From 65233cb3b7ded3fcdbc2436eaa8fe312407c4de9 Mon Sep 17 00:00:00 2001
From: TidusJar <tidusjar@gmail.com>
Date: Tue, 9 Oct 2018 20:01:46 +0100
Subject: [PATCH] Fixed the issue where user preferences was not being inported
 into some notifications

---
 src/Ombi.Notifications/BaseNotification.cs    | 20 ++++++++++++++++++-
 .../NotificationMessageCurlys.cs              |  3 ++-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/Ombi.Notifications/BaseNotification.cs b/src/Ombi.Notifications/BaseNotification.cs
index d351c8283..53d6d5d9d 100644
--- a/src/Ombi.Notifications/BaseNotification.cs
+++ b/src/Ombi.Notifications/BaseNotification.cs
@@ -170,6 +170,24 @@ namespace Ombi.Notifications.Interfaces
             {
                 return new NotificationMessageContent { Disabled = true };
             }
+
+            if (model.UserId.IsNullOrEmpty())
+            {
+                if (model.RequestType == RequestType.Movie)
+                {
+                    model.UserId = MovieRequest.RequestedUserId;
+                }
+
+                if (model.RequestType == RequestType.Album)
+                {
+                    model.UserId = AlbumRequest.RequestedUserId;
+                }
+
+                if (model.RequestType == RequestType.TvShow)
+                {
+                    model.UserId = TvRequest.RequestedUserId;
+                }
+            }
             var parsed = Parse(model, template, agent);
 
             return parsed;
@@ -184,7 +202,7 @@ namespace Ombi.Notifications.Interfaces
         protected UserNotificationPreferences GetUserPreference(string userId, NotificationAgent agent)
         {
             return UserNotificationPreferences.GetAll()
-                .FirstOrDefault(x => x.Enabled && x.Agent == agent && x.UserId == userId);
+                .FirstOrDefault(x => x.Agent == agent && x.UserId == userId);
         }
 
         private NotificationMessageContent Parse(NotificationOptions model, NotificationTemplates template, NotificationAgent agent)
diff --git a/src/Ombi.Notifications/NotificationMessageCurlys.cs b/src/Ombi.Notifications/NotificationMessageCurlys.cs
index 1b655b84d..b178f0545 100644
--- a/src/Ombi.Notifications/NotificationMessageCurlys.cs
+++ b/src/Ombi.Notifications/NotificationMessageCurlys.cs
@@ -19,7 +19,7 @@ namespace Ombi.Notifications
             LoadIssues(opts);
             if (pref != null)
             {
-                UserPreference = pref.Enabled ? pref.Value : string.Empty;
+                UserPreference = pref.Value;
             }
 
             string title;
@@ -268,6 +268,7 @@ namespace Ombi.Notifications
             {nameof(IssueUser),IssueUser},
             {nameof(UserName),UserName},
             {nameof(Alias),Alias},
+            {nameof(UserPreference),UserPreference},
         };
     }
 }
\ No newline at end of file