github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-13 08:42:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the issue where user preferences was not being inported into some notifications

Browse source
This commit is contained in:
TidusJar 2018-10-09 20:01:46 +01:00
parent afc55e6f1f
commit 65233cb3b7
2 changed files with 21 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Ombi.Notifications/BaseNotification.cs
View file

@ -170,6 +170,24 @@ namespace Ombi.Notifications.Interfaces
{ {
return new NotificationMessageContent { Disabled = true }; 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); var parsed = Parse(model, template, agent);
return parsed; return parsed;
@ -184,7 +202,7 @@ namespace Ombi.Notifications.Interfaces
protected UserNotificationPreferences GetUserPreference(string userId, NotificationAgent agent) protected UserNotificationPreferences GetUserPreference(string userId, NotificationAgent agent)
{ {
return UserNotificationPreferences.GetAll() 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) private NotificationMessageContent Parse(NotificationOptions model, NotificationTemplates template, NotificationAgent agent)

3
src/Ombi.Notifications/NotificationMessageCurlys.cs
View file

@ -19,7 +19,7 @@ namespace Ombi.Notifications
LoadIssues(opts); LoadIssues(opts);
if (pref != null) if (pref != null)
{ {
UserPreference = pref.Enabled ? pref.Value : string.Empty; UserPreference = pref.Value;
} }
string title; string title;
@ -268,6 +268,7 @@ namespace Ombi.Notifications
{nameof(IssueUser),IssueUser}, {nameof(IssueUser),IssueUser},
{nameof(UserName),UserName}, {nameof(UserName),UserName},
{nameof(Alias),Alias}, {nameof(Alias),Alias},
{nameof(UserPreference),UserPreference},
}; };
} }
} }