mirror/Radarr
1
0
Fork 0
mirror of https://github.com/Radarr/Radarr synced 2025-02-22 22:31:26 +00:00
Code Issues Releases Wiki Activity

Fixed: Fallback to Instance Name for Discord notifications

Browse source 
(cherry picked from commit b99e06acc0a3ecae2857d9225b35424c82c67a2b)
This commit is contained in:
Stevie Robinson 2025-02-19 04:23:43 +01:00 committed by Bogdan
parent 36d4e9e6cd
commit 66d96e21da
1 changed files with 13 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/NzbDrone.Core/Notifications/Discord/Discord.cs
View file

@ -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<DiscordSettings>
{
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,