mirror of
https://github.com/Radarr/Radarr.git
synced 2024-08-18 08:19:38 +02:00
New: Option to prefix app name on Telegram notification titles
(cherry picked from commit 37863a8deb339ef730b2dd5be61e1da1311fdd23) Closes #9913
This commit is contained in:
parent
198e6324e0
commit
77381d3f72
@ -1140,6 +1140,8 @@
|
|||||||
"NotificationsTelegramSettingsBotToken": "Bot Token",
|
"NotificationsTelegramSettingsBotToken": "Bot Token",
|
||||||
"NotificationsTelegramSettingsChatId": "Chat ID",
|
"NotificationsTelegramSettingsChatId": "Chat ID",
|
||||||
"NotificationsTelegramSettingsChatIdHelpText": "You must start a conversation with the bot or add it to your group to receive messages",
|
"NotificationsTelegramSettingsChatIdHelpText": "You must start a conversation with the bot or add it to your group to receive messages",
|
||||||
|
"NotificationsTelegramSettingsIncludeAppName": "Include {appName} in Title",
|
||||||
|
"NotificationsTelegramSettingsIncludeAppNameHelpText": "Optionally prefix message title with {appName} to differentiate notifications from different applications",
|
||||||
"NotificationsTelegramSettingsSendSilently": "Send Silently",
|
"NotificationsTelegramSettingsSendSilently": "Send Silently",
|
||||||
"NotificationsTelegramSettingsSendSilentlyHelpText": "Sends the message silently. Users will receive a notification with no sound",
|
"NotificationsTelegramSettingsSendSilentlyHelpText": "Sends the message silently. Users will receive a notification with no sound",
|
||||||
"NotificationsTelegramSettingsTopicId": "Topic ID",
|
"NotificationsTelegramSettingsTopicId": "Topic ID",
|
||||||
|
@ -20,54 +20,74 @@ public Telegram(ITelegramProxy proxy)
|
|||||||
|
|
||||||
public override void OnGrab(GrabMessage grabMessage)
|
public override void OnGrab(GrabMessage grabMessage)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MOVIE_GRABBED_TITLE_BRANDED, grabMessage.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? MOVIE_GRABBED_TITLE_BRANDED : MOVIE_GRABBED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, grabMessage.Message, Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnDownload(DownloadMessage message)
|
public override void OnDownload(DownloadMessage message)
|
||||||
{
|
{
|
||||||
if (message.OldMovieFiles.Any())
|
if (message.OldMovieFiles.Any())
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MOVIE_UPGRADED_TITLE_BRANDED, message.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? MOVIE_UPGRADED_TITLE_BRANDED : MOVIE_UPGRADED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, message.Message, Settings);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MOVIE_DOWNLOADED_TITLE_BRANDED, message.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? MOVIE_DOWNLOADED_TITLE_BRANDED : MOVIE_DOWNLOADED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, message.Message, Settings);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnMovieAdded(Movie movie)
|
public override void OnMovieAdded(Movie movie)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MOVIE_ADDED_TITLE_BRANDED, $"{movie.Title} added to library", Settings);
|
var title = Settings.IncludeAppNameInTitle ? MOVIE_ADDED_TITLE_BRANDED : MOVIE_ADDED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, $"{movie.Title} added to library", Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnMovieFileDelete(MovieFileDeleteMessage deleteMessage)
|
public override void OnMovieFileDelete(MovieFileDeleteMessage deleteMessage)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MOVIE_FILE_DELETED_TITLE_BRANDED, deleteMessage.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? MOVIE_FILE_DELETED_TITLE_BRANDED : MOVIE_FILE_DELETED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, deleteMessage.Message, Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnMovieDelete(MovieDeleteMessage deleteMessage)
|
public override void OnMovieDelete(MovieDeleteMessage deleteMessage)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MOVIE_DELETED_TITLE_BRANDED, deleteMessage.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? MOVIE_DELETED_TITLE_BRANDED : MOVIE_DELETED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, deleteMessage.Message, Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck)
|
public override void OnHealthIssue(HealthCheck.HealthCheck healthCheck)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(HEALTH_ISSUE_TITLE_BRANDED, healthCheck.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? HEALTH_ISSUE_TITLE_BRANDED : HEALTH_ISSUE_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, healthCheck.Message, Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
|
public override void OnHealthRestored(HealthCheck.HealthCheck previousCheck)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(HEALTH_RESTORED_TITLE_BRANDED, $"The following issue is now resolved: {previousCheck.Message}", Settings);
|
var title = Settings.IncludeAppNameInTitle ? HEALTH_RESTORED_TITLE_BRANDED : HEALTH_RESTORED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, $"The following issue is now resolved: {previousCheck.Message}", Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
|
public override void OnApplicationUpdate(ApplicationUpdateMessage updateMessage)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(APPLICATION_UPDATE_TITLE_BRANDED, updateMessage.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? APPLICATION_UPDATE_TITLE_BRANDED : APPLICATION_UPDATE_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, updateMessage.Message, Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override void OnManualInteractionRequired(ManualInteractionRequiredMessage message)
|
public override void OnManualInteractionRequired(ManualInteractionRequiredMessage message)
|
||||||
{
|
{
|
||||||
_proxy.SendNotification(MANUAL_INTERACTION_REQUIRED_TITLE_BRANDED, message.Message, Settings);
|
var title = Settings.IncludeAppNameInTitle ? MANUAL_INTERACTION_REQUIRED_TITLE_BRANDED : MANUAL_INTERACTION_REQUIRED_TITLE;
|
||||||
|
|
||||||
|
_proxy.SendNotification(title, message.Message, Settings);
|
||||||
}
|
}
|
||||||
|
|
||||||
public override ValidationResult Test()
|
public override ValidationResult Test()
|
||||||
|
@ -53,10 +53,11 @@ public ValidationFailure Test(TelegramSettings settings)
|
|||||||
{
|
{
|
||||||
try
|
try
|
||||||
{
|
{
|
||||||
|
const string brandedTitle = "Radarr - Test Notification";
|
||||||
const string title = "Test Notification";
|
const string title = "Test Notification";
|
||||||
const string body = "This is a test message from Radarr";
|
const string body = "This is a test message from Radarr";
|
||||||
|
|
||||||
SendNotification(title, body, settings);
|
SendNotification(settings.IncludeAppNameInTitle ? brandedTitle : title, body, settings);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception ex)
|
||||||
{
|
{
|
||||||
|
@ -32,6 +32,9 @@ public class TelegramSettings : IProviderConfig
|
|||||||
[FieldDefinition(3, Label = "NotificationsTelegramSettingsSendSilently", Type = FieldType.Checkbox, HelpText = "NotificationsTelegramSettingsSendSilentlyHelpText")]
|
[FieldDefinition(3, Label = "NotificationsTelegramSettingsSendSilently", Type = FieldType.Checkbox, HelpText = "NotificationsTelegramSettingsSendSilentlyHelpText")]
|
||||||
public bool SendSilently { get; set; }
|
public bool SendSilently { get; set; }
|
||||||
|
|
||||||
|
[FieldDefinition(4, Label = "NotificationsTelegramSettingsIncludeAppName", Type = FieldType.Checkbox, HelpText = "NotificationsTelegramSettingsIncludeAppNameHelpText")]
|
||||||
|
public bool IncludeAppNameInTitle { get; set; }
|
||||||
|
|
||||||
public NzbDroneValidationResult Validate()
|
public NzbDroneValidationResult Validate()
|
||||||
{
|
{
|
||||||
return new NzbDroneValidationResult(Validator.Validate(this));
|
return new NzbDroneValidationResult(Validator.Validate(this));
|
||||||
|
Loading…
Reference in New Issue
Block a user