diff --git a/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html b/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html
index 21a10aebb..464e3463b 100644
--- a/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html
+++ b/src/Ombi.Notifications.Templates/Templates/NewsletterTemplate.html
@@ -151,7 +151,7 @@
- Here is a list of Movies and TV Shows that have recently been added!
+ {@INTRO}
|
diff --git a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
index c3fcbb9d7..a22e72e72 100644
--- a/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
+++ b/src/Ombi.Schedule/Jobs/Ombi/NewsletterJob.cs
@@ -288,22 +288,7 @@ namespace Ombi.Schedule.Jobs.Ombi
}
try
{
- AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.BackdropPath}");
-
- sb.Append("");
- TableData(sb);
-
- Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
- Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
- EndTag(sb, "a");
-
- if (info.Genres.Any())
- {
- AddParagraph(sb,
- $"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
- }
-
- AddParagraph(sb, info.Overview);
+ CreateMovieHtmlContent(sb, info);
}
catch (Exception e)
{
@@ -316,6 +301,7 @@ namespace Ombi.Schedule.Jobs.Ombi
}
}
}
+
private async Task ProcessEmbyMovies(IQueryable embyContent, StringBuilder sb)
{
sb.Append(
@@ -331,22 +317,7 @@ namespace Ombi.Schedule.Jobs.Ombi
}
try
{
- AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.BackdropPath}");
-
- sb.Append("");
- TableData(sb);
-
- Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
- Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
- EndTag(sb, "a");
-
- if (info.Genres.Any())
- {
- AddParagraph(sb,
- $"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
- }
-
- AddParagraph(sb, info.Overview);
+ CreateMovieHtmlContent(sb, info);
}
catch (Exception e)
{
@@ -360,6 +331,26 @@ namespace Ombi.Schedule.Jobs.Ombi
}
}
+ private void CreateMovieHtmlContent(StringBuilder sb, MovieResponseDto info)
+ {
+ AddImageInsideTable(sb, $"https://image.tmdb.org/t/p/original{info.PosterPath}");
+
+ sb.Append("
");
+ TableData(sb);
+
+ Href(sb, $"https://www.imdb.com/title/{info.ImdbId}/");
+ Header(sb, 3, $"{info.Title} {info.ReleaseDate ?? string.Empty}");
+ EndTag(sb, "a");
+
+ if (info.Genres.Any())
+ {
+ AddParagraph(sb,
+ $"Genre: {string.Join(", ", info.Genres.Select(x => x.Name.ToString()).ToArray())}");
+ }
+
+ AddParagraph(sb, info.Overview);
+ }
+
private async Task ProcessPlexTv(IQueryable plexContent, StringBuilder sb)
{
var orderedTv = plexContent.OrderByDescending(x => x.AddedAt);
diff --git a/src/Ombi.Store/Context/OmbiContext.cs b/src/Ombi.Store/Context/OmbiContext.cs
index 31b879d11..6fae7f86a 100644
--- a/src/Ombi.Store/Context/OmbiContext.cs
+++ b/src/Ombi.Store/Context/OmbiContext.cs
@@ -119,7 +119,10 @@ namespace Ombi.Store.Context
var roles = Roles.Where(x => x.Name == OmbiRoles.RecievesNewsletter);
if (!roles.Any())
{
- Roles.Add(new IdentityRole(OmbiRoles.RecievesNewsletter));
+ Roles.Add(new IdentityRole(OmbiRoles.RecievesNewsletter)
+ {
+ NormalizedName = OmbiRoles.RecievesNewsletter.ToUpper()
+ });
}
//Check if templates exist
var templates = NotificationTemplates.ToList();
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png b/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png
index b37bc4d30..cfe4f838f 100644
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png and b/src/Ombi/wwwroot/images/favicon/android-icon-144x144.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png b/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png
index 417f11658..66834b472 100644
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png and b/src/Ombi/wwwroot/images/favicon/android-icon-192x192.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png b/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png
index fa3c06262..215339d90 100644
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png and b/src/Ombi/wwwroot/images/favicon/android-icon-36x36.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png b/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png
index eb4292ec8..9d425f81f 100644
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png and b/src/Ombi/wwwroot/images/favicon/android-icon-48x48.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png b/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png
index f3b06552a..3876d051a 100644
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png and b/src/Ombi/wwwroot/images/favicon/android-icon-72x72.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png b/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png
index f573f633c..c8e26d722 100644
Binary files a/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png and b/src/Ombi/wwwroot/images/favicon/android-icon-96x96.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png b/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png
index c18c3d66b..a8fa6f81f 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-114x114.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png b/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png
index 4cd706318..5ea108611 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-120x120.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png b/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png
index b37bc4d30..cfe4f838f 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-144x144.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png b/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png
index 6bc39c989..df70d578e 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-152x152.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png b/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png
index b063d735d..a917d113c 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-180x180.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png b/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png
index b03b6d120..cb852ffd9 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-57x57.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png b/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png
index 135e74806..7aeeb1243 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-60x60.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png b/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png
index f3b06552a..3876d051a 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-72x72.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png b/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png
index 947ebd0f6..32826bd09 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-76x76.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png b/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png
index 417f11658..7fb80052d 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png and b/src/Ombi/wwwroot/images/favicon/apple-icon-precomposed.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/apple-icon.png b/src/Ombi/wwwroot/images/favicon/apple-icon.png
index 417f11658..7fb80052d 100644
Binary files a/src/Ombi/wwwroot/images/favicon/apple-icon.png and b/src/Ombi/wwwroot/images/favicon/apple-icon.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon-16x16.png b/src/Ombi/wwwroot/images/favicon/favicon-16x16.png
index d95ca06da..7dfea78a5 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon-16x16.png and b/src/Ombi/wwwroot/images/favicon/favicon-16x16.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon-32x32.png b/src/Ombi/wwwroot/images/favicon/favicon-32x32.png
index 4be616622..c3853b662 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon-32x32.png and b/src/Ombi/wwwroot/images/favicon/favicon-32x32.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon-96x96.png b/src/Ombi/wwwroot/images/favicon/favicon-96x96.png
index f573f633c..c8e26d722 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon-96x96.png and b/src/Ombi/wwwroot/images/favicon/favicon-96x96.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/favicon.ico b/src/Ombi/wwwroot/images/favicon/favicon.ico
index efc681af1..62b406080 100644
Binary files a/src/Ombi/wwwroot/images/favicon/favicon.ico and b/src/Ombi/wwwroot/images/favicon/favicon.ico differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png b/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png
index b37bc4d30..cfe4f838f 100644
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png and b/src/Ombi/wwwroot/images/favicon/ms-icon-144x144.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png b/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png
index 35f2f5efd..7664f1729 100644
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png and b/src/Ombi/wwwroot/images/favicon/ms-icon-150x150.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png b/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png
index 62cad4e68..fc6ffd626 100644
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png and b/src/Ombi/wwwroot/images/favicon/ms-icon-310x310.png differ
diff --git a/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png b/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png
index 9d0d96bec..78e6bb882 100644
Binary files a/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png and b/src/Ombi/wwwroot/images/favicon/ms-icon-70x70.png differ