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

Added the ability to turn off TV or Movies from the newsletter

Browse source
This commit is contained in:
Jamie 2018-04-06 21:36:54 +01:00
commit acb62f4768
4 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
View file

@ -229,20 +229,20 @@ namespace Ombi.Schedule.Jobs.Ombi
return resolver.ParseMessage(template, curlys); return resolver.ParseMessage(template, curlys);
} }
private async Task<string> BuildHtml(IQueryable<PlexServerContent> plexContentToSend, IQueryable<EmbyContent> embyContentToSend, IQueryable<PlexEpisode> plexEpisodes, IQueryable<EmbyEpisode> embyEp) private async Task<string> BuildHtml(IQueryable<PlexServerContent> plexContentToSend, IQueryable<EmbyContent> embyContentToSend, IQueryable<PlexEpisode> plexEpisodes, IQueryable<EmbyEpisode> embyEp, NewsletterSettings settings)
{ {
var sb = new StringBuilder(); var sb = new StringBuilder();
var plexMovies = plexContentToSend.Where(x => x.Type == PlexMediaTypeEntity.Movie); var plexMovies = plexContentToSend.Where(x => x.Type == PlexMediaTypeEntity.Movie);
var embyMovies = embyContentToSend.Where(x => x.Type == EmbyMediaType.Movie); var embyMovies = embyContentToSend.Where(x => x.Type == EmbyMediaType.Movie);
if (plexMovies.Any() || embyMovies.Any()) if ((plexMovies.Any() || embyMovies.Any()) && !settings.DisableMovies)
{ {
sb.Append("<h1>New Movies:</h1><br /><br />"); sb.Append("<h1>New Movies:</h1><br /><br />");
await ProcessPlexMovies(plexMovies, sb); await ProcessPlexMovies(plexMovies, sb);
await ProcessEmbyMovies(embyMovies, sb); await ProcessEmbyMovies(embyMovies, sb);
} }
if (plexEpisodes.Any() || embyEp.Any()) if ((plexEpisodes.Any() || embyEp.Any()) && !settings.DisableTv)
{ {
sb.Append("<h1>New Episodes:</h1><br /><br />"); sb.Append("<h1>New Episodes:</h1><br /><br />");
await ProcessPlexTv(plexEpisodes, sb); await ProcessPlexTv(plexEpisodes, sb);

2
src/Ombi.Settings/Settings/Models/Notifications/NewsletterSettings.cs
View file

@ -2,6 +2,8 @@
{ {
public class NewsletterSettings : Settings public class NewsletterSettings : Settings
{ {
public bool DisableTv { get; set; }
public bool DisableMovies { get; set; }
public bool Enabled { get; set; } public bool Enabled { get; set; }
} }
} }

2
src/Ombi/ClientApp/app/interfaces/INotificationSettings.ts
View file

@ -57,6 +57,8 @@ export interface IDiscordNotifcationSettings extends INotificationSettings {
export interface INewsletterNotificationSettings extends INotificationSettings { export interface INewsletterNotificationSettings extends INotificationSettings {
notificationTemplate: INotificationTemplates; notificationTemplate: INotificationTemplates;
disableMovies: boolean;
disableTv: boolean;
} }
export interface ITelegramNotifcationSettings extends INotificationSettings { export interface ITelegramNotifcationSettings extends INotificationSettings {

10
src/Ombi/ClientApp/app/settings/notifications/newsletter.component.html
View file

@ -9,6 +9,16 @@
<div class="checkbox"> <div class="checkbox">
<input type="checkbox" id="enabled" [(ngModel)]="settings.enabled" ng-checked="settings.enabled"><label for="enabled">Enable</label> <input type="checkbox" id="enabled" [(ngModel)]="settings.enabled" ng-checked="settings.enabled"><label for="enabled">Enable</label>
</div> </div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="disableTv" [(ngModel)]="settings.disableTv" ng-checked="settings.disableTv"><label for="disableTv">Disable TV</label>
</div>
</div>
<div class="form-group">
<div class="checkbox">
<input type="checkbox" id="disableMovies" [(ngModel)]="settings.disableMovies" ng-checked="settings.disableMovies"><label for="disableMovies">Disable Movies</label>
</div>
</div> </div>
<div class="form-group"> <div class="form-group">
<label class="control-label">Subject</label> <label class="control-label">Subject</label>