Fixed the issue where notifications are not being sent to users with Aliases #912

pull/919/head
Jamie.Rees 8 years ago
parent bda34c9d1b
commit 02f3d85e98

@ -88,7 +88,6 @@ namespace Ombi.Services.Notification
} }
} }
//var selectedUsers = users.Select(x => x.Username).Intersect(model.RequestedUsers, StringComparer.CurrentCultureIgnoreCase);
foreach (var user in selectedUsers) foreach (var user in selectedUsers)
{ {
Log.Info("Notifying user {0}", user); Log.Info("Notifying user {0}", user);
@ -99,19 +98,42 @@ namespace Ombi.Services.Notification
return; return;
} }
var localUser =
users.FirstOrDefault( x =>
x.Username.Equals(user, StringComparison.CurrentCultureIgnoreCase) ||
x.UserAlias.Equals(user, StringComparison.CurrentCultureIgnoreCase));
// So if the request was from an alias, then we need to use the local user (since that contains the alias).
// If we do not have a local user, then we should be using the Plex user if that user exists.
// This will execute most of the time since Plex and Local users will most always be in the database.
if (localUser != null)
{
if (string.IsNullOrEmpty(localUser?.EmailAddress))
{
Log.Info("There is no email address for this Local user ({0}), cannot send notification", localUser.Username);
continue;
}
Log.Info("Sending notification to: {0} at: {1}, for : {2}", localUser, localUser.EmailAddress, model.Title);
await PublishUserNotification(localUser.Username, localUser.EmailAddress, model.Title, model.PosterPath, type, model.Type);
}
else
{
var email = plexUser.User.FirstOrDefault(x => x.Username.Equals(user, StringComparison.CurrentCultureIgnoreCase)); var email = plexUser.User.FirstOrDefault(x => x.Username.Equals(user, StringComparison.CurrentCultureIgnoreCase));
if (string.IsNullOrEmpty(email?.Email)) if (string.IsNullOrEmpty(email?.Email))
{ {
Log.Info("There is no email address for this Plex user, cannot send notification"); Log.Info("There is no email address for this Plex user ({0}), cannot send notification", email?.Username);
// We do not have a plex user that requested this! // We do not have a plex user that requested this!
continue; continue;
} }
Log.Info("Sending notification to: {0} at: {1}, for title: {2}", email.Username, email.Email, model.Title); Log.Info("Sending notification to: {0} at: {1}, for : {2}", email.Username, email.Email, model.Title);
await PublishUserNotification(email.Username, email.Email, model.Title, model.PosterPath, type, model.Type); await PublishUserNotification(email.Username, email.Email, model.Title, model.PosterPath, type, model.Type);
} }
} }
} }
}
catch (Exception e) catch (Exception e)
{ {
Log.Error(e); Log.Error(e);

Loading…
Cancel
Save