Archive-Team
/
sonarr-repo-only
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixed: Available fields for Discord Manual Interaction Required

This commit is contained in:
Bogdan 2023-12-31 02:05:19 +02:00 committed by GitHub
parent efb000529b
commit 4085771602
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/NzbDrone.Core/Notifications/Discord/Discord.cs
View File

@ -448,7 +448,7 @@ namespace NzbDrone.Core.Notifications.Discord
Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ") Timestamp = DateTime.UtcNow.ToString("yyyy-MM-ddTHH:mm:ss.fffZ")
}; };
if (Settings.ManualInteractionFields.Contains((int)DiscordGrabFieldType.Poster)) if (Settings.ManualInteractionFields.Contains((int)DiscordManualInteractionFieldType.Poster))
{ {
embed.Thumbnail = new DiscordImage embed.Thumbnail = new DiscordImage
{ {
@ -456,7 +456,7 @@ namespace NzbDrone.Core.Notifications.Discord
}; };
} }
if (Settings.ManualInteractionFields.Contains((int)DiscordGrabFieldType.Fanart)) if (Settings.ManualInteractionFields.Contains((int)DiscordManualInteractionFieldType.Fanart))
{ {
embed.Image = new DiscordImage embed.Image = new DiscordImage
{ {

56
src/NzbDrone.Core/Notifications/Discord/DiscordSettings.cs
View File

@ -19,12 +19,54 @@ namespace NzbDrone.Core.Notifications.Discord
public DiscordSettings() public DiscordSettings()
{ {
// Set Default Fields // Set Default Fields
GrabFields = new[] { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12 }; GrabFields = new[]
ImportFields = new[] { 0, 1, 2, 3, 4, 6, 7, 8, 9, 10, 11, 12 }; {
ManualInteractionFields = new[] { 0, 1, 2, 3, 5, 6, 7, 8, 9 }; (int)DiscordGrabFieldType.Overview,
(int)DiscordGrabFieldType.Rating,
(int)DiscordGrabFieldType.Genres,
(int)DiscordGrabFieldType.Quality,
(int)DiscordGrabFieldType.Group,
(int)DiscordGrabFieldType.Size,
(int)DiscordGrabFieldType.Links,
(int)DiscordGrabFieldType.Release,
(int)DiscordGrabFieldType.Poster,
(int)DiscordGrabFieldType.Fanart,
(int)DiscordGrabFieldType.Indexer,
(int)DiscordGrabFieldType.CustomFormats,
(int)DiscordGrabFieldType.CustomFormatScore
};
ImportFields = new[]
{
(int)DiscordImportFieldType.Overview,
(int)DiscordImportFieldType.Rating,
(int)DiscordImportFieldType.Genres,
(int)DiscordImportFieldType.Quality,
(int)DiscordImportFieldType.Codecs,
(int)DiscordImportFieldType.Group,
(int)DiscordImportFieldType.Size,
(int)DiscordImportFieldType.Languages,
(int)DiscordImportFieldType.Subtitles,
(int)DiscordImportFieldType.Links,
(int)DiscordImportFieldType.Release,
(int)DiscordImportFieldType.Poster,
(int)DiscordImportFieldType.Fanart
};
ManualInteractionFields = new[]
{
(int)DiscordManualInteractionFieldType.Overview,
(int)DiscordManualInteractionFieldType.Rating,
(int)DiscordManualInteractionFieldType.Genres,
(int)DiscordManualInteractionFieldType.Quality,
(int)DiscordManualInteractionFieldType.Group,
(int)DiscordManualInteractionFieldType.Size,
(int)DiscordManualInteractionFieldType.Links,
(int)DiscordManualInteractionFieldType.DownloadTitle,
(int)DiscordManualInteractionFieldType.Poster,
(int)DiscordManualInteractionFieldType.Fanart
};
} }
private static readonly DiscordSettingsValidator Validator = new DiscordSettingsValidator(); private static readonly DiscordSettingsValidator Validator = new ();
[FieldDefinition(0, Label = "Webhook URL", HelpText = "Discord channel webhook url")] [FieldDefinition(0, Label = "Webhook URL", HelpText = "Discord channel webhook url")]
public string WebHookUrl { get; set; } public string WebHookUrl { get; set; }
@ -38,13 +80,13 @@ namespace NzbDrone.Core.Notifications.Discord
[FieldDefinition(3, Label = "Author", Advanced = true, HelpText = "Override the embed author that shows for this notification, Blank is instance name", Type = FieldType.Textbox)] [FieldDefinition(3, Label = "Author", Advanced = true, HelpText = "Override the embed author that shows for this notification, Blank is instance name", Type = FieldType.Textbox)]
public string Author { get; set; } public string Author { get; set; }
[FieldDefinition(4, Label = "On Grab Fields", Advanced = true, SelectOptions = typeof(DiscordGrabFieldType), HelpText = "Change the fields that are passed in for this 'on grab' notification", Type = FieldType.TagSelect)] [FieldDefinition(4, Label = "On Grab Fields", Advanced = true, SelectOptions = typeof(DiscordGrabFieldType), HelpText = "Change the fields that are passed in for this 'on grab' notification", Type = FieldType.Select)]
public IEnumerable<int> GrabFields { get; set; } public IEnumerable<int> GrabFields { get; set; }
[FieldDefinition(5, Label = "On Import Fields", Advanced = true, SelectOptions = typeof(DiscordImportFieldType), HelpText = "Change the fields that are passed for this 'on import' notification", Type = FieldType.TagSelect)] [FieldDefinition(5, Label = "On Import Fields", Advanced = true, SelectOptions = typeof(DiscordImportFieldType), HelpText = "Change the fields that are passed for this 'on import' notification", Type = FieldType.Select)]
public IEnumerable<int> ImportFields { get; set; } public IEnumerable<int> ImportFields { get; set; }
[FieldDefinition(6, Label = "On Manual Interaction Fields", Advanced = true, SelectOptions = typeof(DiscordManualInteractionFieldType), HelpText = "Change the fields that are passed for this 'on manual interaction' notification", Type = FieldType.TagSelect)] [FieldDefinition(6, Label = "On Manual Interaction Fields", Advanced = true, SelectOptions = typeof(DiscordManualInteractionFieldType), HelpText = "Change the fields that are passed for this 'on manual interaction' notification", Type = FieldType.Select)]
public IEnumerable<int> ManualInteractionFields { get; set; } public IEnumerable<int> ManualInteractionFields { get; set; }
public NzbDroneValidationResult Validate() public NzbDroneValidationResult Validate()