Merge pull request #3439 from stcbus/fix-language

minor language and grammar changes.

.github/workflows/aspnetcore.yml

@@ -1,18 +0,0 @@
-name: ASP.NET Core CI
-
-on: [push, pull_request]
-
-jobs:
-  build:
-
-    runs-on: ubuntu-latest
-    
-    steps:
-    - uses: actions/checkout@v1
-    - name: Setup .NET Core
-      uses: actions/setup-dotnet@v1
-      with:
-        dotnet-version: 2.2.108
-    
-    - name: Build Backend
-      run: ./build.sh --settings_skipverification=true

.github/workflows/test.workflow

@@ -1,9 +0,0 @@
-workflow "New workflow" {
-  on = "push"
-  resolves = [".NET Core CLI"]
-}
-
-action ".NET Core CLI" {
-  uses = "baruchiro/github-actions@0.0.1"
-  args = "build src/Ombi.sln"
-}

CHANGELOG.md

@@ -1,6 +1,18 @@
 # Changelog
 
-## (unreleased)
+## v3.0.4892 (2019-11-16)
+
+### **Fixes**
+
+- Fixed an issue where some users couldn't start Ombi
+
+## v3.0.4887 (2019-11-13)
+
+### **Fixes**
+
+- Fixed issues with the RequestId Migration #3244 #3253 #3249
+
+## v3.0.4880 (2019-11-13)
 
 ### **New Features**
 

README.md

@@ -33,10 +33,10 @@ We also now have merch up on Teespring!
 ___
 
 
-| Service  | Stable         | Develop          |
+| Service  | Stable         | Develop          | V4 |
-|----------|:---------------------------:|:----------------------------:|
+|----------|:---------------------------:|:----------------------------:|:----------------------------:|
-| AppVeyor | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/master?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/develop?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/develop) | 
+| Build Status | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/master?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/master) | [![Build status](https://ci.appveyor.com/api/projects/status/hgj8j6lcea7j0yhn/branch/develop?svg=true)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/develop) | [![Build Status](https://dev.azure.com/tidusjar/Ombi/_apis/build/status/Ombi%20CI%20Build?branchName=feature%2Fv4)](https://dev.azure.com/tidusjar/Ombi/_build/latest?definitionId=15&branchName=feature%2Fv4)
-| Download |[![Download](http://i.imgur.com/odToka3.png)](https://github.com/tidusjar/Ombi/releases)            |      [![Download](http://i.imgur.com/odToka3.png)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/develop/artifacts)       | 
+| Download |[![Download](http://i.imgur.com/odToka3.png)](https://github.com/tidusjar/Ombi/releases)            |      [![Download](http://i.imgur.com/odToka3.png)](https://ci.appveyor.com/project/tidusjar/requestplex/branch/develop/artifacts)       | [![Download](http://i.imgur.com/odToka3.png)](https://github.com/tidusjar/ombi.releases/releases)       | 
 # Features
 Here are some of the features Ombi V3 has:
 * Now working without crashes on Linux.
@@ -56,12 +56,13 @@ Here are some of the features Ombi V3 has:
 ### Integration 
 We integrate with the following applications:
 * Plex Media Server
-* Emby
+* Emby/Jellyfin Media Server
 * Sonarr
 * Radarr
 * Lidarr
 * DogNzb
 * Couch Potato
+* SickRage/SickChill
 
 
 ### Notifications

src/Ombi.Notifications/GenericEmailProvider.cs

@@ -96,7 +96,14 @@ namespace Ombi.Notifications
                         client.Authenticate(settings.Username, settings.Password);
                     }
                     _log.LogDebug("sending message to {0} \r\n from: {1}\r\n Are we authenticated: {2}", message.To, message.From, client.IsAuthenticated);
-                    await client.SendAsync(message);
+                    try
+                    {
+                        await client.SendAsync(message);
+                    }
+                    catch (MailKit.Net.Smtp.SmtpCommandException e) when (e.ErrorCode.Equals(MailKit.Net.Smtp.SmtpErrorCode.RecipientNotAccepted) && e.StatusCode.Equals(MailKit.Net.Smtp.SmtpStatusCode.MailboxUnavailable))
+                    {
+                        _log.LogError("Could not send email '{0}', address <{1}> does not exist.", message.Subject, model.To);
+                    }
                     await client.DisconnectAsync(true);
                 }
             }
@@ -178,4 +185,4 @@ namespace Ombi.Notifications
             }
         }
     }
-}
+}

src/Ombi.Store/Context/OmbiContext.cs

@@ -118,7 +118,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! Your request for {Title} on {ApplicationName}! This is now available! :)",
+                                Message = "Hello! Your request for {Title} on {ApplicationName} is now available.",
                                 Subject = "{ApplicationName}: {Title} is now available!",
                                 Agent = agent,
                                 Enabled = true,
@@ -140,7 +140,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! Your request for {Title} has been declined, Sorry!",
+                                Message = "Hello! Your request for {Title} has been declined.",
                                 Subject = "{ApplicationName}: your request has been declined",
                                 Agent = agent,
                                 Enabled = true,
@@ -150,7 +150,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! The user '{UserName}' has requested {Title} but it could not be added. This has been added into the requests queue and will keep retrying",
+                                Message = "Hello! The user '{UserName}' has requested {Title} but it could not be added. This has been added into the requests queue and it will keep retrying",
                                 Subject = "Item Added To Retry Queue",
                                 Agent = agent,
                                 Enabled = true,
@@ -160,7 +160,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello! You have been invited to use {ApplicationName}! You can login here: {ApplicationUrl}",
+                                Message = "Hello! You have been invited to use {ApplicationName}. You can login here: {ApplicationUrl}",
                                 Subject = "Invite to {ApplicationName}",
                                 Agent = agent,
                                 Enabled = true,
@@ -170,7 +170,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello {UserName} Your issue for {Title} has now been resolved.",
+                                Message = "Hello {UserName}, your issue for {Title} has now been resolved.",
                                 Subject = "{ApplicationName}: Issue has been resolved for {Title}!",
                                 Agent = agent,
                                 Enabled = true,
@@ -181,7 +181,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Hello, There is a new comment on your issue {IssueSubject}, The comment is: {NewIssueComment}",
+                                Message = "Hello, There is a new comment on your issue {IssueSubject}. The comment is: {NewIssueComment}",
                                 Subject = "{ApplicationName}: New comment on issue {IssueSubject}!",
                                 Agent = agent,
                                 Enabled = true,
@@ -193,7 +193,7 @@ namespace Ombi.Store.Context
                             notificationToAdd = new NotificationTemplates
                             {
                                 NotificationType = notificationType,
-                                Message = "Here is a list of Movies and TV Shows that have recently been added!",
+                                Message = "Here is a list of Movies and TV Shows that have recently been added:",
                                 Subject = "{ApplicationName}: Recently Added Content!",
                                 Agent = agent,
                                 Enabled = true,
@@ -217,4 +217,4 @@ namespace Ombi.Store.Context
             }
         }
     }
-}
+}