Merge pull request #1298 from tidusjar/dev

Some emby notification fixes

Ombi.Core/Users/UserHelper.cs

@@ -208,7 +208,7 @@ namespace Ombi.Core.Users
 
             var localUsers = LocalUserRepository.GetAll().ToList();
             var plexUsers = PlexUserRepository.GetAll().ToList();
-            var embyUsers = PlexUserRepository.GetAll().ToList();
+            var embyUsers = EmbyUserRepository.GetAll().ToList();
 
             var filteredLocal = localUsers.Where(x => ((Features)x.Features).HasFlag(features));
             var filteredPlex = plexUsers.Where(x => ((Features)x.Features).HasFlag(features));

Ombi.UI/Modules/UserLoginModule.cs

@@ -692,7 +692,7 @@ namespace Ombi.UI.Modules
                 // Let's find that user!
 
                 var user = UserHelper.GetUser(username);
-                userId = user.UserId;
+                userId = user?.UserId ?? string.Empty;
             }
             UserLogins.Insert(new UserLogins { UserId = userId, Type = type, LastLoggedIn = DateTime.UtcNow });
 

Ombi.UI/Views/SystemStatus/Status.cshtml

@@ -198,7 +198,7 @@
             dataType: "json",
             success: function (response) {
                 $(response).each(function (index, item) {
-                    item.date = moment.utc(item.data).local().format('lll');
+                    item.date = moment.utc(item.date).local().format('lll');
                     var html = changesTemplate(item);
                     $area.append(html);
                 });