github/Ombi
1
0
Fork 0
mirror of https://github.com/Ombi-app/Ombi.git synced 2025-07-16 02:02:55 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fixed the mass email, it was only being set to users with the newsletter feature #358

Browse source
This commit is contained in:
tidusjar 2017-02-03 14:45:39 +00:00
parent 29c8b456f4
commit 425522ea06
3 changed files with 59 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Ombi.Services/Interfaces/IRecentlyAdded.cs
View file

@ -6,6 +6,6 @@ namespace Ombi.Services.Jobs
{ {
void Execute(IJobExecutionContext context); void Execute(IJobExecutionContext context);
void RecentlyAddedAdminTest(); void RecentlyAddedAdminTest();
void Start(); void StartNewsLetter();
} }
} }

73
Ombi.Services/Jobs/RecentlyAdded.cs
View file

@ -67,8 +67,6 @@ namespace Ombi.Services.Jobs
private IPlexApi Api { get; } private IPlexApi Api { get; }
private TvMazeApi TvApi = new TvMazeApi(); private TvMazeApi TvApi = new TvMazeApi();
private readonly TheMovieDbApi _movieApi = new TheMovieDbApi(); private readonly TheMovieDbApi _movieApi = new TheMovieDbApi();
private const int MetadataTypeTv = 4;
private const int MetadataTypeMovie = 1;
private ISettingsService<PlexSettings> PlexSettings { get; } private ISettingsService<PlexSettings> PlexSettings { get; }
private ISettingsService<EmailNotificationSettings> EmailSettings { get; } private ISettingsService<EmailNotificationSettings> EmailSettings { get; }
private ISettingsService<NewletterSettings> NewsletterSettings { get; } private ISettingsService<NewletterSettings> NewsletterSettings { get; }
@ -78,7 +76,7 @@ namespace Ombi.Services.Jobs
private static readonly Logger Log = LogManager.GetCurrentClassLogger(); private static readonly Logger Log = LogManager.GetCurrentClassLogger();
public void Start() public void StartNewsLetter()
{ {
try try
{ {
@ -88,7 +86,7 @@ namespace Ombi.Services.Jobs
return; return;
} }
JobRecord.SetRunning(true, JobNames.RecentlyAddedEmail); JobRecord.SetRunning(true, JobNames.RecentlyAddedEmail);
Start(settings); StartNewsLetter(settings);
} }
catch (Exception e) catch (Exception e)
{ {
@ -102,35 +100,33 @@ namespace Ombi.Services.Jobs
} }
public void Execute(IJobExecutionContext context) public void Execute(IJobExecutionContext context)
{ {
Start(); StartNewsLetter();
} }
public void RecentlyAddedAdminTest() public void RecentlyAddedAdminTest()
{ {
Log.Debug("Starting Recently Added Newsletter Test"); Log.Debug("Starting Recently Added Newsletter Test");
var settings = NewsletterSettings.GetSettings(); var settings = NewsletterSettings.GetSettings();
Start(settings, true); StartNewsLetter(settings, true);
} }
public void MassEmailAdminTest(string html, string subject) public void MassEmailAdminTest(string html, string subject)
{ {
Log.Debug("Starting Mass Email Test"); Log.Debug("Starting Mass Email Test");
var settings = NewsletterSettings.GetSettings();
var plexSettings = PlexSettings.GetSettings();
var template = new MassEmailTemplate(); var template = new MassEmailTemplate();
var body = template.LoadTemplate(html); var body = template.LoadTemplate(html);
Send(settings, body, plexSettings, true, subject); SendMassEmail(body, subject, true);
} }
public void SendMassEmail(string html, string subject) public void SendMassEmail(string html, string subject)
{ {
Log.Debug("Starting Mass Email Test"); Log.Debug("Starting Mass Email Test");
var settings = NewsletterSettings.GetSettings();
var plexSettings = PlexSettings.GetSettings();
var template = new MassEmailTemplate(); var template = new MassEmailTemplate();
var body = template.LoadTemplate(html); var body = template.LoadTemplate(html);
Send(settings, body, plexSettings, false, subject); SendMassEmail(body, subject, false);
} }
private void Start(NewletterSettings newletterSettings, bool testEmail = false) private void StartNewsLetter(NewletterSettings newletterSettings, bool testEmail = false)
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
var plexSettings = PlexSettings.GetSettings(); var plexSettings = PlexSettings.GetSettings();
@ -222,7 +218,7 @@ namespace Ombi.Services.Jobs
string escapedHtml = new string(html.Where(c => !char.IsControl(c)).ToArray()); string escapedHtml = new string(html.Where(c => !char.IsControl(c)).ToArray());
Log.Debug(escapedHtml); Log.Debug(escapedHtml);
Send(newletterSettings, escapedHtml, plexSettings, testEmail); SendNewsletter(newletterSettings, escapedHtml, plexSettings, testEmail);
} }
private void GenerateMovieHtml(List<RecentlyAddedChild> movies, PlexSettings plexSettings, StringBuilder sb) private void GenerateMovieHtml(List<RecentlyAddedChild> movies, PlexSettings plexSettings, StringBuilder sb)
@ -457,9 +453,49 @@ namespace Ombi.Services.Jobs
sb.Append("</table><br /><br />"); sb.Append("</table><br /><br />");
} }
private void Send(NewletterSettings newletterSettings, string html, PlexSettings plexSettings, bool testEmail = false, string subject = "New Content on Plex!")
private void SendMassEmail(string html, string subject, bool testEmail)
{ {
Log.Debug("Entering Send"); var settings = EmailSettings.GetSettings();
if (!settings.Enabled || string.IsNullOrEmpty(settings.EmailHost))
{
return;
}
var body = new BodyBuilder { HtmlBody = html, TextBody = "This email is only available on devices that support HTML." };
var message = new MimeMessage
{
Body = body.ToMessageBody(),
Subject = subject
};
Log.Debug("Created Plain/HTML MIME body");
if (!testEmail)
{
var users = UserHelper.GetUsers(); // Get all users
if (users != null)
{
foreach (var user in users)
{
if (!string.IsNullOrEmpty(user.EmailAddress))
{
message.Bcc.Add(new MailboxAddress(user.Username, user.EmailAddress)); // BCC everyone
}
}
}
}
message.Bcc.Add(new MailboxAddress(settings.EmailUsername, settings.RecipientEmail)); // Include the admin
message.From.Add(new MailboxAddress(settings.EmailUsername, settings.EmailSender));
SendMail(settings, message);
}
// TODO Emby
private void SendNewsletter(NewletterSettings newletterSettings, string html, bool testEmail = false, string subject = "New Content on Plex!")
{
Log.Debug("Entering SendNewsletter");
var settings = EmailSettings.GetSettings(); var settings = EmailSettings.GetSettings();
if (!settings.Enabled || string.IsNullOrEmpty(settings.EmailHost)) if (!settings.Enabled || string.IsNullOrEmpty(settings.EmailHost))
@ -506,6 +542,11 @@ namespace Ombi.Services.Jobs
message.Bcc.Add(new MailboxAddress(settings.EmailUsername, settings.RecipientEmail)); // Include the admin message.Bcc.Add(new MailboxAddress(settings.EmailUsername, settings.RecipientEmail)); // Include the admin
message.From.Add(new MailboxAddress(settings.EmailUsername, settings.EmailSender)); message.From.Add(new MailboxAddress(settings.EmailUsername, settings.EmailSender));
SendMail(settings, message);
}
private void SendMail(EmailNotificationSettings settings, MimeMessage message)
{
try try
{ {
using (var client = new SmtpClient()) using (var client = new SmtpClient())

2
Ombi.UI/Modules/Admin/ScheduledJobsRunnerModule.cs
View file

@ -142,7 +142,7 @@ namespace Ombi.UI.Modules.Admin
} }
if (key.Equals(JobNames.RecentlyAddedEmail, StringComparison.CurrentCultureIgnoreCase)) if (key.Equals(JobNames.RecentlyAddedEmail, StringComparison.CurrentCultureIgnoreCase))
{ {
RecentlyAdded.Start(); RecentlyAdded.StartNewsLetter();
} }
if (key.Equals(JobNames.FaultQueueHandler, StringComparison.CurrentCultureIgnoreCase)) if (key.Equals(JobNames.FaultQueueHandler, StringComparison.CurrentCultureIgnoreCase))
{ {