From 66d96e21dab2ec6824e8fe2654ceadb9a64bec10 Mon Sep 17 00:00:00 2001 From: Stevie Robinson Date: Wed, 19 Feb 2025 04:23:43 +0100 Subject: [PATCH] Fixed: Fallback to Instance Name for Discord notifications (cherry picked from commit b99e06acc0a3ecae2857d9225b35424c82c67a2b) --- .../Notifications/Discord/Discord.cs | 23 +++++++++++-------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/src/NzbDrone.Core/Notifications/Discord/Discord.cs b/src/NzbDrone.Core/Notifications/Discord/Discord.cs index ec2fd9c3e6..ed4409f435 100644 --- a/src/NzbDrone.Core/Notifications/Discord/Discord.cs +++ b/src/NzbDrone.Core/Notifications/Discord/Discord.cs @@ -4,6 +4,7 @@ using System.Linq; using FluentValidation.Results; using NzbDrone.Common.Extensions; +using NzbDrone.Core.Configuration; using NzbDrone.Core.Localization; using NzbDrone.Core.MediaCover; using NzbDrone.Core.MediaFiles; @@ -19,12 +20,14 @@ public class Discord : NotificationBase { private readonly IDiscordProxy _proxy; private readonly ITagRepository _tagRepository; + private readonly IConfigFileProvider _configFileProvider; private readonly ILocalizationService _localizationService; - public Discord(IDiscordProxy proxy, ITagRepository tagRepository, ILocalizationService localizationService) + public Discord(IDiscordProxy proxy, ITagRepository tagRepository, IConfigFileProvider configFileProvider, ILocalizationService localizationService) { _proxy = proxy; _tagRepository = tagRepository; + _configFileProvider = configFileProvider; _localizationService = localizationService; } @@ -37,7 +40,7 @@ public override void OnGrab(GrabMessage message) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{message.Movie.MovieMetadata.Value.TmdbId}", @@ -141,7 +144,7 @@ public override void OnDownload(DownloadMessage message) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{message.Movie.MovieMetadata.Value.TmdbId}", @@ -256,7 +259,7 @@ public override void OnMovieAdded(Movie movie) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{movie.MovieMetadata.Value.TmdbId}", @@ -313,7 +316,7 @@ public override void OnMovieDelete(MovieDeleteMessage deleteMessage) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{movie.MovieMetadata.Value.TmdbId}", @@ -354,7 +357,7 @@ public override void OnMovieFileDelete(MovieFileDeleteMessage deleteMessage) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = $"https://www.themoviedb.org/movie/{movie.MovieMetadata.Value.TmdbId}", @@ -380,7 +383,7 @@ public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Title = healthCheck.Source.Name, @@ -400,7 +403,7 @@ public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Title = "Health Issue Resolved: " + previousCheck.Source.Name, @@ -420,7 +423,7 @@ public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage) { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Title = APPLICATION_UPDATE_TITLE, @@ -454,7 +457,7 @@ public override void OnManualInteractionRequired(ManualInteractionRequiredMessag { Author = new DiscordAuthor { - Name = Settings.Author.IsNullOrWhiteSpace() ? Environment.MachineName : Settings.Author, + Name = Settings.Author.IsNullOrWhiteSpace() ? _configFileProvider.InstanceName : Settings.Author, IconUrl = "https://raw.githubusercontent.com/Radarr/Radarr/develop/Logo/256.png" }, Url = movie?.MovieMetadata.Value.TmdbId > 0 ? $"https://www.themoviedb.org/movie/{movie.MovieMetadata.Value.TmdbId}" : null,