diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs index 51ddc42a4..128d574f0 100644 --- a/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookBase.cs @@ -36,7 +36,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.Grab, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(message.Movie, tags: GetTagLabels(message.Movie)), + Movie = new WebhookMovie(message.Movie) + { + Tags = GetTagLabels(message.Movie) + }, RemoteMovie = new WebhookRemoteMovie(remoteMovie), Release = new WebhookRelease(quality, remoteMovie), DownloadClient = message.DownloadClientName, @@ -55,7 +58,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.Download, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(message.Movie, tags: GetTagLabels(message.Movie)), + Movie = new WebhookMovie(message.Movie) + { + Tags = GetTagLabels(message.Movie) + }, RemoteMovie = new WebhookRemoteMovie(message.Movie), MovieFile = new WebhookMovieFile(movieFile), Release = new WebhookGrabbedRelease(message.Release), @@ -86,7 +92,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.MovieAdded, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(movie, tags: GetTagLabels(movie)), + Movie = new WebhookMovie(movie) + { + Tags = GetTagLabels(movie) + }, AddMethod = movie.AddOptions.AddMethod }; } @@ -98,7 +107,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.MovieFileDelete, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(deleteMessage.Movie, tags: GetTagLabels(deleteMessage.Movie)), + Movie = new WebhookMovie(deleteMessage.Movie) + { + Tags = GetTagLabels(deleteMessage.Movie) + }, MovieFile = new WebhookMovieFile(deleteMessage.MovieFile), DeleteReason = deleteMessage.Reason }; @@ -111,7 +123,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.MovieDelete, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(deleteMessage.Movie, tags: GetTagLabels(deleteMessage.Movie)), + Movie = new WebhookMovie(deleteMessage.Movie) + { + Tags = GetTagLabels(deleteMessage.Movie) + }, DeletedFiles = deleteMessage.DeletedFiles }; @@ -130,7 +145,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.Rename, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(movie, tags: GetTagLabels(movie)), + Movie = new WebhookMovie(movie) + { + Tags = GetTagLabels(movie) + }, RenamedMovieFiles = renamedFiles.ConvertAll(x => new WebhookRenamedMovieFile(x)) }; } @@ -185,7 +203,10 @@ namespace NzbDrone.Core.Notifications.Webhook EventType = WebhookEventType.ManualInteractionRequired, InstanceName = _configFileProvider.InstanceName, ApplicationUrl = _configService.ApplicationUrl, - Movie = new WebhookMovie(message.Movie, tags: GetTagLabels(message.Movie)), + Movie = new WebhookMovie(message.Movie) + { + Tags = GetTagLabels(message.Movie) + }, DownloadInfo = new WebhookDownloadClientItem(quality, message.TrackedDownload.DownloadItem), DownloadClient = message.DownloadClientName, DownloadClientType = message.DownloadClientType, diff --git a/src/NzbDrone.Core/Notifications/Webhook/WebhookMovie.cs b/src/NzbDrone.Core/Notifications/Webhook/WebhookMovie.cs index c76928d83..3fd8bb5ed 100755 --- a/src/NzbDrone.Core/Notifications/Webhook/WebhookMovie.cs +++ b/src/NzbDrone.Core/Notifications/Webhook/WebhookMovie.cs @@ -34,12 +34,6 @@ namespace NzbDrone.Core.Notifications.Webhook Overview = movie.MovieMetadata.Value.Overview; } - public WebhookMovie(Movie movie, IEnumerable tags) - : this(movie) - { - Tags = tags; - } - public WebhookMovie(Movie movie, MovieFile movieFile) : this(movie) {