diff --git a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs index 800cc5322..539c39223 100644 --- a/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs +++ b/src/NzbDrone.Core/Notifications/CustomScript/CustomScript.cs @@ -5,6 +5,7 @@ using FluentValidation.Results; using NLog; using NzbDrone.Common.Disk; +using NzbDrone.Common.Extensions; using NzbDrone.Common.Processes; using NzbDrone.Common.Serializer; using NzbDrone.Core.Books; @@ -47,7 +48,7 @@ public override void OnGrab(GrabMessage message) environmentVariables.Add("Readarr_Release_BookReleaseDates", string.Join(",", remoteBook.Books.Select(e => e.ReleaseDate))); environmentVariables.Add("Readarr_Release_BookTitles", string.Join("|", remoteBook.Books.Select(e => e.Title))); environmentVariables.Add("Readarr_Release_BookIds", string.Join("|", remoteBook.Books.Select(e => e.Id.ToString()))); - environmentVariables.Add("Readarr_Release_GRIds", string.Join("|", remoteBook.Books.Select(e => e.ForeignBookId.ToString()))); + environmentVariables.Add("Readarr_Release_GRIds", remoteBook.Books.Select(x => x.Editions.Value.Single(e => e.Monitored).ForeignEditionId).ConcatToString("|")); environmentVariables.Add("Readarr_Release_Title", remoteBook.Release.Title); environmentVariables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty); environmentVariables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString()); diff --git a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs b/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs index e0ce8bee4..6216b4996 100644 --- a/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs +++ b/src/NzbDrone.Core/Notifications/DiscordNotifier/DiscordNotifier.cs @@ -1,7 +1,5 @@ -using System; using System.Collections.Generic; using System.Collections.Specialized; -using System.IO; using System.Linq; using FluentValidation.Results; using NzbDrone.Common.Extensions; @@ -18,7 +16,7 @@ public DiscordNotifier(IDiscordNotifierProxy proxy) } public override string Link => "https://discordnotifier.com"; - public override string Name => "Discord Notifier"; + public override string Name => "DiscordNotifier.com"; public override void OnGrab(GrabMessage message) { @@ -35,7 +33,7 @@ public override void OnGrab(GrabMessage message) variables.Add("Readarr_Release_BookReleaseDates", string.Join(",", remoteBook.Books.Select(e => e.ReleaseDate))); variables.Add("Readarr_Release_BookTitles", string.Join("|", remoteBook.Books.Select(e => e.Title))); variables.Add("Readarr_Release_BookIds", string.Join("|", remoteBook.Books.Select(e => e.Id.ToString()))); - variables.Add("Readarr_Release_GRIds", string.Join("|", remoteBook.Books.Select(e => e.ForeignBookId.ToString()))); + variables.Add("Readarr_Release_GRIds", remoteBook.Books.Select(x => x.Editions.Value.Single(e => e.Monitored).ForeignEditionId).ConcatToString("|")); variables.Add("Readarr_Release_Title", remoteBook.Release.Title); variables.Add("Readarr_Release_Indexer", remoteBook.Release.Indexer ?? string.Empty); variables.Add("Readarr_Release_Size", remoteBook.Release.Size.ToString());