Smartcraft-Media-Tech/ntfysh-windows
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 4 Wiki Activity

Add Publishing #7 #16

Open
seba76 wants to merge 2 commits from seba76/master into master
pull from: seba76/master
merge into: Smartcraft-Media-Tech:master
Conversation 1 Commits 2 Files Changed 8 +692 -240
8 changed files with 692 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2c18f91d68 - Show all commits

9
ntfysh_client/MainForm.Designer.cs generated
View File

@@ -101,12 +101,13 @@ namespace ntfysh_client
//
topicContextMenu.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { sendNotificationMenuItem });
topicContextMenu.Name = "topicContextMenu";
topicContextMenu.Size = new System.Drawing.Size(167, 26);
topicContextMenu.Size = new System.Drawing.Size(181, 48);
//
// sendNotificationMenuItem
//
sendNotificationMenuItem.Image = (System.Drawing.Image)resources.GetObject("sendNotificationMenuItem.Image");
sendNotificationMenuItem.Name = "sendNotificationMenuItem";
sendNotificationMenuItem.Size = new System.Drawing.Size(166, 22);
sendNotificationMenuItem.Size = new System.Drawing.Size(180, 22);
sendNotificationMenuItem.Text = "Send Notification";
sendNotificationMenuItem.Click += SendNotificationMenuItem_Click;
//
@@ -162,7 +163,7 @@ namespace ntfysh_client
//
exitToolStripMenuItem1.Image = (System.Drawing.Image)resources.GetObject("exitToolStripMenuItem1.Image");
exitToolStripMenuItem1.Name = "exitToolStripMenuItem1";
exitToolStripMenuItem1.Size = new System.Drawing.Size(116, 22);
exitToolStripMenuItem1.Size = new System.Drawing.Size(180, 22);
exitToolStripMenuItem1.Text = "Exit";
exitToolStripMenuItem1.Click += exitToolStripMenuItem1_Click;
//
@@ -170,7 +171,7 @@ namespace ntfysh_client
//
settingsToolStripMenuItem.Image = (System.Drawing.Image)resources.GetObject("settingsToolStripMenuItem.Image");
settingsToolStripMenuItem.Name = "settingsToolStripMenuItem";
settingsToolStripMenuItem.Size = new System.Drawing.Size(116, 22);
settingsToolStripMenuItem.Size = new System.Drawing.Size(180, 22);
settingsToolStripMenuItem.Text = "Settings";
settingsToolStripMenuItem.Click += settingsToolStripMenuItem_Click;
//

20
ntfysh_client/MainForm.cs
View File

@@ -426,15 +426,19 @@ namespace ntfysh_client
{
if (notificationTopics.SelectedItem != null && string.IsNullOrEmpty(notificationTopics.SelectedItem as string) == false)
{
var dlg = new SendMessageForm();
var r = dlg.ShowDialog(this);
if (r == DialogResult.OK)
try
{
var topicAndHost = notificationTopics.SelectedItem.ToString()?.Split("@");
var topic = topicAndHost[0];
var host = topicAndHost[1].Replace("wss", "https");
var msg = dlg.Message;
await _notificationListener.SendNotification(host, new NtfyEvent { Topic = topic, Title = dlg.Title, Message = msg });
SendMessageForm dlg = new SendMessageForm();
DialogResult r = dlg.ShowDialog(this);
if (r == DialogResult.OK)
{
string key = notificationTopics.SelectedItem.ToString();
await _notificationListener.SendNotification(key, dlg.Title, dlg.Message);
}
}
catch (Exception e)
{
MessageBox.Show(e.Message, "Error", MessageBoxButtons.OK);
}
}
}

23
ntfysh_client/MainForm.resx
View File

@@ -120,6 +120,26 @@
<metadata name="topicContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>384, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="sendNotificationMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAADIAAAAyCAYAAAAeP4ixAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAALtSURBVGhD7ZfPaxNBFMeTkqS9WDyotTHJvjdJ/VUpirQK
elFKa1pSK2lNapOrP8BDPRQEL7X+qFjEg2JBEERrEc2hh0jT6EHUo3+DPSi2tV6E4sGmREaSsHlM1iaZ
lVnJFz6X3TeZ98lLZhObrZZaaqnF0kHEcUR8rTjjtO+iIOIkImYtwiTtvxBEXBAsUJUF2n8hehEAmELE
UZXI9VSeiKZpYU3TmhUjbKqIM/z47Pb9J4BeNwHzRByRF1dt8XTWfubV26a2ENL7kjFHxBF9eY1L5KmL
zj6hNZKRL5KfRIHY3KfNnZcP0DrJyBWhk7DF0+t1kcQdx+DMaKVsCt48QvcRIE+kqb2XEQkpOAemR+he
AuSJbDvY76dNyOCfi7j97V57fO4jaWTNHku+tw8n31WK69TDKN1LgDwRzpaOyE4qUzc0O+317nLTWsnI
FeEIZaKJ+7Tub2w9FG6h1wyQL8IpkomlftQH7wZpjRHOgZkRWzz1raFr4ji9VwJzRDh/ZIaTb+qDt7vo
PSOcp59d4sd27k1Yaei+cYzWCDBPpFL47zN+SBQ+mrH57xuYjHoinApkzBHhZz85hqsnllpxtx710b2s
JxJPZ/lDl+5lPZFY+qfBfxtzRPgzoLFz7HCl5E6ujF7CFZoy2tcckWpwhe712+Lzq0USfQ8GaR1BPRFH
JDFRxiTyqCfCcUQS1zc4iTxqinAau6900GsGqCtSJuWLIGIaEZ8a0CfYSE8vADwSrKsG3lPZIoYAwCoA
nBQINDPGLiBihq6RTGkRxhgf3S/BolI8pxIAcA4R1wS1MskwxoZo/0VhjPUwxm6VAhE/6F6wSAQRL5JJ
LNP1kuihfZcdxtiYSAQAzpNJLPv9/n10vTIRiVhOgoeKCL7YS4FAoJWuUy56EQD4gojrOomvALCbrlEy
ZCJ6lnw+315ar2xKiCxaSoJHILKoadoeWqd8ELENERO5U+ozY6yF1lgqHo9nByJq9Hottfxn+Q2nlJ4k
a2hbYwAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="toolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>537, 17</value>
</metadata>
@@ -129,7 +149,6 @@
<metadata name="trayContextMenu.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>123, 17</value>
</metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="showControlWindowToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
@@ -342,7 +361,7 @@
<data name="settingsToolStripMenuItem.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACBjSFJNAAB6
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA6/AAAOvwE4BVMkAAABQUlE
JgAAgIQAAPoAAACA6AAAdTAAAOpgAAA6mAAAF3CculE8AAAACXBIWXMAAA69AAAOvQFH+5CtAAABQUlE
QVQ4T7WTTU4CQRCF5whG48KxnfoqMxfAcyjoDdz4cw1xLXoC2AgnULmPBuMST4B5pEigGeNGK+mkp1+/
V1Wva4riv8Ld79x9Eauf460BXAPjlNIu8GpmF1ruPo2zse7kvGUAV8AbMHL3D+DLzDp1XR9r7+4zYAi8
t4oAE12oquoA6JnZo/Za2gPdwEaqJOcXZrYjdTM7q+v6CHhQJZF5oDN3P9W32tkgyyT1DMwj2wB4Tikd

20
ntfysh_client/Notifications/NotificationListener.cs
View File

@@ -352,10 +352,24 @@ namespace ntfysh_client.Notifications
SubscribedTopicsByUnique.Remove(topicUniqueString);
}
public async Task<HttpResponseMessage> SendNotification(string host, NtfyEvent message)
public async Task SendNotification(string key, string title, string message)
{
var httpClient = new HttpClient();
return await httpClient.PostAsJsonAsync<NtfyEvent>(host, message);
if (SubscribedTopicsByUnique.TryGetValue(key, out SubscribedTopic topic))
{
HttpClient httpClient = new HttpClient();
PublishEvent notification = new PublishEvent();
notification.Title = title;
notification.Message = message;
notification.Topic = topic.TopicId;
if (!string.IsNullOrEmpty(topic.Username) || !string.IsNullOrEmpty(topic.Password))
{
string value = Convert.ToBase64String(Encoding.UTF8.GetBytes($"{topic.Username}:{topic.Password}"));
httpClient.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", value);
}
HttpResponseMessage response = await httpClient.PostAsJsonAsync<PublishEvent>(topic.ServerUrl.Replace("wss://", "https://"), notification);
response.EnsureSuccessStatusCode();
}
}
}
}

50
ntfysh_client/Notifications/PublishEvent.cs Normal file
View File

@@ -0,0 +1,50 @@
using Newtonsoft.Json;
using System.Text.Json.Nodes;
namespace ntfysh_client.Notifications
{
internal class PublishEvent
{
[JsonProperty("topic")]
public string Topic { get; set; } = null!;
[JsonProperty("message")]
public string? Message { get; set; } = null;
[JsonProperty("title")]
public string? Title { get; set; } = null;
[JsonProperty("tags")]
public string[] Tags { get; set; } = null!;
[JsonProperty("priority")]
public NotificationPriority? Priority { get; set; } = null;
[JsonProperty("actions")]
public JsonArray? Actions { get; set; } = null;
[JsonProperty("click")]
public string? Click { get; set; } = null;
[JsonProperty("attach")]
public string? Attach { get; set; } = null;
[JsonProperty("markdown")]
public bool? Markdown { get; set; } = null;
[JsonProperty("icon")]
public string? Icon { get; set; } = null;
[JsonProperty("filename")]
public string? Filename { get; set; } = null;
[JsonProperty("delay")]
public string? Delay { get; set; } = null;
[JsonProperty("email")]
public string? Email { get; set; } = null;
[JsonProperty("call")]
public string? Call { get; set; } = null;
}
}

2
ntfysh_client/SendMessageForm.Designer.cs generated
View File

@@ -92,7 +92,7 @@
MaximizeBox = false;
MinimizeBox = false;
Name = "SendMessageForm";
Text = "SendMessageForm";
Text = "Send Message";
ResumeLayout(false);
PerformLayout();
}