glax/Tranga
2
0
Fork 0
Code

#183 Fix NTFY not exporting topic to notificationConnectors.json

Browse Source
This commit is contained in:
Glax 2024-06-02 00:23:16 +02:00
parent aea4c0c61b
commit 08dd01942f
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Tranga/NotificationConnectors/Ntfy.cs
View File

@ -9,10 +9,9 @@ public class Ntfy : NotificationConnector
// ReSharper disable twice MemberCanBePrivate.Global // ReSharper disable twice MemberCanBePrivate.Global
public string endpoint { get; init; } public string endpoint { get; init; }
public string auth { get; init; } public string auth { get; init; }
private readonly string _topic = "tranga"; public string topic { get; init; }
private readonly HttpClient _client = new(); private readonly HttpClient _client = new();
[JsonConstructor]
public Ntfy(GlobalBase clone, string endpoint, string auth) : base(clone, NotificationConnectorType.Ntfy) public Ntfy(GlobalBase clone, string endpoint, string auth) : base(clone, NotificationConnectorType.Ntfy)
{ {
if (!baseUrlRex.IsMatch(endpoint)) if (!baseUrlRex.IsMatch(endpoint))
@ -23,19 +22,29 @@ public class Ntfy : NotificationConnector
Log($"Error getting URI from provided endpoint-URI: {endpoint}"); Log($"Error getting URI from provided endpoint-URI: {endpoint}");
this.endpoint = match.Groups[1].Value; this.endpoint = match.Groups[1].Value;
if (match.Groups[2].Success) if (match.Groups[2].Success)
_topic = match.Groups[2].Value; topic = match.Groups[2].Value;
else
topic = "tranga";
this.auth = auth;
}
[JsonConstructor]
public Ntfy(GlobalBase clone, string endpoint, string auth, string topic) : base(clone, NotificationConnectorType.Ntfy)
{
this.endpoint = endpoint;
this.topic = topic.Length > 0 ? topic : "tranga";
this.auth = auth; this.auth = auth;
} }
public override string ToString() public override string ToString()
{ {
return $"Ntfy {endpoint} {_topic}"; return $"Ntfy {endpoint} {topic}";
} }
public override void SendNotification(string title, string notificationText) public override void SendNotification(string title, string notificationText)
{ {
Log($"Sending notification: {title} - {notificationText}"); Log($"Sending notification: {title} - {notificationText}");
MessageData message = new(title, _topic, notificationText); MessageData message = new(title, topic, notificationText);
HttpRequestMessage request = new(HttpMethod.Post, $"{this.endpoint}?auth={this.auth}"); HttpRequestMessage request = new(HttpMethod.Post, $"{this.endpoint}?auth={this.auth}");
request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json"); request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
HttpResponseMessage response = _client.Send(request); HttpResponseMessage response = _client.Send(request);