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

New: Option to use Telegram topics for notifications 

Closes #5486
This commit is contained in:
Lars 2023-04-15 01:47:06 +02:00 committed by GitHub
parent 47cf8e6430
commit c8933d8124
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/NzbDrone.Core/Notifications/Telegram/TelegramProxy.cs
View File

@ -40,6 +40,7 @@ namespace NzbDrone.Core.Notifications.Telegram
.AddFormParameter("parse_mode", "HTML") .AddFormParameter("parse_mode", "HTML")
.AddFormParameter("text", text) .AddFormParameter("text", text)
.AddFormParameter("disable_notification", settings.SendSilently) .AddFormParameter("disable_notification", settings.SendSilently)
.AddFormParameter("message_thread_id", settings.TopicId)
.Build(); .Build();
_httpClient.Post(request); _httpClient.Post(request);
@ -65,7 +66,16 @@ namespace NzbDrone.Core.Notifications.Telegram
else if (ex is Common.Http.HttpException restException && restException.Response.StatusCode == HttpStatusCode.BadRequest) else if (ex is Common.Http.HttpException restException && restException.Response.StatusCode == HttpStatusCode.BadRequest)
{ {
var error = Json.Deserialize<TelegramError>(restException.Response.Content); var error = Json.Deserialize<TelegramError>(restException.Response.Content);
var property = error.Description.ContainsIgnoreCase("chat not found") ? "ChatId" : "BotToken"; var property = "BotToken";
if (error.Description.ContainsIgnoreCase("chat not found") || error.Description.ContainsIgnoreCase("group chat was upgraded to a supergroup chat"))
{
property = "ChatId";
}
else if (error.Description.ContainsIgnoreCase("message thread not found"))
{
property = "TopicId";
}
return new ValidationFailure(property, error.Description); return new ValidationFailure(property, error.Description);
} }

9
src/NzbDrone.Core/Notifications/Telegram/TelegramSettings.cs
View File

@ -1,4 +1,4 @@
using FluentValidation; using FluentValidation;
using NzbDrone.Core.Annotations; using NzbDrone.Core.Annotations;
using NzbDrone.Core.ThingiProvider; using NzbDrone.Core.ThingiProvider;
using NzbDrone.Core.Validation; using NzbDrone.Core.Validation;
@ -11,6 +11,8 @@ namespace NzbDrone.Core.Notifications.Telegram
{ {
RuleFor(c => c.BotToken).NotEmpty(); RuleFor(c => c.BotToken).NotEmpty();
RuleFor(c => c.ChatId).NotEmpty(); RuleFor(c => c.ChatId).NotEmpty();
RuleFor(c => c.TopicId).Must(topicId => !topicId.HasValue || topicId > 1)
.WithMessage("Topic ID must be greater than 1 or empty");
} }
} }
@ -24,7 +26,10 @@ namespace NzbDrone.Core.Notifications.Telegram
[FieldDefinition(1, Label = "Chat ID", HelpLink = "http://stackoverflow.com/a/37396871/882971", HelpText = "You must start a conversation with the bot or add it to your group to receive messages")] [FieldDefinition(1, Label = "Chat ID", HelpLink = "http://stackoverflow.com/a/37396871/882971", HelpText = "You must start a conversation with the bot or add it to your group to receive messages")]
public string ChatId { get; set; } public string ChatId { get; set; }
[FieldDefinition(2, Label = "Send Silently", Type = FieldType.Checkbox, HelpText = "Sends the message silently. Users will receive a notification with no sound")] [FieldDefinition(2, Label = "Topic ID", HelpLink = "https://stackoverflow.com/a/75178418", HelpText = "Specify a Topic ID to send notifications to that topic. Leave blank to use the general topic (Supergroups only)")]
public int? TopicId { get; set; }
[FieldDefinition(3, Label = "Send Silently", Type = FieldType.Checkbox, HelpText = "Sends the message silently. Users will receive a notification with no sound")]
public bool SendSilently { get; set; } public bool SendSilently { get; set; }
public NzbDroneValidationResult Validate() public NzbDroneValidationResult Validate()